fixup RESTRICT; error check sed; less cat abuse

Package-Manager: portage-2.1_rc4

5 files changed, 51 insertions, 34 deletions

diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 892149462a0a..6acb9849e080 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -49,10 +49,10 @@ EBUILD baselayout-vserver-1.11.14-r5.ebuild 13726 RMD160 e725ef7f0fd458513edc897
 MD5 d9e93a9f8242d01b3d363e3d3adbe5c9 baselayout-vserver-1.11.14-r5.ebuild 13726
 RMD160 e725ef7f0fd458513edc897ee84d292d53a36617 baselayout-vserver-1.11.14-r5.ebuild 13726
 SHA256 7925681cead66d2d3cf296f02706108e87298abe9c52d4fd117d005630dffe9a baselayout-vserver-1.11.14-r5.ebuild 13726
-EBUILD baselayout-vserver-1.11.15.ebuild 13679 RMD160 1a848ce31b9823f85cd1c4102e54ce7ebb4eca03 SHA1 9ebd3c0aaccbc11abb0b905520be1f6786986fae SHA256 3201a7b99dc187310b8272dc7f5cc4f6947d30f6a9df8bcc4a2542637f646ab5
-MD5 946fd25174e96a23ce04f9734d52f224 baselayout-vserver-1.11.15.ebuild 13679
-RMD160 1a848ce31b9823f85cd1c4102e54ce7ebb4eca03 baselayout-vserver-1.11.15.ebuild 13679
-SHA256 3201a7b99dc187310b8272dc7f5cc4f6947d30f6a9df8bcc4a2542637f646ab5 baselayout-vserver-1.11.15.ebuild 13679
+EBUILD baselayout-vserver-1.11.15.ebuild 13673 RMD160 aaba4bc5484827765c1cadafa75aa4e04c186d76 SHA1 e40ff5c49f99743fb53a80770449488c5e67ab59 SHA256 d51aea74d4c0f8eff166a941192412cbe5d75ad2f2f731a8725f595f9565fc28
+MD5 95ad2a81daf6e1b050844aacdb8a9a92 baselayout-vserver-1.11.15.ebuild 13673
+RMD160 aaba4bc5484827765c1cadafa75aa4e04c186d76 baselayout-vserver-1.11.15.ebuild 13673
+SHA256 d51aea74d4c0f8eff166a941192412cbe5d75ad2f2f731a8725f595f9565fc28 baselayout-vserver-1.11.15.ebuild 13673
 EBUILD baselayout-vserver-1.12.0.ebuild 13540 RMD160 4d5c2104eaab1d74a316ff3c07c61660151cf810 SHA1 67c92ee24903baad161d84dd04d538450573fac7 SHA256 7c30a53ac671169e6fec5f296daf7b14a67bf089066e16a0f604011658207025
 MD5 2f6a966452603d89eb4c86fb64162724 baselayout-vserver-1.12.0.ebuild 13540
 RMD160 4d5c2104eaab1d74a316ff3c07c61660151cf810 baselayout-vserver-1.12.0.ebuild 13540
@@ -87,7 +87,7 @@ SHA256 7feae89922ac9a7eeab0ed8848b35081e144bf1539845b7ef0f5b1e70883699b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhK32flZ8QqxhrsMRAkx7AJ4yyNw9oBSpD98coMMilUWjE3Y2hACeLmX8
-aZDrmLWFfKX/kDkgJSwFheo=
-=5YV6
+iD8DBQFEheOlI1lqEGTUzyQRAsuiAKCIXN+b3o1/73/qA+PtCt6YU16mdACfZ+zE
+6sDJrtB/ShIwuFFhZwD8PGg=
+=caD5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index e34e236b8c16..8c067d19c4a4 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.26 2005/11/26 20:15:33 eradicator Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.27 2006/06/06 20:17:17 mr_bones_ Exp $
+
+  06 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org> memtest86-3.2.ebuild:
+  fixup RESTRICT; error check sed; less cat abuse
 
   26 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
   memtest86-3.2.ebuild:
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 55970d9a3127..99e19d1bb2b4 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -1,16 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ba44fee5e5b5f52a60b514ef7c0d6fbd ChangeLog 4082
-MD5 64a30db4579e12539572f71ca895e1ed files/digest-memtest86-3.2 65
+AUX memtest86-3.2-solar.patch 821 RMD160 ce955d5b0414e1f58758435e99d40a296893c280 SHA1 e16ef80795e76d28356cf33f10527a96d15d88fc SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec101fde9448f4aab1a2a2589019
 MD5 93e1541e7b5f0da25dc394b281830ba1 files/memtest86-3.2-solar.patch 821
+RMD160 ce955d5b0414e1f58758435e99d40a296893c280 files/memtest86-3.2-solar.patch 821
+SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec101fde9448f4aab1a2a2589019 files/memtest86-3.2-solar.patch 821
+AUX memtest86-3.2-test-pic.patch 641 RMD160 043bf5611ee3ea1c1d9054b17eec5f192ff96c82 SHA1 834683775f549feef59bf5873a0030e43eaff02b SHA256 f575c559b9f9b3ead5d2957524421f841596f3cec98f65de9764c29a2dc1d4db
 MD5 9b8f71a15e2d7236b658f1f9e0fb79df files/memtest86-3.2-test-pic.patch 641
-MD5 a027d08f2ebf945adadab34773c19445 memtest86-3.2.ebuild 1956
+RMD160 043bf5611ee3ea1c1d9054b17eec5f192ff96c82 files/memtest86-3.2-test-pic.patch 641
+SHA256 f575c559b9f9b3ead5d2957524421f841596f3cec98f65de9764c29a2dc1d4db files/memtest86-3.2-test-pic.patch 641
+DIST memtest86-3.2.tar.gz 131309 RMD160 95477b0dea1a13fdcdd28e01f0a99109702b3ed3 SHA1 7df757d79e4cc4d8adfda78c7e46e0d9e0646a7f SHA256 e8a86e30946349b624d51efd73332ebdeeee28f74b882ae8086bb7831175b22a
+EBUILD memtest86-3.2.ebuild 2034 RMD160 fc6ad7c616158dc5f4db33f6b54944605c28e626 SHA1 79af216657eebd67ac96305371d93f2ed3154353 SHA256 bd6ee5aeef50ac3c51955fdd3a85e9ab662cc35528402355ff4d2e0bb4ca74b2
+MD5 845512e80f126ad2a7705668587a7374 memtest86-3.2.ebuild 2034
+RMD160 fc6ad7c616158dc5f4db33f6b54944605c28e626 memtest86-3.2.ebuild 2034
+SHA256 bd6ee5aeef50ac3c51955fdd3a85e9ab662cc35528402355ff4d2e0bb4ca74b2 memtest86-3.2.ebuild 2034
+MISC ChangeLog 4209 RMD160 f40e2bf0ccba9f27fa1d8fda46314050b7626f26 SHA1 cb885ab23262e8c13e02d2f62e9e03a10c896ecb SHA256 e49764e8742a40277d2fd99a3f4369a4dbbf762d7f3e3bf72c82e0f2996c3464
+MD5 fca39b005dae0d4d01edeb51c255f4ce ChangeLog 4209
+RMD160 f40e2bf0ccba9f27fa1d8fda46314050b7626f26 ChangeLog 4209
+SHA256 e49764e8742a40277d2fd99a3f4369a4dbbf762d7f3e3bf72c82e0f2996c3464 ChangeLog 4209
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDiMJ9OpjtAl+gMRURAnV+AJ9qgPc3+SVQbjrKDuqujTLsziYobwCgyZbE
-jYu1Ff5ZVyPVFlw5dVeNXbc=
-=vExa
------END PGP SIGNATURE-----
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 dafd6c576aea2c0b360ed3d358744cf8 files/digest-memtest86-3.2 241
+RMD160 20faa7014837adcf5aed0574289671f7acb4ae8c files/digest-memtest86-3.2 241
+SHA256 ca11e9f5f4cdf452aea59e68387dff157b0aeed37328d549c9e29d8336a8848b files/digest-memtest86-3.2 241
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.2 b/sys-apps/memtest86/files/digest-memtest86-3.2
index 7174d58c9383..4eaa09d21d43 100644
--- a/sys-apps/memtest86/files/digest-memtest86-3.2
+++ b/sys-apps/memtest86/files/digest-memtest86-3.2
@@ -1 +1,3 @@
 MD5 46028d276c39c2eebe7759ba813f97df memtest86-3.2.tar.gz 131309
+RMD160 95477b0dea1a13fdcdd28e01f0a99109702b3ed3 memtest86-3.2.tar.gz 131309
+SHA256 e8a86e30946349b624d51efd73332ebdeeee28f74b882ae8086bb7831175b22a memtest86-3.2.tar.gz 131309
diff --git a/sys-apps/memtest86/memtest86-3.2.ebuild b/sys-apps/memtest86/memtest86-3.2.ebuild
index 63bafbdd20c7..3ab6011fd8f7 100644
--- a/sys-apps/memtest86/memtest86-3.2.ebuild
+++ b/sys-apps/memtest86/memtest86-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.5 2005/11/26 20:15:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.6 2006/06/06 20:17:17 mr_bones_ Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 x86"
 IUSE="serial"
-RESTRICT="maketest"
+RESTRICT="test"
 
 DEPEND="virtual/libc"
 
@@ -23,21 +23,25 @@ src_unpack() {
 	test_flag -fno-stack-protector && \
 		epatch "${FILESDIR}"/${P}-solar.patch #66630
 
-	sed -i -e '/DISCARD/d' memtest_shared.lds
-
-	use serial && \
 	sed -i \
-		-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-		config.h
+		-e '/DISCARD/d' memtest_shared.lds \
+		|| die "sed failed"
+
+	if use serial ; then
+		sed -i \
+			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h \
+			|| die "sed failed"
+	fi
 }
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	insinto /boot/memtest86
-	doins memtest.bin || die
+	doins memtest.bin || die "doins failed"
 	dodoc README README.build-process
 }
 
@@ -52,11 +56,11 @@ 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