Version bump.

4 files changed, 81 insertions, 5 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 899fc5bfc3e5..b5e03e1c5690 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.11 2004/09/01 11:48:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.12 2004/09/02 15:30:18 spock Exp $
+
+*memtest86+-1.26 (02 Sep 2004)
+
+  02 Sep 2004; Michal Januszewski <spock@gentoo.org> +memtest86+-1.26.ebuild:
+  Version bump.
 
 *memtest86+-1.25 (01 Sep 2004)
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index b840e5558d11..66befdb010e9 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -3,20 +3,22 @@ Hash: SHA1
 
 MD5 689ed7a30f6901644563c492004707e2 memtest86+-1.15.ebuild 1997
 MD5 ed60e912f863381715e099326bfed556 memtest86+-1.0.ebuild 1964
+MD5 5fe58a2c03fac6578148b4335f35f772 memtest86+-1.26.ebuild 1855
 MD5 a2ad1c086797efaac8e131ccd3ea0932 memtest86+-1.25.ebuild 1855
 MD5 0ab0adf7eda2bec891e16e52e6b2d92d memtest86+-1.20.ebuild 1940
 MD5 033049c23ae11ee3f82ce929b6efdec3 memtest86+-1.11.ebuild 1989
-MD5 7569ea57d4d11fc7b4da7d81d161beb9 ChangeLog 1777
+MD5 08ac487e4949e4ac65b8eff3e8349d95 ChangeLog 1904
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 0782c1c3a12f88f4b728016925d26bd3 files/digest-memtest86+-1.0 72
 MD5 f128d61e79967e3bc5f9f9beb73a4a23 files/digest-memtest86+-1.11 72
 MD5 0bfcaf72ce7088b75ff6a6f688a91afa files/digest-memtest86+-1.15 72
 MD5 cbc6e195dcb7b389d62d08a07d95dd88 files/digest-memtest86+-1.20 67
 MD5 8c3712269e1cba14b23b3ab215cf6628 files/digest-memtest86+-1.25 67
+MD5 f00a219df1fdb262f52f3669746f3917 files/digest-memtest86+-1.26 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBNbcfchej4aZK9/cRAt6eAJ9s960jMXDFQp5KLEC2FYtg3X/9oACfckO7
-smABAD9QLqK+moct1QI2KY8=
-=L/jm
+iD8DBQFBNzzQchej4aZK9/cRAsVTAJ9R55qsj4rzCf6NgyWME3mb8vzPYQCeMS/u
+1mV2a1zA1hQUJ8uAgmwNMM0=
+=3W0m
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.26 b/sys-apps/memtest86+/files/digest-memtest86+-1.26
new file mode 100644
index 000000000000..87705b5cee31
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.26
@@ -0,0 +1 @@
+MD5 87a011c00b722cde1d87f0a5a831c9c2 memtest86+-1.26.tar.gz 123632
diff --git a/sys-apps/memtest86+/memtest86+-1.26.ebuild b/sys-apps/memtest86+/memtest86+-1.26.ebuild
new file mode 100644
index 000000000000..46ff708413f5
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-1.26.ebuild
@@ -0,0 +1,68 @@
+# 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+-1.26.ebuild,v 1.1 2004/09/02 15:30:18 spock Exp $
+
+inherit mount-boot
+
+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="~x86"
+IUSE="serial"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	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
+}