From 34a0dd46d6f8fa6a43a694ad78a7aa95103ca155 Mon Sep 17 00:00:00 2001
From: Michael Januszewski <spock@gentoo.org>
Date: Tue, 9 Nov 2004 21:19:32 +0000
Subject: [PATCH] Version bump, closes bug #70499.

---
 sys-apps/memtest86+/ChangeLog                 |  8 ++-
 sys-apps/memtest86+/Manifest                  | 10 +--
 .../memtest86+/files/digest-memtest86+-1.30   |  1 +
 sys-apps/memtest86+/memtest86+-1.30.ebuild    | 68 +++++++++++++++++++
 4 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 sys-apps/memtest86+/files/digest-memtest86+-1.30
 create mode 100644 sys-apps/memtest86+/memtest86+-1.30.ebuild

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 74f658eee737..6a2530a6af9a 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2004/10/13 19:17:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.14 2004/11/09 21:19:32 spock Exp $
+
+*memtest86+-1.30 (09 Nov 2004)
+
+  09 Nov 2004; Michal Januszewski <spock@gentoo.org>
+  +memtest86+-1.30.ebuild:
+  Version bump, closes bug #70499.
 
 *memtest86+-1.27 (13 Oct 2004)
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index b299977e6854..a7b25130f6fb 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 e0428c648376a780fa499f56681e7866 memtest86+-1.30.ebuild 1855
 MD5 5fe58a2c03fac6578148b4335f35f772 memtest86+-1.26.ebuild 1855
 MD5 033049c23ae11ee3f82ce929b6efdec3 memtest86+-1.11.ebuild 1989
 MD5 4738bd2a7dd1e67a315bf730c2775121 memtest86+-1.27.ebuild 1855
-MD5 a1c4a53c5b1dd3d0f780c4cbe385fe6c ChangeLog 2155
+MD5 f97deb29da4cb1c098560acf0f36b4a7 ChangeLog 2303
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 f128d61e79967e3bc5f9f9beb73a4a23 files/digest-memtest86+-1.11 72
 MD5 f00a219df1fdb262f52f3669746f3917 files/digest-memtest86+-1.26 67
 MD5 49a077fb5b0f3394596ba82f480424d5 files/digest-memtest86+-1.27 67
+MD5 79cd683a05c934276d754cf71e517cad files/digest-memtest86+-1.30 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBbX9Ochej4aZK9/cRAuOoAJ9eBZeE8tIRxQcY33XX4DaQK5mzhACfcArY
-SVoXA1HFQFb230/bVHUGep0=
-=5Fl5
+iD8DBQFBkTRvchej4aZK9/cRAvhpAJkBrCWD4/9WaCEqWexGGfBTKolhOwCfbckn
+J7WtRZh3OMHCD3+CLGAOhOs=
+=CDB5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.30 b/sys-apps/memtest86+/files/digest-memtest86+-1.30
new file mode 100644
index 000000000000..7c1ee90e7b36
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.30
@@ -0,0 +1 @@
+MD5 f38fb2bc0e041c29ab9526b7ea431122 memtest86+-1.30.tar.gz 136002
diff --git a/sys-apps/memtest86+/memtest86+-1.30.ebuild b/sys-apps/memtest86+/memtest86+-1.30.ebuild
new file mode 100644
index 000000000000..6036411b99ac
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-1.30.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.30.ebuild,v 1.1 2004/11/09 21:19:32 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
+}
-- 
2.26.2