Version bump. Marked 1.40 stable on x86. Removed old ebuilds.

(Portage version: 2.0.51-r14)

9 files changed, 19 insertions, 81 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 692fcfdf9c3b..b7dea78fd65d 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2004/12/01 20:49:21 chainsaw Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.16 2005/01/22 15:16:13 spock Exp $
+
+*memtest86+-1.50 (22 Jan 2005)
+
+  22 Jan 2005; Michał Januszewski <spock@gentoo.org>
+  -memtest86+-1.26.ebuild, -memtest86+-1.27.ebuild, memtest86+-1.40.ebuild,
+  +memtest86+-1.50.ebuild:
+  Version bump. Marked 1.40 stable on x86. Removed old ebuilds.
 
 *memtest86+-1.40 (01 Dec 2004)
 
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.26 b/sys-apps/memtest86+/files/digest-memtest86+-1.26
deleted file mode 100644
index 87705b5cee31..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.26
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87a011c00b722cde1d87f0a5a831c9c2 memtest86+-1.26.tar.gz 123632
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.27 b/sys-apps/memtest86+/files/digest-memtest86+-1.27
deleted file mode 100644
index 2ce48a4c4cfd..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.27
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba04e1906c598b866f4ae6b45bba4575 memtest86+-1.27.tar.gz 159096
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.50 b/sys-apps/memtest86+/files/digest-memtest86+-1.50
new file mode 100644
index 000000000000..359a5c64fd1a
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.50
@@ -0,0 +1 @@
+MD5 ad695a98176279d55c5c86469556351b memtest86+-1.50.tar.gz 143270
diff --git a/sys-apps/memtest86+/memtest86+-1.11.ebuild b/sys-apps/memtest86+/memtest86+-1.11.ebuild
index 46c7eb1f7c6f..2d0e92ec82dd 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 Foundation
+# 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.11.ebuild,v 1.5 2004/06/30 20:52:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.11.ebuild,v 1.6 2005/01/22 15:16:13 spock Exp $
 
 inherit mount-boot
 
diff --git a/sys-apps/memtest86+/memtest86+-1.27.ebuild b/sys-apps/memtest86+/memtest86+-1.27.ebuild
deleted file mode 100644
index 78f846c7f01a..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.27.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.27.ebuild,v 1.1 2004/10/13 19:17: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
-}
diff --git a/sys-apps/memtest86+/memtest86+-1.30.ebuild b/sys-apps/memtest86+/memtest86+-1.30.ebuild
index 109a5c19d024..685e686c9f4a 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
+# 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.30.ebuild,v 1.2 2004/12/01 20:49:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.30.ebuild,v 1.3 2005/01/22 15:16:13 spock Exp $
 
 inherit mount-boot
 
diff --git a/sys-apps/memtest86+/memtest86+-1.40.ebuild b/sys-apps/memtest86+/memtest86+-1.40.ebuild
index 770112518ffd..631ec31d68ca 100644
--- a/sys-apps/memtest86+/memtest86+-1.40.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.40.ebuild,v 1.1 2004/12/01 20:49:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.40.ebuild,v 1.2 2005/01/22 15:16:13 spock 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.26.ebuild b/sys-apps/memtest86+/memtest86+-1.50.ebuild
index 46ff708413f5..58607154df7d 100644
--- a/sys-apps/memtest86+/memtest86+-1.26.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.26.ebuild,v 1.1 2004/09/02 15:30:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.50.ebuild,v 1.1 2005/01/22 15:16:13 spock Exp $
 
 inherit mount-boot