sys-boot/grub: adjust bootstrap logic

Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 0663509415edd84a9806dd9b2bff9bbe8487bbdd..c35bda09b14da066ede51c7b3dacb2fab34dd0d9 100644 (file)
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -4,12 +4,11 @@
 EAPI=6
 
 if [[ ${PV} == 9999  ]]; then
-       GRUB_AUTOGEN=1
        GRUB_AUTORECONF=1
        GRUB_BOOTSTRAP=1
 fi
 
-if [[ -n ${GRUB_AUTOGEN} ]]; then
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
        PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
        inherit python-any-r1
 fi
@@ -164,14 +163,15 @@ src_prepare() {
                tests/util/grub-fs-tester.in \
                || die
 
-       if [[ -n ${GRUB_AUTOGEN} ]]; then
+       if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
                python_setup
-               if [[ -n ${GRUB_BOOTSTRAP} ]]; then
-                       eautopoint --force
-                       AUTOPOINT=: AUTORECONF=: ./bootstrap || die
-               else
-                       ./autogen.sh || die
-               fi
+       fi
+
+       if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+               eautopoint --force
+               AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+       elif [[ -n ${GRUB_AUTOGEN} ]]; then
+               ./autogen.sh || die
        fi
 
        if [[ -n ${GRUB_AUTORECONF} ]]; then