Version bump.

4 files changed, 85 insertions, 3 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 87b843329a53..10db7e99ed41 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.5 2004/02/26 10:58:07 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.6 2004/05/17 14:08:47 spock Exp $
+
+*memtest86+-1.15 (17 May 2004)
+
+  17 May 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.11.ebuild,
+  +memtest86+-1.15.ebuild:
+  Version bump. Moved 1.11 to stable.
 
 *memtest86+-1.11 (26 Feb 2004)
 
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.15 b/sys-apps/memtest86+/files/digest-memtest86+-1.15
new file mode 100644
index 000000000000..550c7c0e3940
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.15
@@ -0,0 +1 @@
+MD5 e4af794380829815c27ba0c0e6f58600 memtest_source_v1.15.tar.gz 123904
diff --git a/sys-apps/memtest86+/memtest86+-1.11.ebuild b/sys-apps/memtest86+/memtest86+-1.11.ebuild
index d8927fdb7b5a..2953c80e6b53 100644
--- a/sys-apps/memtest86+/memtest86+-1.11.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.11.ebuild,v 1.1 2004/02/26 10:58:07 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.11.ebuild,v 1.2 2004/05/17 14:08:47 spock Exp $
 
 inherit mount-boot
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.memtest.org/download/memtest_source_v${PV}.tar.gz"
 MY_P=${P/-/_v}
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="serial"
 DEPEND="virtual/glibc"
 
diff --git a/sys-apps/memtest86+/memtest86+-1.15.ebuild b/sys-apps/memtest86+/memtest86+-1.15.ebuild
new file mode 100644
index 000000000000..39c9158c2402
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-1.15.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.15.ebuild,v 1.1 2004/05/17 14:08:47 spock Exp $
+
+inherit mount-boot
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/memtest_source_v${PV}.tar.gz"
+MY_P=${P/-/_v}
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="serial"
+DEPEND="virtual/glibc"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# a little fix to make gcc-3.3.x happy
+	#sed -e '/DISCARD/d' -i memtest_shared.lds
+
+	if [ `use serial` ] ; then
+		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dodir /boot/memtest86plus
+	cp memtest.bin ${D}/boot/memtest86plus/memtest.bin
+	dodoc README README.build-process
+}
+
+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:"
+	einfo "    > title=Memtest86Plus"
+
+	# 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 /memtest86plus/memtest.bin"
+	else
+		einfo "    > kernel /boot/memtest86plus/memtest.bin"
+	fi
+
+	einfo " - For lilo:"
+	einfo "    > image  = /boot/memtest86plus/memtest.bin"
+	einfo "    > label  = Memtest86Plus"
+	einfo
+}
+