Version bump to 1.40; 1.30 release stable on x86.

5 files changed, 82 insertions, 15 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 6a2530a6af9a..692fcfdf9c3b 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.14 2004/11/09 21:19:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.15 2004/12/01 20:49:21 chainsaw Exp $
+
+*memtest86+-1.40 (01 Dec 2004)
+
+  01 Dec 2004; Tony Vroon <chainsaw@gentoo.org> memtest86+-1.30.ebuild,
+  +memtest86+-1.40.ebuild:
+  Version bump to 1.40 release. 1.30 stable on x86.
 
 *memtest86+-1.30 (09 Nov 2004)
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a7b25130f6fb..e67446e5575c 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e0428c648376a780fa499f56681e7866 memtest86+-1.30.ebuild 1855
+MD5 9bd9bfe98ed341b15bb5d3c9bc4beef5 memtest86+-1.30.ebuild 1854
 MD5 5fe58a2c03fac6578148b4335f35f772 memtest86+-1.26.ebuild 1855
 MD5 033049c23ae11ee3f82ce929b6efdec3 memtest86+-1.11.ebuild 1989
+MD5 22f116696c2e171674822124e9ba5897 memtest86+-1.40.ebuild 1752
 MD5 4738bd2a7dd1e67a315bf730c2775121 memtest86+-1.27.ebuild 1855
-MD5 f97deb29da4cb1c098560acf0f36b4a7 ChangeLog 2303
+MD5 dd4f05510e1a09bf1639a7fe2b218cbe ChangeLog 2487
 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)
-
-iD8DBQFBkTRvchej4aZK9/cRAvhpAJkBrCWD4/9WaCEqWexGGfBTKolhOwCfbckn
-J7WtRZh3OMHCD3+CLGAOhOs=
-=CDB5
------END PGP SIGNATURE-----
+MD5 dc79d231081f2951707b9336d2321dba files/digest-memtest86+-1.40 67
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.40 b/sys-apps/memtest86+/files/digest-memtest86+-1.40
new file mode 100644
index 000000000000..27bdc90196a0
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.40
@@ -0,0 +1 @@
+MD5 a16ecb3022e1e7105ac11e876739e9f2 memtest86+-1.40.tar.gz 136943
diff --git a/sys-apps/memtest86+/memtest86+-1.30.ebuild b/sys-apps/memtest86+/memtest86+-1.30.ebuild
index 6036411b99ac..109a5c19d024 100644
--- a/sys-apps/memtest86+/memtest86+-1.30.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.30.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+-1.30.ebuild,v 1.1 2004/11/09 21:19:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.30.ebuild,v 1.2 2004/12/01 20:49:21 chainsaw Exp $
 
 inherit mount-boot
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.memtest.org/"
 SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="serial"
 DEPEND="virtual/libc"
 
diff --git a/sys-apps/memtest86+/memtest86+-1.40.ebuild b/sys-apps/memtest86+/memtest86+-1.40.ebuild
new file mode 100644
index 000000000000..770112518ffd
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-1.40.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.40.ebuild,v 1.1 2004/12/01 20:49:21 chainsaw 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
+}