Cleaned the 1.50 ebuild up a little bit. Removed old ebuilds.

Package-Manager: portage-2.0.51.16

7 files changed, 28 insertions, 160 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 83216c830a53..9ee1a66fe510 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2005/01/24 10:37:47 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.18 2005/02/10 09:21:31 spock Exp $
+
+  10 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  -memtest86+-1.11.ebuild, -memtest86+-1.30.ebuild, memtest86+-1.50.ebuild:
+  Cleaned the 1.50 ebuild up a little bit. Removed old ebuilds.
 
   24 Jan 2005; Michał Januszewski <spock@gentoo.org>
   +files/memtest86+-1.50-hardened.patch, memtest86+-1.40.ebuild,
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index aadc8c618ec0..56e5a7082e67 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,11 +1,17 @@
-MD5 0b53ddd69af4917c9e83662a840b5ff7 ChangeLog 2966
-MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 8f4a4f70173907a7b2fa62128ea2430a memtest86+-1.11.ebuild 1986
-MD5 d855e51d9667076318144c663770b856 memtest86+-1.50.ebuild 1998
-MD5 98a44e446b259464a0900860bdd3ac89 memtest86+-1.30.ebuild 1854
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7c4c3bfb88877a154864f541975fbb4a memtest86+-1.50.ebuild 2010
 MD5 10a9ed8a41300d242c065ce675b092a5 memtest86+-1.40.ebuild 1909
-MD5 89e3591b3e73135c40f76eaf33d3e340 files/digest-memtest86+-1.50 67
-MD5 f128d61e79967e3bc5f9f9beb73a4a23 files/digest-memtest86+-1.11 72
-MD5 79cd683a05c934276d754cf71e517cad files/digest-memtest86+-1.30 67
-MD5 dc79d231081f2951707b9336d2321dba files/digest-memtest86+-1.40 67
+MD5 5e15ce0a36e61165bbff482506a48a20 ChangeLog 3161
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 c9888397f49a7e1d3df3a2f5acd5cfad files/memtest86+-1.50-hardened.patch 802
+MD5 dc79d231081f2951707b9336d2321dba files/digest-memtest86+-1.40 67
+MD5 89e3591b3e73135c40f76eaf33d3e340 files/digest-memtest86+-1.50 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD4DBQFCCye8chej4aZK9/cRAr5zAJ0WrICzCkY8vf6c70qXX/Rij8rG2QCXd456
+pZKAv2+crS1as0YZ5wLTrw==
+=Iiyc
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.11 b/sys-apps/memtest86+/files/digest-memtest86+-1.11
deleted file mode 100644
index 77d1efac33ea..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55246f7734daedd88abe97a2b1cf98d9 memtest_source_v1.11.tar.gz 123182
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.30 b/sys-apps/memtest86+/files/digest-memtest86+-1.30
deleted file mode 100644
index 7c1ee90e7b36..000000000000
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f38fb2bc0e041c29ab9526b7ea431122 memtest86+-1.30.tar.gz 136002
diff --git a/sys-apps/memtest86+/memtest86+-1.11.ebuild b/sys-apps/memtest86+/memtest86+-1.11.ebuild
deleted file mode 100644
index 2d0e92ec82dd..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.11.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.11.ebuild,v 1.6 2005/01/22 15:16:13 spock Exp $
-
-inherit mount-boot
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/memtest_source_v${PV}.tar.gz"
-MY_P=${P/-/_v}
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="serial"
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# a little fix to make gcc-3.3.x happy
-	sed -e '/DISCARD/d' -i memtest_shared.lds
-
-	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
deleted file mode 100644
index 685e686c9f4a..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.30.ebuild
+++ /dev/null
@@ -1,68 +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.30.ebuild,v 1.3 2005/01/22 15:16:13 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.50.ebuild b/sys-apps/memtest86+/memtest86+-1.50.ebuild
index d85759942e78..dc114af89cd5 100644
--- a/sys-apps/memtest86+/memtest86+-1.50.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.50.ebuild
@@ -1,6 +1,6 @@
 # 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.50.ebuild,v 1.3 2005/01/24 20:32:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.50.ebuild,v 1.4 2005/02/10 09:21:31 spock Exp $
 
 inherit mount-boot eutils
 
@@ -18,7 +18,7 @@ src_unpack() {
 	cd ${S}
 
 	# send the DOS newlines where they belong - /dev/null ;>
-	sed -e 's/\x0d//g' -i Makefile
+	sed -e 's/\x0d//g' -i Makefile || die
 	epatch "${FILESDIR}"/${P}-hardened.patch
 	if use serial ; then
 		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
@@ -31,7 +31,7 @@ src_compile() {
 
 src_install() {
 	dodir /boot/memtest86plus
-	cp memtest.bin ${D}/boot/memtest86plus/memtest.bin
+	cp memtest.bin ${D}/boot/memtest86plus/memtest.bin || die
 	dodoc README README.build-process
 }
 
@@ -46,15 +46,17 @@ pkg_postinst() {
 	# 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]\+'`
+	res=`grep /boot /etc/fstab | 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}'`
+		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 ")" }'`
+		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}"