Fix build of live ebuild after info manual fixes (bug #389685).

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

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 1c0c955a01db3d51bcae4299ff29e17c50f63cfa..e017e83907e970675f08f457041b7e85e729d5fa 100644 (file)
--- 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.171 2011/11/11 11:33:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.172 2011/11/11 13:42:09 flameeyes Exp $
+
+  11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> grub-1.99-r2.ebuild,
+  grub-9999.ebuild:
+  Fix build of live ebuild after info manual fixes (bug #389685).
 
   11 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop me from maint.

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d88cfba1b29e84e56fc94719773ca877d4b3371a..5d928baf238be9672ddf751709289df8c0f0f465 100644 (file)
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -41,24 +41,14 @@ 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 8173 RMD160 54cfa0067d173e38556f186e7cf112773c56b1a9 SHA1 738039d456a90d29cac850b63aaaa173923c202d SHA256 92d939e9d5a6554f19f2435c1f3ca2ae16510864216fe71c9c4ea90ea1cb4a0b
-EBUILD grub-9999.ebuild 7958 RMD160 eba980f636eea345ce5bed4d965c9882a1517fce SHA1 9ef7a9d8403a9bbf6c8047571e50056e8f3709ec SHA256 f40cbd4dccf473b6a5789b4ad08cc1c27cf4a3e35c5c42fbbf2f8a736af15fcf
-MISC ChangeLog 35064 RMD160 c57bb1e99b52c88a8d6a4ed3c6003add0317cd7c SHA1 56705deb31113a78d8647438f851f53f69c8cccc SHA256 c4e45d4f2b8785dbb319563aa81746fe5520c28864f70381460204548bf2f64f
+EBUILD grub-1.99-r2.ebuild 8351 RMD160 66d660d94ec8069ca9e2b87b8a595398e2dc03b5 SHA1 5a6c5d46d0e141bbc0f1d14bf063b66a92926ff9 SHA256 760f69c25452c6aa78f8a15c8fa16e919bb25e853d1153b5ddea26360373b838
+EBUILD grub-9999.ebuild 8136 RMD160 dae76a20776c0e141eadb59b41a1c8957d63ce01 SHA1 0d3435fc39803b847fedbac145f5992f4fcd513c SHA256 91ce3a766baef16330d04b339646df40d9ea29819e622980480f85f8adf749e1
+MISC ChangeLog 35228 RMD160 8c29c385417a34d534cb2ad619ee9557581bcd23 SHA1 322cbba35400f1c4066b02017fc2645649f7277d SHA256 df16bf18631eaa09da427831be7bce8d97b7c0d5ae89e32a91d895c66cb0c7e8
 MISC metadata.xml 339 RMD160 755d01714b2122044f91caa8edd71b0ee4436d8e SHA1 4383abb52e4eb0cbe5215f9b0d86f3977eeee674 SHA256 62efb79ff5e2adec3535622af752bbb291b5b6c130094447364c567a5ff2e1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOvQfzAAoJEOSiRoyO7jvo+wIP+wZlrGOjSUEW6hzNhUVFqfrc
-GK3WE1lunDIC6Zj7avwFIh+6PhcastvCwKeTegxS50OqkxBVL5xr5Q5nMrCjFkDz
-1/kfAZzkSzXrzygLs9sWwv0EtFg1lsVK41foJV7xLYkDpjEBvy9EZlglQJADQ/zO
-o/T0Kq/IPlr1p7mrX8KAdzYuR9ZgvI+z+0ej/dPjGINbZ4vRxnkkBSbbJG+igLwu
-CB61xQZEHg4ep3yK0YvdpmfYsPvPooVdIsP6h8DydVQNoj5nkP4oBP+5WEJZjkrh
-KCcA9cg8CSk+BLid14dAJxlvpdWRdr4n5x2jnlN1xlfFo06kt/g7Ii7Tewgv7w8z
-PhOT0XIhgHqUhuvo/WupV+d21sGJkZ38iiWveDWmGWHarESRxIFubil4NN2ixTCa
-+u9E/gUIL8QvAdlpSZdyhPxD12YcbCxwlysCHF3zCb7WYkhhXEQWk21sjLlBV7Rn
-ip5lQwLWgxwV6lzVKSepU8q6U9s1nPsOWPrq+kgofRaYW096Ml05USmWdXVhRTVx
-w6EQqvHo3NlZ43X8DDrCw7QZ9FOpapVf2hrWxWdIQum753bdc58SlWnUyiNr8ecW
-Y7bk3e8GxmDmOleSOq0DC3eEualYNdiTX0fW3HN5la7YUb76THBq5fpbYiiJtnKh
-R7zQTUrgma+N/4Ndakm0
-=BbSu
+iEYEARECAAYFAk69JiIACgkQAiZjviIA2XgovACg5C29vk/KWfxtYgGr8LP8Tg8k
+PnsAoO30lJA4uwcShM2Ev/YOEMFSilJ5
+=ft//
 -----END PGP SIGNATURE-----

diff --git a/sys-boot/grub/grub-1.99-r2.ebuild b/sys-boot/grub/grub-1.99-r2.ebuild
index 4133a4d176d264b0642819d728036d4edd9e37ae..d897605e25235a338ec8a056f2c2787234ff0de0 100644 (file)
--- 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.6 2011/11/02 15:09:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.7 2011/11/11 13:42:09 flameeyes Exp $
 
 EAPI=4
 
@@ -225,9 +225,14 @@ src_install() {
                grub_run_phase ${FUNCNAME} ${i}
        done
 
-       # slot all collisions with grub legacy
-       mv "${ED}"/usr/share/info/grub.info \
-               "${ED}"/usr/share/info/grub2.info || die
+       # No need to move the info file with the live ebuild since we
+       # already changed the generated file name during the preparation
+       # phase.
+       if [[ ${PV} != "9999" ]]; then
+               # slot all collisions with grub legacy
+               mv "${ED}"/usr/share/info/grub.info \
+                       "${ED}"/usr/share/info/grub2.info || die
+       fi
 
        # Do pax marking
        local PAX=(

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index b3b77b56ded61de5ed8a366fc3b7e26f30cc1c33..4cb523da4a70e2755dab23ecae7fd5b97a290889 100644 (file)
--- 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.45 2011/11/02 15:09:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.46 2011/11/11 13:42:09 flameeyes Exp $
 
 EAPI=4
 
@@ -221,9 +221,14 @@ src_install() {
                grub_run_phase ${FUNCNAME} ${i}
        done
 
-       # slot all collisions with grub legacy
-       mv "${ED}"/usr/share/info/grub.info \
-               "${ED}"/usr/share/info/grub2.info || die
+       # No need to move the info file with the live ebuild since we
+       # already changed the generated file name during the preparation
+       # phase.
+       if [[ ${PV} != "9999" ]]; then
+               # slot all collisions with grub legacy
+               mv "${ED}"/usr/share/info/grub.info \
+                       "${ED}"/usr/share/info/grub2.info || die
+       fi
 
        # Do pax marking
        local PAX=(