Version bump.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux i686

5 files changed, 113 insertions, 11 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index bcd263f0b120..3a0df371a631 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2011/01/09 03:24:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.39 2011/06/15 04:55:11 jer Exp $
+
+*memtest86-4.0 (15 Jun 2011)
+
+  15 Jun 2011; Jeroen Roovers <jer@gentoo.org> files/memtest86-3.5-build.patch,
+  +memtest86-4.0.ebuild, +files/memtest86-4.0-build.patch:
+  Version bump.
 
   09 Jan 2011; Mike Frysinger <vapier@gentoo.org> memtest86-3.3.ebuild,
   memtest86-3.4.ebuild, memtest86-3.5.ebuild:
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 5643ff1efe49..69813dbc7af1 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -1,23 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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 1561 RMD160 3b94c0835cd6c77f3eb1905fb03c1d44c47d9c6c SHA1 5aad3debcc251f8d8a21f92cbeb3e6b8713a5dc8 SHA256 5f37dcbe9a906085b80d4c4cfd8ca3fb0b4d6342a156ac1a529b0cc10a5058da
+AUX memtest86-3.5-build.patch 1375 RMD160 a3d9f2c185a81e932f7212046b047bf32e5b560b SHA1 5f7df5c4f3631974ee62226b1599c96e3a6a4427 SHA256 afa55ae966263e9c7f3f584679964377db213b26c66af5334d5212679ed394dd
+AUX memtest86-4.0-build.patch 1440 RMD160 424143da7b76e33db3693049772d0331f17a6e45 SHA1 e08a83c336a8c7eea1f36e35d07928154e22cdb5 SHA256 9beaef316a335f27a1236ae49c1cf2f5c3b447fda35d016927ced69ab4cef311
 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
 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
-MISC ChangeLog 5777 RMD160 3ac7bcf788eba905e6b6192f0abd357fd473278f SHA1 1b2c91d75a329bbecba429fc3318224fda582fce SHA256 460055d481ec78959b8bd7715b7da96cc1b268fbf3b4c28335e307f2a5ac1c1f
+EBUILD memtest86-4.0.ebuild 1351 RMD160 a79f7cf59330c21c85ac5e48c1b287193dc099fd SHA1 63fdd7aa23ad735f98910f574e17a1ea4fa6ff0e SHA256 10c8f70a31a957e5d2a4f8353b647bddb1d4161b4f86dfb7e4482c384fd6ef7f
+MISC ChangeLog 5960 RMD160 489d47e833ecb09ce6dcea86bdb9bc9b531dd3f8 SHA1 be00080317e6f4548177f3fd4958665648426f5d SHA256 08952e347755e30a099efb7d6696450664292c3283aa49937360c07c59090ff8
 MISC metadata.xml 241 RMD160 86f0a529b00ddd6915b76083c4f1e2db8598fae1 SHA1 70234d532f1b867dfc34bd936fb34a7015fa90ed SHA256 bd2bd1cf924d8626e469ed4c8780d7a11c8b629ce102d654b3ca0022a7f4254e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0pKoUACgkQaC/OocHi7JahbAD9HEJ8L1YurXuu/UvqqUuWf8Zj
-zAO9xzfDm8mRvOmfKlwBAI0ufAxO1DRl6bbdG+hSsCNKW9ASIfV9H7ypUEsEe1vx
-=qnyb
+iEYEARECAAYFAk34OzsACgkQVWmRsqeSphO5TQCeNl5ZRYMbLbVbSHuwQ4cAvNnK
+ttgAnjltZijdYc4uEz/hwaSTXxjaIDOc
+=Ja4b
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/files/memtest86-3.5-build.patch b/sys-apps/memtest86/files/memtest86-3.5-build.patch
index 6c47cddb180d..04f45bffa5eb 100644
--- a/sys-apps/memtest86/files/memtest86-3.5-build.patch
+++ b/sys-apps/memtest86/files/memtest86-3.5-build.patch
@@ -1,8 +1,7 @@
 make sure all the flags in question force i386 and disable SSP
 
-diff -Nuar --exclude '*.orig' memtest86-3.5.orig//Makefile memtest86-3.5//Makefile
---- memtest86-3.5.orig//Makefile	2010-03-31 19:43:35.355817421 +0000
-+++ memtest86-3.5//Makefile	2010-03-31 19:47:10.922462467 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -8,10 +8,9 @@
  #
  FDISK=/dev/fd0
diff --git a/sys-apps/memtest86/files/memtest86-4.0-build.patch b/sys-apps/memtest86/files/memtest86-4.0-build.patch
new file mode 100644
index 000000000000..6e2fe6a4d428
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-4.0-build.patch
@@ -0,0 +1,41 @@
+--- Makefile.org	2011-03-30 16:58:52.000000000 +0200
++++ Makefile	2011-06-15 06:52:44.000000000 +0200
+@@ -8,11 +8,9 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
++ASFLAGS=-32
+ 
+-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
+-	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
++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 error.o smp.o cpuid.o vmem.o random.o
+@@ -23,7 +21,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)
+ 
+@@ -50,7 +48,7 @@
+ 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
+ 
+ test.o: test.c
+-	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
++	$(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
+ 
+ random.o: random.c
+ 	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
+@@ -72,3 +70,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-4.0.ebuild b/sys-apps/memtest86/memtest86-4.0.ebuild
new file mode 100644
index 000000000000..bb54475a9a03
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-4.0.ebuild
@@ -0,0 +1,53 @@
+# 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.0.ebuild,v 1.1 2011/06/15 04:55:11 jer 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}-4.0-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
+}