Remove GRUB device ID translation code (bug #260547).

Package-Manager: portage-2.1.6.9/cvs/Linux x86_64

5 files changed, 22 insertions, 57 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 8c550bf2a422..61b54e3f03e4 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.47 2009/02/09 21:26:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.48 2009/03/22 08:40:40 spock Exp $
+
+  22 Mar 2009; Michał Januszewski <spock@gentoo.org>
+  memtest86+-2.01.ebuild, memtest86+-2.10.ebuild, memtest86+-2.11.ebuild:
+  Remove GRUB device ID translation code (bug #260547).
 
   09 Feb 2009; Michał Januszewski <spock@gentoo.org>
   memtest86+-2.01.ebuild, memtest86+-2.10.ebuild, memtest86+-2.11.ebuild:
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 7e80bc1a03ad..ec8f9e8bb32e 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -8,15 +8,15 @@ AUX memtest86+-2.11-hardcoded_cc.patch 1210 RMD160 9f153d1d4e80b37479cdbebe760c4
 DIST memtest86+-2.01.tar.gz 165984 RMD160 cdd94d9ea1089387bba8bd024c5cb39b741cba9f SHA1 3420652300e397891af8b263318dc08144e8b4a4 SHA256 35ad452f4fd12f07756abccccf1bce70d42596c2c5e9c29247ffc8e0b76bd1ae
 DIST memtest86+-2.10.tar.gz 165987 RMD160 e782d067899361bbf931206742318c136467c432 SHA1 a687513b118fc3d43c2b83d9baed835eb2380786 SHA256 d951e4888e8b793832ae1dad2716863fe6d96976a8cc258a7298e2cbfac8136e
 DIST memtest86+-2.11.tar.gz 165937 RMD160 2f210dd17725ead0ef3daf1181184d2a7a071774 SHA1 5cebc90126403c1e918fd05670546800b66ed113 SHA256 43876a7221e39cde791f20d04ecb071adfa08975cac2e511d04359619ce16c0e
-EBUILD memtest86+-2.01.ebuild 1833 RMD160 8dc6a35dc492629ce9e0597c71558605f54f3b67 SHA1 765bba2f2d607f027713d74732dc1a350a25d4f5 SHA256 6fcf9f3af52d56b951c672ec8ceb9592c6ce0f310d979d5720fd1c7b9ca13319
-EBUILD memtest86+-2.10.ebuild 1835 RMD160 21f52efcdbf3a64b2f469f77a967fbcacccad599 SHA1 fa2ee25625894f4213d5fcd1758900a11277fc08 SHA256 88e020caef33899a8cdecfa27b141a07a55dae8c6a11b60a1da9d8cd418f1db8
-EBUILD memtest86+-2.11.ebuild 1846 RMD160 b2d4bf8acc075768e28bc052a0cd67bc9d8d4029 SHA1 e3f04c829df0131413cc89b031aa148376a6e688 SHA256 143cd15cb68b53898d1b0736bfb01d6ac7c748798e7cb18b4b8a1cf31f9cf947
-MISC ChangeLog 7770 RMD160 fac25460c30ce4606dae9341213e604951c98a81 SHA1 6f4d138015cea153e32332c52e21ed23cd004603 SHA256 6f710d069fa19ea6b2305a557e9ebfa1871b8a07ee33b57447329d57a0fff2ab
+EBUILD memtest86+-2.01.ebuild 1390 RMD160 087717dbdb8fe993df5880f382e4689d4d14633a SHA1 e1f32f03fa4b7d8d47ccd63f94e1132706dcb39b SHA256 a5f27eb3b8331eeb70ce87203058bc4d9f30f7c59779a7b0ecc4e4a8793e3dbd
+EBUILD memtest86+-2.10.ebuild 1392 RMD160 24bc653279fc908dd0bb2b201e47b153f46f0948 SHA1 e9634aaf5a71dffbdc676bbb707866405d0cb515 SHA256 15835cb1e972e211e9efa44fd2e69593f2fb274ba736aed1d706fef246521721
+EBUILD memtest86+-2.11.ebuild 1403 RMD160 4e16c851ee1cbb5bdffd7268102376957a9eb2f4 SHA1 59486c5f0dc3470256975bfbcab745597d6c4b2c SHA256 3be4550d9212fe3c05a5806c0946eb9223c9bba655038cb7dfe859ed17ba9cfe
+MISC ChangeLog 7955 RMD160 a3e266197c8d82cdc21d7c571382439a2dc19aed SHA1 1f1978099072c4e02625a565a19f43c10bccf2fd SHA256 9f558e3e17de3498c127bb97125fd51dec51691f01d6d7eca14efcc16df5331a
 MISC metadata.xml 334 RMD160 5aa147c5b7c317b501281dcfbfdef447deaf4d09 SHA1 5dc1ab7bcf2e85590312e7cb7fa8dbea3deccf73 SHA256 3872db066e8e6a0f7a4e8b3ef82aa3b033d4fe0b88ba715ff79073c13db6a78e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmQn6oACgkQchej4aZK9/e6KwCfeCBs9DsuVgC/kVIffQaF8D76
-yeAAnR3hxZFBngUwFa3hmG78ktlMQEM5
-=wpvs
+iEYEARECAAYFAknF+ZkACgkQchej4aZK9/fZ+QCfQzDrV1ZW38kr+csLKDral59G
+ROgAnjNMN0UcMznvP9aCxRmVCVZJnLSk
+=icA8
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/memtest86+-2.01.ebuild b/sys-apps/memtest86+/memtest86+-2.01.ebuild
index 797d0a371f28..82bd91fa28bf 100644
--- a/sys-apps/memtest86+/memtest86+-2.01.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.01.ebuild,v 1.3 2009/02/09 21:26:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.01.ebuild,v 1.4 2009/03/22 08:40:40 spock Exp $
 
 inherit mount-boot eutils
 
@@ -44,22 +44,9 @@ pkg_postinst() {
 	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:3}-1)))"
-	fi
-	einfo " - For grub:"
+	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
 	einfo "    > title=Memtest86Plus"
-	einfo "    > root ${root}"
+	einfo "    > root (hd?,?)"
 	einfo "    > kernel /boot/memtest86plus/memtest.bin"
 
 	einfo " - For lilo:"
diff --git a/sys-apps/memtest86+/memtest86+-2.10.ebuild b/sys-apps/memtest86+/memtest86+-2.10.ebuild
index 5057f465108e..7218fc73af37 100644
--- a/sys-apps/memtest86+/memtest86+-2.10.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.10.ebuild,v 1.3 2009/03/22 08:40:40 spock Exp $
 
 inherit mount-boot eutils
 
@@ -44,22 +44,9 @@ pkg_postinst() {
 	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:3}-1)))"
-	fi
-	einfo " - For grub:"
+	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
 	einfo "    > title=Memtest86Plus"
-	einfo "    > root ${root}"
+	einfo "    > root (hd?,?)"
 	einfo "    > kernel /boot/memtest86plus/memtest.bin"
 
 	einfo " - For lilo:"
diff --git a/sys-apps/memtest86+/memtest86+-2.11.ebuild b/sys-apps/memtest86+/memtest86+-2.11.ebuild
index 05e9a31a6751..4c80150c8c48 100644
--- a/sys-apps/memtest86+/memtest86+-2.11.ebuild
+++ b/sys-apps/memtest86+/memtest86+-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.2 2009/02/09 21:26:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.11.ebuild,v 1.3 2009/03/22 08:40:40 spock Exp $
 
 inherit mount-boot eutils
 
@@ -45,22 +45,9 @@ pkg_postinst() {
 	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:3}-1)))"
-	fi
-	einfo " - For grub:"
+	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
 	einfo "    > title=Memtest86Plus"
-	einfo "    > root ${root}"
+	einfo "    > root (hd?,?)"
 	einfo "    > kernel /boot/memtest86plus/memtest.bin"
 
 	einfo " - For lilo:"