Include minor fixes from Robert Trace <rtrace{at}farcaster.org>

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

4 files changed, 44 insertions, 14 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index b9dbc571a2e6..c84676626967 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.167 2011/09/14 17:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.168 2011/10/03 09:10:13 scarabeus Exp $
+
+  03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
+  grub-9999.ebuild:
+  Include minor fixes from Robert Trace <rtrace{at}farcaster.org>
 
   14 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index de4d8ee9edbd..7086bd8df0d4 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.99-call_proper_grub_probe.patch 536 RMD160 28e914f6ef8e2d9eb73316fa8e5d29b6541d806f SHA1 91237ebbe574baf48d05302c01422c0f0b5c8b49 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8
 AUX 1.99-do_not_stat_so_often.patch 1731 RMD160 ed04af18876c27ca6a85d627d2082a773add19c8 SHA1 ee1936e26f2a3f564195385465752ccee7d29713 SHA256 a33fdbcab7fa4ad66b26598d9a6f1703f419229058c1e9c9c14edb6272783727
 AUX 1.99-improve_devmapper.patch 7134 RMD160 a8dbf91626c607f5fec85235a2042b7e82ffd8d2 SHA1 d3684f80d5f319059ccee1f6822b5a96dd467258 SHA256 b12624944d129820966146d55693b325d48d5d56901727142e386be082661778
@@ -38,7 +41,24 @@ EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6
 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff
 EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
-EBUILD grub-1.99-r2.ebuild 7702 RMD160 f101c28d65d7e2149b81b53c0d36fb54e6ddd185 SHA1 90cffc7796ff84287eb44f201e4a17ed99cb6d0d SHA256 d1b3cfdbcf77120f24d0341d32c968b71bd17c40c5ae2de64d1fc4a3bc00a521
-EBUILD grub-9999.ebuild 7487 RMD160 b76535cc3461605dac35feb7d6d4e2c9ca9d9946 SHA1 b22cfc108bcf15758a15c383f080f841168beb19 SHA256 1039008f6e7bbccaa362d6a425d6e2531e5a7227c749e09ecbea0359053e9d13
-MISC ChangeLog 34370 RMD160 899dd80d504d68ca010a936978345c523e51167e SHA1 823f40aad95cf906534af6cf614a409b4aa22470 SHA256 424a8fc167adbeeed575c430c688c0766392a6877f4a407502b68a78b8581246
+EBUILD grub-1.99-r2.ebuild 7758 RMD160 3397d3eca513512a27d07f74bfb2bd736eea8f93 SHA1 f2556faa5d263f234ebc5cba9e5a089cb8a566fa SHA256 1c464401560e59ebabc458c6750fe66e837c66fe72d73861f6f21b517cce2dec
+EBUILD grub-9999.ebuild 7543 RMD160 5dce1585f004694c229d6ad0ebf4999cbbf5f664 SHA1 e1aa0fcfce14d5a30e6dab130bbd28c82b9b736f SHA256 0f9c0a749f770dc30f38c4f2b76f0eae6ed944d8bf174db74c9f45f781ab9d69
+MISC ChangeLog 34533 RMD160 3239dcb947a6ac7f920787b187acd5fd37759a84 SHA1 ef75f9be36cd887b56f1a38852c14a3f79581f28 SHA256 f78d8b614cd109cd9341bc7565277a239c3cb88f99317e938377e4bce3fa5b85
 MISC metadata.xml 515 RMD160 7ff103974a6e301b4ba14c55c674c1bf35b1a045 SHA1 05d70f211a5f37e1368b74f7a74b0830d8198787 SHA256 dc713fb7db877b0d8405ac8dba28c4253347205a46d677ffe71901c2f017fb0c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOiXy4AAoJEOSiRoyO7jvoFcQP/jQCv6VDwht+xActVb6XrOHR
+OPzjwcBkdLvDZn8WRTl0GuXd7IQo4rimU1UkNIRG2OGfyttVAey7GpU0KmEqAyWe
+bwl5Bg1IZJ5ALEJy4+n2c3pkkBecEu7UqiSdlXBfCyFnGnEZRRcM/XtjLQgGz880
+ndWj4YRzclPBvUsZovK8cW9rg9c62nPdOf2FedJQcA+cHgoQgJA2ltL3rMZAyvw2
+AFzwAWh2nvbbmbcqjfGLKdxxD+npUzMJkv661F8TfctPW63r+XmyKrFiYzPMSFMM
+DFjrJ1CnJC+6dlgkVNrmptKpWyrIuAO3cE/RuQ9oOQANNUL9/Hd4dw9NfYYsrmsy
+DY7Bh0VTMZA/T1JuQjwm2uygkwLP3k8HoR5EUeLemRckh2l7/slRbSUdl33ewPSj
+0nRxJ7vIB9sLS68WyXYpekaREycLaa4EK7UJItgKlK4w7U4tftSP1zDF1aXcy8DV
+aGLNAN/5FsOWyaHBxCzkh/XMDWq8jLIBfpzZkgs1o2S3gM0/c+Q+EO4ikn49Pr+x
+dI7vyMzbdUt4TSS1/jP3/G4kNMDtqnPscVCx0Z/L4LTHyrVRi5DdzhnOcrqiPMew
+rRc1Ee2Xwc2a3T1AcoNcI+3gd4NJqKFi7eP/Ifl2upavlQo33jWeF/BcDr4dtcRH
+NaTUYjMyDSykw5n9WlD0
+=NCth
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.99-r2.ebuild b/sys-boot/grub/grub-1.99-r2.ebuild
index a459df8060d3..846e65dff81b 100644
--- a/sys-boot/grub/grub-1.99-r2.ebuild
+++ b/sys-boot/grub/grub-1.99-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.3 2011/09/14 17:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.4 2011/10/03 09:10:13 scarabeus Exp $
 
 EAPI=4
 
@@ -235,10 +235,10 @@ src_install() {
 		"bin/grub2-mkimage"
 	)
 	for e in ${PAX[@]}; do
-		pax-mark -mpx "${ED}/${e}"
+		pax-mark -mp "${ED}/${e}"
 	done
 
-	# can't be in docs array as we use defualt_src_install in different builddir
+	# can't be in docs array as we use default_src_install in different builddir
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/default
 	newins "${FILESDIR}"/grub.default grub
@@ -246,7 +246,7 @@ src_install() {
 	GRUB_DISTRIBUTOR="Gentoo"
 EOF
 
-	elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
+	elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
 	elog "to set up basic settings for this package."
 }
 
@@ -254,9 +254,12 @@ setup_boot_dir() {
 	local dir=$1
 
 	# display the link to guide
-	elog "For informations how to configure grub-2 please reffer to the guide:"
+	elog "For informations how to configure grub-2 please refer to the guide:"
 	elog "    http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
 
+	# Make sure target directory exists
+	mkdir -p "${dir}"
+
 	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
 		# This is first grub2 install and we have old configuraton for
 		# grub1 around. Lets try to generate grub.cfg from it so user
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 697bef02927a..d9d99c5c7465 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.42 2011/09/14 17:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.43 2011/10/03 09:10:13 scarabeus Exp $
 
 EAPI=4
 
@@ -231,10 +231,10 @@ src_install() {
 		"bin/grub2-mkimage"
 	)
 	for e in ${PAX[@]}; do
-		pax-mark -mpx "${ED}/${e}"
+		pax-mark -mp "${ED}/${e}"
 	done
 
-	# can't be in docs array as we use defualt_src_install in different builddir
+	# can't be in docs array as we use default_src_install in different builddir
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/default
 	newins "${FILESDIR}"/grub.default grub
@@ -242,7 +242,7 @@ src_install() {
 	GRUB_DISTRIBUTOR="Gentoo"
 EOF
 
-	elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
+	elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
 	elog "to set up basic settings for this package."
 }
 
@@ -250,9 +250,12 @@ setup_boot_dir() {
 	local dir=$1
 
 	# display the link to guide
-	elog "For informations how to configure grub-2 please reffer to the guide:"
+	elog "For informations how to configure grub-2 please refer to the guide:"
 	elog "    http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
 
+	# Make sure target directory exists
+	mkdir -p "${dir}"
+
 	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
 		# This is first grub2 install and we have old configuraton for
 		# grub1 around. Lets try to generate grub.cfg from it so user