Version bump.

(Portage version: 2.0.51.22-r2)

3 files changed, 75 insertions, 2 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index cec9ee3d9fdf..e42d86b54b45 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/memtest86+
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.26 2005/07/07 18:57:12 spock Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.27 2005/08/03 22:12:28 vapier Exp $
+
+*memtest86+-1.60 (03 Aug 2005)
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org> +memtest86+-1.60.ebuild:
+  Version bump.
 
   07 Jul 2005; Michał Januszewski <spock@gentoo.org>
   memtest86+-1.55.ebuild:
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.60 b/sys-apps/memtest86+/files/digest-memtest86+-1.60
new file mode 100644
index 000000000000..6ca340a8ac7c
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.60
@@ -0,0 +1 @@
+MD5 35bfeca7a704403068de71a7b480bf5f memtest86+-1.60.tar.gz 146708
diff --git a/sys-apps/memtest86+/memtest86+-1.60.ebuild b/sys-apps/memtest86+/memtest86+-1.60.ebuild
new file mode 100644
index 000000000000..31e1cf8093ad
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-1.60.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.60.ebuild,v 1.1 2005/08/03 22:12:28 vapier Exp $
+
+inherit mount-boot eutils
+
+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="-* ~amd64 ~x86"
+IUSE="serial"
+RESTRICT="test"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.50-hardened.patch
+	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() {
+	insinto /boot/memtest86plus
+	doins memtest.bin || die
+	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:"
+
+	# a little magic to make users' life as easy as possible ;)
+	local fstab=${ROOT}/etc/fstab
+	local root="(hd0,0)"
+	local res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
+	if [[ -z ${res} ]] ; then
+		res=$(awk '$2 == "/" {print $1}' "${fstab}")
+	fi
+	if [[ -n ${res} ]] ; then
+		# transform /dev/hd* magic into grub naming ...
+		#        /dev/hda1   ->         a1          ->      01
+		root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789)
+		root="(hd${root:0:1},$((${root:1:1}-1)))"
+	fi
+	einfo " - For grub:"
+	einfo "    > title=Memtest86Plus"
+	einfo "    > root ${root}"
+	einfo "    > kernel /boot/memtest86plus/memtest.bin"
+
+	einfo " - For lilo:"
+	einfo "    > image  = /boot/memtest86plus/memtest.bin"
+	einfo "    > label  = Memtest86Plus"
+	einfo
+}