Rename grub-install manpage and grub2-set-default script for USE=multislot #288877 by pyon.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 18 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 9af1f6a02fcc..cf4a66ab5490 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.136 2010/07/06 00:33:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.137 2010/07/06 00:41:18 vapier Exp $
+
+  06 Jul 2010; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild,
+  grub-9999.ebuild:
+  Rename grub-install manpage and grub2-set-default script for USE=multislot
+  #288877 by pyon.
 
   06 Jul 2010; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild,
   +files/grub-1.99-genkernel.patch, grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f5dfe3d26094..eb7b2f53c692 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -37,14 +37,14 @@ EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6
 EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce SHA1 9557b2edc8ba61766cd35a2a4d37e26434aaeff7 SHA256 34a4d4ffb38e0bf0ba2647933b7aa341c72537add518bc4ec217419619c1f960
 EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.98.ebuild 2848 RMD160 46e14f2055bf315801513078f8211815ea60a63e SHA1 31f2758175a0a285d39f9a3c8616e4d04650a2b1 SHA256 f88366db104ff1b31ea0186f198ba95cc7c7fc3a6c7aa3dcee48583af75a085e
-EBUILD grub-9999.ebuild 2882 RMD160 a687442cb6255f74313a958d6d6675536eed2444 SHA1 f54a77b8a72fcd8c0f00060625ceb826e7781ed8 SHA256 a998c12087daef1951b56c26363e09e9686ee0efe2df9b2c78cc2ecee2e72cd1
-MISC ChangeLog 28711 RMD160 d9705b450ed4e12d8306fedbd25d1a6f7c88cb37 SHA1 45039d3a4ecd1b114a54c2bd9d6a6ef6fe36dac3 SHA256 21386da57e62a6ea3b51e4e8279c424f41fd6ed9fef132bcde4e83d953f88aea
+EBUILD grub-1.98.ebuild 2950 RMD160 e9596d8662b5ef606c3ada0fcc29ac7c1166a44c SHA1 49c952318ddb37d8d50c03c240b50c894585d5e6 SHA256 758e5407a4252476d2cad7144f404475e53aafbdb88e6a073ee0be29ad06b9dd
+EBUILD grub-9999.ebuild 2984 RMD160 b419a61eb223d2376df54e165f8944f7b0b0cbb8 SHA1 5a6404f69e72d05ff9a118b8419c6890a2c6383d SHA256 d79666bf868b23c8f0ae42e831512074a0125a2a14987e62d8fca2e51de974dc
+MISC ChangeLog 28896 RMD160 53f197086a91180c1c90d87c1a75a5c4ea28c597 SHA1 052206c674dea0c480125c49e7ec0244b669c731 SHA256 f775c54ed25ea38a6dd83991b583a6e1cefaec981806944ff3047f7d25d66f23
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwyeYoACgkQTwhj9JtAlp46LgD/XK+3O83nZ3mcWWJ1IlIc4+SX
-m9Zh1qvqLeFMNjlG0hkBAIxzXgMcsnTiM9vT8nqCbHaxWYoU9/ULJyh73hA7lSQJ
-=5ZTl
+iF4EAREIAAYFAkwye1oACgkQTwhj9JtAlp65ZAD7Bg8aOP87XSQ36SG0Qwdq2J4c
+mzfowoPn1gZXgLCmdpsA/3ezsU0xfmPPnhdFgtCbm3MHakIbpl5n2QDfSegH2buY
+=dsb7
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild
index 2fea4f2b81aa..5ca4be067da6 100644
--- a/sys-boot/grub/grub-1.98.ebuild
+++ b/sys-boot/grub/grub-1.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.3 2010/07/06 00:33:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.4 2010/07/06 00:41:18 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -80,6 +80,8 @@ src_install() {
 	if use multislot ; then
 		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
 		mv "${D}"/sbin/grub{,2}-install || die
+		mv "${D}"/sbin/grub{,2}-set-default || die
+		mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
 		mv "${D}"/usr/share/info/grub{,2}.info || die
 	fi
 }
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 246179d87fea..71d3bd4654b9 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.21 2010/07/06 00:33:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.22 2010/07/06 00:41:18 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -81,6 +81,8 @@ src_install() {
 	if use multislot ; then
 		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
 		mv "${D}"/sbin/grub{,2}-install || die
+		mv "${D}"/sbin/grub{,2}-set-default || die
+		mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
 		mv "${D}"/usr/share/info/grub{,2}.info || die
 	fi
 }