Version bump #169685 by ScytheMan.

(Portage version: 2.1.2.2)

5 files changed, 113 insertions, 2 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index e9ade4ce96f8..e384899e6695 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.28 2006/08/19 19:24:08 malc Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.29 2007/03/17 00:33:19 vapier Exp $
+
+*memtest86-3.3 (17 Mar 2007)
+
+  17 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/memtest86-3.3-funky-test.patch,
+  +files/memtest86-3.3-gnu-hash.patch, +memtest86-3.3.ebuild:
+  Version bump #169685 by ScytheMan.
 
   19 Aug 2006; <malc@gentoo.org> memtest86-3.2.ebuild:
   Stable on amd64
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.3 b/sys-apps/memtest86/files/digest-memtest86-3.3
new file mode 100644
index 000000000000..dbdf14ca67c4
--- /dev/null
+++ b/sys-apps/memtest86/files/digest-memtest86-3.3
@@ -0,0 +1,3 @@
+MD5 52e35228b60431ef474bbb5125ca1201 memtest86-3.3.tar.gz 137922
+RMD160 dd390793b9e2601ceccc01671dc9aaf602a8590f memtest86-3.3.tar.gz 137922
+SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c memtest86-3.3.tar.gz 137922
diff --git a/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch
new file mode 100644
index 000000000000..68fd355b2e08
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch
@@ -0,0 +1,15 @@
+i can only guess at what this test was trying to accomplish ...
+
+ive submitted this upstream
+
+--- main.c
++++ main.c
+@@ -465,7 +465,7 @@
+ 	}
+ 	compute_segments(window);
+ 	window = 0;
+-	for (v->pass_ticks=0, i=0; i<DEFTESTS != NULL; i++) {
++	for (v->pass_ticks=0, i=0; i<DEFTESTS; i++) {
+ 
+ 		/* Test to see if this test is selected for execution */
+ 		if (v->testsel >= 0) {
diff --git a/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch
new file mode 100644
index 000000000000..397b2c8bbee7
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch
@@ -0,0 +1,12 @@
+sent upstream already ...
+
+--- memtest_shared.lds
++++ memtest_shared.lds
+@@ -19,6 +19,7 @@
+ 	.dynsym     : { *(.dynsym) }
+ 	.dynstr     : { *(.dynstr) }
+ 	.hash       : { *(.hash) }
++	.gnu.hash   : { *(.gnu.hash) }
+ 	.dynamic    : { *(.dynamic) }
+ 
+ 	.rel.text    : { *(.rel.text   .rel.text.*) }
diff --git a/sys-apps/memtest86/memtest86-3.3.ebuild b/sys-apps/memtest86/memtest86-3.3.ebuild
new file mode 100644
index 000000000000..1e4113f09a74
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-3.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v 1.1 2007/03/17 00:33:19 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}"
+
+	epatch "${FILESDIR}"/${PN}-3.2-solar.patch #66630
+	epatch "${FILESDIR}"/${P}-funky-test.patch
+	epatch "${FILESDIR}"/${P}-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() {
+	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:"
+	einfo "    > title=Memtest86"
+
+	# a little magic to make users' life as easy as possible ;)
+	bootpart=0
+	root="(hd0,0)"
+	res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
+	if [ -n "${res}" ] ; then
+		bootpart=1
+	else
+		res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'`
+	fi
+
+	if [ -n "${res}" ] ; then
+		root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'`
+	fi
+
+	einfo "    > root ${root}"
+	if [ "${bootpart}" -eq 1 ] ; then
+		einfo "    > kernel /memtest86/memtest.bin"
+	else
+		einfo "    > kernel /boot/memtest86/memtest.bin"
+	fi
+
+	einfo " - For lilo:"
+	einfo "    > image  = /boot/memtest86/memtest.bin"
+	einfo "    > label  = Memtest86"
+	einfo
+}