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

(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

3 files changed, 21 insertions, 11 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/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