Version bump. Remove old ebuilds.

(Portage version: 2.1.2-r1)

9 files changed, 17 insertions, 159 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index fd1ed656bde4..691af84ae720 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/memtest86+
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.33 2006/04/30 12:14:50 blubb Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.34 2007/01/20 14:55:18 spock Exp $
+
+*memtest86+-1.70 (20 Jan 2007)
+
+  20 Jan 2007; Michał Januszewski <spock@gentoo.org>
+  -memtest86+-1.51.ebuild, -memtest86+-1.55.ebuild, -memtest86+-1.60.ebuild,
+  +memtest86+-1.70.ebuild:
+  Version bump. Removed old ebuilds.
 
   30 Apr 2006; Simon Stelling <blubb@gentoo.org> memtest86+-1.65.ebuild:
   stable on amd64
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.51 b/sys-apps/memtest86+/files/digest-memtest86+-1.51
deleted file mode 100644
index 39ba5226fffb..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.51
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b26578710510adc982209e8e9406ad41 memtest86+-1.51.tar.gz 143734
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.55 b/sys-apps/memtest86+/files/digest-memtest86+-1.55
deleted file mode 100644
index 33aa9d129066..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 944b0d4b2058defb000862d7ee3a3b1c memtest86+-1.55.tar.gz 146172
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.60 b/sys-apps/memtest86+/files/digest-memtest86+-1.60
deleted file mode 100644
index 6ca340a8ac7c..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35bfeca7a704403068de71a7b480bf5f memtest86+-1.60.tar.gz 146708
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.65 b/sys-apps/memtest86+/files/digest-memtest86+-1.65
index 13b3669ff307..69d447194438 100644
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.65
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.65
@@ -1 +1,3 @@
 MD5 b3a18166532ae84aea20425c83626651 memtest86+-1.65.tar.gz 146203
+RMD160 629379f7660dbc6ab071a9d9839ce0528752dda8 memtest86+-1.65.tar.gz 146203
+SHA256 fb27b1e0b65128921c551096a2e0f8ec51ffa27a45b1e76a54ca6b6685d0e980 memtest86+-1.65.tar.gz 146203
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.70 b/sys-apps/memtest86+/files/digest-memtest86+-1.70
new file mode 100644
index 000000000000..ecfde4e96bf5
--- /dev/null
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.70
@@ -0,0 +1,3 @@
+MD5 ee447fa46b75cf98538fa60667eb079d memtest86+-1.70.tar.gz 150198
+RMD160 2320f50eb20d31f110103fd14136f92ade627df2 memtest86+-1.70.tar.gz 150198
+SHA256 dc6d244572f2a030a74cfef78b6e4b58d5f230597b4f80e4581c1373182492eb memtest86+-1.70.tar.gz 150198
diff --git a/sys-apps/memtest86+/memtest86+-1.51.ebuild b/sys-apps/memtest86+/memtest86+-1.51.ebuild
deleted file mode 100644
index d63c2acebf8c..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.51.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.51.ebuild,v 1.5 2005/06/23 01:40:18 agriffis 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="x86 amd64 -ppc"
-IUSE="serial"
-DEPEND="virtual/libc"
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# send the DOS newlines where they belong - /dev/null ;>
-	sed -e 's/\x0d//g' -i Makefile || die
-	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() {
-	dodir /boot/memtest86plus
-	cp memtest.bin ${D}/boot/memtest86plus/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:"
-	einfo " - For grub:"
-	einfo "    > title=Memtest86Plus"
-
-	# a little magic to make users' life as easy as possible ;)
-	bootpart=0
-	root="(hd0,0)"
-	res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
-	if [ -n "${res}" ] ; then
-		bootpart=1
-	else
-		res=`grep -v '^#' /etc/fstab | 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.55.ebuild b/sys-apps/memtest86+/memtest86+-1.55.ebuild
deleted file mode 100644
index 75847c5d63d8..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.55.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.55.ebuild,v 1.6 2005/08/03 22:12:08 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}"
-
-	# send the DOS newlines where they belong - /dev/null ;>
-	sed -e 's/\x0d//g' -i Makefile || die
-	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:"
-	einfo " - For grub:"
-	einfo "    > title=Memtest86Plus"
-
-	# a little magic to make users' life as easy as possible ;)
-	local fstab=${ROOT}/etc/fstab
-	bootpart=0
-	root="(hd0,0)"
-	res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
-	if [ -n "${res}" ] ; then
-		bootpart=1
-	else
-		res=`grep -v '^#' "${fstab}" | 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.60.ebuild b/sys-apps/memtest86+/memtest86+-1.70.ebuild
index e5f5ccd7ad6e..f1c460eeba0f 100644
--- a/sys-apps/memtest86+/memtest86+-1.60.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.70.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 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.3 2005/10/09 17:59:31 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.70.ebuild,v 1.1 2007/01/20 14:55:18 spock Exp $
 
 inherit mount-boot eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="serial"
 RESTRICT="test"