Bug #286169: Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 109 insertions, 12 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 332ec24bc152..9ce43799acd8 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.51 2009/06/12 14:28:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.52 2009/09/25 16:13:48 robbat2 Exp $
+
+*memtest86+-4.00 (25 Sep 2009)
+
+  25 Sep 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +files/memtest86+-4.00-hardcoded_cc.patch, +memtest86+-4.00.ebuild:
+  Bug #286169: Version bump.
 
   12 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   memtest86+-2.11.ebuild:
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index db89e233e696..31651d7cc5f6 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX make-memtest86+-boot-floppy 2499 RMD160 afe647152769ae90ae3058dd8e33e451dacdd2c8 SHA1 feed092c75926b5b6ed4ef6fce9a1ec07e66d2f2 SHA256 88d8768592abdd224b9cd041152c78ef50eedeef3620f0d00f51c0eaeef8158a
 AUX make-memtest86+-boot-floppy.1 1165 RMD160 541139ac0a82950ec782603d74e9c53e30fcd49b SHA1 6fbaa20c2e08266147d6adae42195775aae4a13b SHA256 240c921fe2cbb4d70b5e06fc06d798c6018ece8a238fdeebf3ad02a6043ed5d7
 AUX memtest86+-1.70-gnu_hash.patch 485 RMD160 355648069f4b3f6234e770bbea30dcef10405376 SHA1 dd0d673b2fdee35b1522574b1499cd943820dca5 SHA256 07bb65affa496910f0c91457c5c21e31a0e523e0c360ebf602b47296748f4bac
 AUX memtest86+-2.01-hardcoded_cc.patch 1209 RMD160 00167b8e9f8eb49b3c291b63a754e415c7d0ad17 SHA1 e0efa4cfb820825bc2cc6c2488be18909db892cf SHA256 79de7846fc10bb70f018bda0daad82082600a5a7bc35d7715b25294018e47d97
 AUX memtest86+-2.10-hardcoded_cc.patch 1231 RMD160 9ffb4f5bdacff75ef09e6aa760186cdd1e29c71d SHA1 fa55e18966a7c5e35b091a9899cfe51d55ea83de SHA256 3f39a0495230cf45ea0666040b1bfefd00a86dbd91ec45428f181ed6c06a10a6
 AUX memtest86+-2.11-hardcoded_cc.patch 1210 RMD160 9f153d1d4e80b37479cdbebe760c4abfcfafa2c0 SHA1 4a7ae70912561c587c4b8c3ee49577586780ff3f SHA256 d59ad2778ea95d654107052112a4f1eb631d6c790078a66a37ee6a9368f21903
+AUX memtest86+-4.00-hardcoded_cc.patch 1217 RMD160 b8dfcf77b25fb0ae9887508a1b673ebab1f6d195 SHA1 2fd3b2ed5bb10b5de4fc2b1258c6868bee9963de SHA256 1e3df89afe8734cea0fdc90131b9daf3f93d8d96451d38771e5225fde2ba1c4f
 DIST memtest86+-2.01.tar.gz 165984 RMD160 cdd94d9ea1089387bba8bd024c5cb39b741cba9f SHA1 3420652300e397891af8b263318dc08144e8b4a4 SHA256 35ad452f4fd12f07756abccccf1bce70d42596c2c5e9c29247ffc8e0b76bd1ae
 DIST memtest86+-2.10.tar.gz 165987 RMD160 e782d067899361bbf931206742318c136467c432 SHA1 a687513b118fc3d43c2b83d9baed835eb2380786 SHA256 d951e4888e8b793832ae1dad2716863fe6d96976a8cc258a7298e2cbfac8136e
 DIST memtest86+-2.11.tar.gz 165937 RMD160 2f210dd17725ead0ef3daf1181184d2a7a071774 SHA1 5cebc90126403c1e918fd05670546800b66ed113 SHA256 43876a7221e39cde791f20d04ecb071adfa08975cac2e511d04359619ce16c0e
+DIST memtest86+-4.00.tar.gz 270327 RMD160 df039946c829fae3123336fbee0005afc2360e14 SHA1 15e77d79fe528e64e5803bff24048dd642f87c46 SHA256 6ec42f549da81b715bfc5c55b93b74774fb5c35f7578c7eecebab3ca37866ca4
 EBUILD memtest86+-2.01.ebuild 1390 RMD160 087717dbdb8fe993df5880f382e4689d4d14633a SHA1 e1f32f03fa4b7d8d47ccd63f94e1132706dcb39b SHA256 a5f27eb3b8331eeb70ce87203058bc4d9f30f7c59779a7b0ecc4e4a8793e3dbd
 EBUILD memtest86+-2.10.ebuild 1392 RMD160 24bc653279fc908dd0bb2b201e47b153f46f0948 SHA1 e9634aaf5a71dffbdc676bbb707866405d0cb515 SHA256 15835cb1e972e211e9efa44fd2e69593f2fb274ba736aed1d706fef246521721
 EBUILD memtest86+-2.11.ebuild 1690 RMD160 64fcc1ecb9f9ee745b749112288eaf37bb176338 SHA1 825bdbb222c86a1c4eaaf22d5b639ab58cb2cbda SHA256 65c305b308520d7dbd5dafedc368a052a40b232fc5ddbd465c9556de4750a0a2
-MISC ChangeLog 8437 RMD160 67cd33133b738876b2898ce33c270759c35e50e4 SHA1 3554754cfa7f2160fcf6b4e2134e1beb4169164d SHA256 99db3802ca86d3e1bd92b578a3f46d1bb976e861b57acb3f548d7d692c9710b9
+EBUILD memtest86+-4.00.ebuild 1710 RMD160 4831aca1888c740177cca61524d08e9b3130df7f SHA1 69b80eb69667d2d6bea136bb8d47a3986d237420 SHA256 04ddce689b4d11ba1f2f28178c6235a8a7ff9633c5a1ba13c3081142491cd1c0
+MISC ChangeLog 8620 RMD160 acae4d16ee44f4a85ddebbca7db562ded67a7227 SHA1 57b1a6e32fc2e1a4041a225640f58b3b0391e9bf SHA256 0ce622f3ec8bd0973ddffd7c409f179816d745e69acd96641729dbddd8427131
 MISC metadata.xml 435 RMD160 a41a6fd4d037bbd4a73b78aa7142b851f4920911 SHA1 b5986becb6ded15ec987b932a77bf70703c18c8c SHA256 e42cd2e2804736877a470dd088678725eb242566343d0f20b3828be43378939b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoyZikACgkQAiZjviIA2XjDlQCeIFQ6GU5iC0nQv2dyyVlxPzsf
-d2wAnAqDWuHKa5w069VwVTwt53/ogh/D
-=C2VE
------END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
new file mode 100644
index 000000000000..f2950b64e807
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
@@ -0,0 +1,30 @@
+diff -Nuar --exclude '*.orig' --exclude '*rej' --exclude '*~' memtest86+-4.00.orig/Makefile memtest86+-4.00/Makefile
+--- memtest86+-4.00.orig/Makefile	2009-09-21 17:35:46.000000000 -0700
++++ memtest86+-4.00/Makefile	2009-09-25 09:04:23.000000000 -0700
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
+-
+-CFLAGS= -Wall -march=i486 -m32 -O2 -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 spd.o \
+@@ -47,10 +46,10 @@
+ 	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+/memtest86+-4.00.ebuild b/sys-apps/memtest86+/memtest86+-4.00.ebuild
new file mode 100644
index 000000000000..8ad8b65072a7
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-4.00.ebuild
@@ -0,0 +1,68 @@
+# 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+-4.00.ebuild,v 1.1 2009/09/25 16:13:48 robbat2 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.00-hardcoded_cc.patch
+	
+	# Merged upstream
+	#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
+}