Version bump #49002 by Erinn Looney-Triggs.

4 files changed, 87 insertions, 3 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index acc708566e91..ea5b4c4d4f90 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.19 2004/06/30 20:49:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.20 2004/09/25 03:12:23 vapier Exp $
+
+*memtest86-3.1a (24 Sep 2004)
+
+  24 Sep 2004; Mike Frysinger <vapier@gentoo.org> memtest86-3.0-r2.ebuild,
+  +memtest86-3.1a.ebuild:
+  Version bump #49002 by Erinn Looney-Triggs.
 
   30 Jun 2004; Aron Griffis <agriffis@gentoo.org> memtest86-3.0-r1.ebuild,
   memtest86-3.0-r2.ebuild:
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.1a b/sys-apps/memtest86/files/digest-memtest86-3.1a
new file mode 100644
index 000000000000..f632ca0c636d
--- /dev/null
+++ b/sys-apps/memtest86/files/digest-memtest86-3.1a
@@ -0,0 +1 @@
+MD5 6c43d4aba3fdfa135c462a02b3ae5b39 memtest86-3.1a.tar.gz 142729
diff --git a/sys-apps/memtest86/memtest86-3.0-r2.ebuild b/sys-apps/memtest86/memtest86-3.0-r2.ebuild
index 1f6dbe2a1d14..0b86492d6ef6 100644
--- a/sys-apps/memtest86/memtest86-3.0-r2.ebuild
+++ b/sys-apps/memtest86/memtest86-3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r2.ebuild,v 1.7 2004/07/15 01:49:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r2.ebuild,v 1.8 2004/09/25 03:12:23 vapier Exp $
 
 inherit mount-boot eutils
 
@@ -8,7 +8,7 @@ IUSE="serial"
 DESCRIPTION="A stand alone memory test for x86 computers"
 SRC_URI="http://www.memtest86.com/${P}.tar.gz"
 HOMEPAGE="http://www.memtest86.com/"
-KEYWORDS="~x86 -amd64 -ppc -sparc "
+KEYWORDS="-* x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/sys-apps/memtest86/memtest86-3.1a.ebuild b/sys-apps/memtest86/memtest86-3.1a.ebuild
new file mode 100644
index 000000000000..3cbfbb5b1cc4
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-3.1a.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.1a.ebuild,v 1.1 2004/09/25 03:12:23 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="-* ~x86"
+IUSE="serial"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# a little fix to make gcc-3.3.x happy
+#	epatch ${FILESDIR}/memtest86-3.0.patch
+	sed -i -e '/DISCARD/d' memtest_shared.lds
+
+	if use serial ; then
+		sed -i \
+			-e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' \
+			config.h \
+			|| die
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	insinto /boot/memtest86
+	doins memtest.bin || die
+	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=`cat /etc/fstab | grep /boot | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
+	if [ -n "${res}" ] ; then
+		bootpart=1
+	else
+		res=`cat /etc/fstab | grep -v '^#' | 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
+}