commit:     6daa5197e9a530c71e1e78d25c1ffb356f78c972
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 15:41:38 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 15:41:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6daa5197

sys-boot/grub: drop 2.04-r2, 2.05_alpha20200310-r1

Bug: https://bugs.gentoo.org/773991
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/grub/Manifest                           |   2 -
 sys-boot/grub/files/2.04-sparc64-bios-boot.patch |  50 ----
 sys-boot/grub/grub-2.04-r2.ebuild                | 297 -----------------------
 sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild  | 288 ----------------------
 4 files changed, 637 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 34314f59641..aeb888abbb9 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,3 @@
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B 
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
 SHA512 
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.04.tar.xz 6393864 BLAKE2B 
413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0
 SHA512 
9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
-DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 
2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027
 SHA512 
7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
 DIST grub-2.06~rc1.tar.xz 6543784 BLAKE2B 
2cd322db808e09533aa91db3e03147896f3f8a2fb6bcc932161aace2f1bab9fd1ceb8b56eddf2e531413932c1ef407cdaf5aae49c0b26e7c6c308dbf7916685d
 SHA512 
093890b0af71b0d346afb415dec106681fd9e3f2f5bda14093c060b861d55ee1b50c8fb24afd072d24968ebebedde290f8220b0374cbd2b2e4508dfb00924122
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
 SHA512 
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0

diff --git a/sys-boot/grub/files/2.04-sparc64-bios-boot.patch 
b/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
deleted file mode 100644
index 8fd00d497ad..00000000000
--- a/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4e75b2ae313b13b5bfb54cc5e5c53368d6eb2a08 Mon Sep 17 00:00:00 2001
-From: James Clarke <jrt...@jrtc27.com>
-Date: Thu, 18 Jul 2019 14:31:55 +0200
-Subject: [PATCH] sparc64: Fix BIOS Boot Partition support
-
-Currently, gpt_offset is uninitialised when using a BIOS Boot Partition
-but is used unconditionally inside save_blocklists. Instead, ensure it
-is always initialised to 0 (note that there is already separate code to
-do the equivalent adjustment after we call save_blocklists on this code
-path).
-
-This patch has been tested on a T5-2 LDOM.
-
-Signed-off-by: James Clarke <jrt...@jrtc27.com>
-Tested-by: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
-Reviewed-by: Vladimir Serbinenko <phco...@gmail.com>
-Reviewed-by: Eric Snowberg <eric.snowb...@oracle.com>
-
----
- util/setup.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
----
- util/setup.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/util/setup.c b/util/setup.c
-index 6f88f3c..3be88aa 100644
---- a/util/setup.c
-+++ b/util/setup.c
-@@ -271,6 +271,9 @@ SETUP (const char *dir,
-   bl.current_segment =
-     GRUB_BOOT_I386_PC_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
- #endif
-+#ifdef GRUB_SETUP_SPARC64
-+  bl.gpt_offset = 0;
-+#endif
-   bl.last_length = 0;
- 
-   /* Read the boot image by the OS service.  */
-@@ -730,7 +733,6 @@ unable_to_embed:
- #ifdef GRUB_SETUP_SPARC64
-   {
-     grub_partition_t container = root_dev->disk->partition;
--    bl.gpt_offset = 0;
- 
-     if (grub_strstr (container->partmap->name, "gpt"))
-       bl.gpt_offset = grub_partition_get_start (container);
--- 
-cgit v1.0-41-gc330
-

diff --git a/sys-boot/grub/grub-2.04-r2.ebuild 
b/sys-boot/grub/grub-2.04-r2.ebuild
deleted file mode 100644
index 04aa2e74e31..00000000000
--- a/sys-boot/grub/grub-2.04-r2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999  ]]; then
-       GRUB_AUTORECONF=1
-       GRUB_BOOTSTRAP=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-       PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-       inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
-       WANT_LIBTOOL=none
-       inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils 
toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
-       if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-               # The quote style is to work with <=bash-4.2 and >=bash-4.3 
#503860
-               MY_P=${P/_/'~'}
-               SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz";
-               S=${WORKDIR}/${MY_P}
-       else
-               SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-               S=${WORKDIR}/${P%_*}
-       fi
-       KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
-else
-       inherit git-r3
-       EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git";
-fi
-
-PATCHES=(
-       "${FILESDIR}"/gfxpayload.patch
-       "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-       "${FILESDIR}"/2.04-sparc64-bios-boot.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-       themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/";
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( 
CC-BY-SA-3.0 BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype 
libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot 
qemu qemu-mips pc uboot xen xen-32 xen-pvh )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
-       grub_platforms_coreboot? ( fonts )
-       grub_platforms_qemu? ( fonts )
-       grub_platforms_ieee1275? ( fonts )
-       grub_platforms_loongson? ( fonts )
-"
-
-BDEPEND="
-       ${PYTHON_DEPS}
-       app-misc/pax-utils
-       sys-devel/flex
-       sys-devel/bison
-       sys-apps/help2man
-       sys-apps/texinfo
-       fonts? (
-               media-libs/freetype:2
-               virtual/pkgconfig
-       )
-       test? (
-               app-admin/genromfs
-               app-arch/cpio
-               app-arch/lzop
-               app-emulation/qemu
-               dev-libs/libisoburn
-               sys-apps/miscfiles
-               sys-block/parted
-               sys-fs/squashfs-tools
-       )
-       themes? (
-               app-arch/unzip
-               media-libs/freetype:2
-               virtual/pkgconfig
-       )
-       truetype? ( virtual/pkgconfig )
-"
-DEPEND="
-       app-arch/xz-utils
-       >=sys-libs/ncurses-5.2-r5:0=
-       grub_platforms_emu? (
-               sdl? ( media-libs/libsdl )
-       )
-       device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-       libzfs? ( sys-fs/zfs:= )
-       mount? ( sys-fs/fuse:0 )
-       truetype? ( media-libs/freetype:2= )
-       ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-       ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-"
-RDEPEND="${DEPEND}
-       kernel_linux? (
-               grub_platforms_efi-32? ( sys-boot/efibootmgr )
-               grub_platforms_efi-64? ( sys-boot/efibootmgr )
-       )
-       !sys-boot/grub:0 !sys-boot/grub-static
-       nls? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-src_unpack() {
-       if [[ ${PV} == 9999 ]]; then
-               git-r3_src_unpack
-               pushd "${P}" >/dev/null || die
-               local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git";
-               local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo 
"${GNULIB_REVISION}")
-               git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
-               git-r3_checkout "${GNULIB_URI}" gnulib
-               popd >/dev/null || die
-       fi
-       default
-}
-
-src_prepare() {
-       default
-
-       sed -i -e /autoreconf/d autogen.sh || die
-
-       # Nothing in Gentoo packages 'american-english' in the exact path
-       # wanted for the test, but all that is needed is a compressible text
-       # file, and we do have 'words' from miscfiles in the same path.
-       sed -i \
-               -e '/CFILESSRC.*=/s,american-english,words,' \
-               tests/util/grub-fs-tester.in \
-               || die
-
-       if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-               python_setup
-       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
-               eautoreconf
-       fi
-}
-
-grub_do() {
-       multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
-       multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
-       local platform
-
-       case ${MULTIBUILD_VARIANT} in
-               efi*) platform=efi ;;
-               xen-pvh) platform=xen_pvh ;;
-               xen*) platform=xen ;;
-               guessed) ;;
-               *) platform=${MULTIBUILD_VARIANT} ;;
-       esac
-
-       case ${MULTIBUILD_VARIANT} in
-               *-32)
-                       if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-                               local CTARGET=i386
-                       fi ;;
-               *-64)
-                       if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-                               local CTARGET=x86_64
-                               local -x TARGET_CFLAGS="-Os -march=x86-64 
${TARGET_CFLAGS}"
-                               local -x TARGET_CPPFLAGS="-march=x86-64 
${TARGET_CPPFLAGS}"
-                       fi ;;
-       esac
-
-       local myeconfargs=(
-               --disable-werror
-               --program-prefix=
-               --libdir="${EPREFIX}"/usr/lib
-               $(use_enable device-mapper)
-               $(use_enable mount grub-mount)
-               $(use_enable nls)
-               $(use_enable themes grub-themes)
-               $(use_enable truetype grub-mkfont)
-               $(use_enable libzfs)
-               $(use_enable sdl grub-emu-sdl)
-               ${platform:+--with-platform=}${platform}
-
-               # Let configure detect this where supported
-               $(usex efiemu '' '--disable-efiemu')
-       )
-
-       if use fonts; then
-               ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-       fi
-
-       if use themes; then
-               ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf 
|| die
-       fi
-
-       local ECONF_SOURCE="${S}"
-       econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-       # Bug 508758.
-       replace-flags -O3 -O2
-
-       # We don't want to leak flags onto boot code.
-       export HOST_CCASFLAGS=${CCASFLAGS}
-       export HOST_CFLAGS=${CFLAGS}
-       export HOST_CPPFLAGS=${CPPFLAGS}
-       export HOST_LDFLAGS=${LDFLAGS}
-       unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-       tc-ld-disable-gold #439082 #466536 #526348
-       export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
-       unset LDFLAGS
-
-       tc-export CC NM OBJCOPY RANLIB STRIP
-       tc-export BUILD_CC # Bug 485592
-
-       MULTIBUILD_VARIANTS=()
-       local p
-       for p in "${GRUB_ALL_PLATFORMS[@]}"; do
-               use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
-       done
-       [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed 
)
-       grub_do grub_configure
-}
-
-src_compile() {
-       # Sandbox bug 404013.
-       use libzfs && addpredict /etc/dfs:/dev/zfs
-
-       grub_do emake
-       use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
-       # The qemu dependency is a bit complex.
-       # You will need to adjust QEMU_SOFTMMU_TARGETS to match the 
cpu/platform.
-       grub_do emake check
-}
-
-src_install() {
-       grub_do emake install DESTDIR="${D}" 
bashcompletiondir="$(get_bashcompdir)"
-       use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
-       einstalldocs
-
-       insinto /etc/default
-       newins "${FILESDIR}"/grub.default-3 grub
-
-       # https://bugs.gentoo.org/231935
-       dostrip -x /usr/lib/grub
-}
-
-pkg_postinst() {
-       elog "For information on how to configure GRUB2 please refer to the 
guide:"
-       elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start";
-
-       if has_version 'sys-boot/grub:0'; then
-               elog "A migration guide for GRUB Legacy users is available:"
-               elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration";
-       fi
-
-       if [[ -z ${REPLACING_VERSIONS} ]]; then
-               elog
-               optfeature "detecting other operating systems (grub-mkconfig)" 
sys-boot/os-prober
-               optfeature "creating rescue media (grub-mkrescue)" 
dev-libs/libisoburn
-               optfeature "enabling RAID device detection" sys-fs/mdadm
-       fi
-}

diff --git a/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild 
b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
deleted file mode 100644
index a11de124e27..00000000000
--- a/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999  ]]; then
-       GRUB_AUTORECONF=1
-       GRUB_BOOTSTRAP=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-       PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-       inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
-       WANT_LIBTOOL=none
-       inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils 
toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
-       SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz";
-       KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
-else
-       inherit git-r3
-       EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git";
-fi
-
-PATCHES=(
-       "${FILESDIR}"/gfxpayload.patch
-       "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-       themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/";
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( 
CC-BY-SA-3.0 BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype 
libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot 
qemu qemu-mips pc uboot xen xen-32 xen-pvh )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
-       grub_platforms_coreboot? ( fonts )
-       grub_platforms_qemu? ( fonts )
-       grub_platforms_ieee1275? ( fonts )
-       grub_platforms_loongson? ( fonts )
-"
-
-BDEPEND="
-       ${PYTHON_DEPS}
-       app-misc/pax-utils
-       sys-devel/flex
-       sys-devel/bison
-       sys-apps/help2man
-       sys-apps/texinfo
-       fonts? (
-               media-libs/freetype:2
-               virtual/pkgconfig
-       )
-       test? (
-               app-admin/genromfs
-               app-arch/cpio
-               app-arch/lzop
-               app-emulation/qemu
-               dev-libs/libisoburn
-               sys-apps/miscfiles
-               sys-block/parted
-               sys-fs/squashfs-tools
-       )
-       themes? (
-               app-arch/unzip
-               media-libs/freetype:2
-               virtual/pkgconfig
-       )
-       truetype? ( virtual/pkgconfig )
-"
-DEPEND="
-       app-arch/xz-utils
-       >=sys-libs/ncurses-5.2-r5:0=
-       grub_platforms_emu? (
-               sdl? ( media-libs/libsdl )
-       )
-       device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-       libzfs? ( sys-fs/zfs:= )
-       mount? ( sys-fs/fuse:0 )
-       truetype? ( media-libs/freetype:2= )
-       ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-       ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
-"
-RDEPEND="${DEPEND}
-       kernel_linux? (
-               grub_platforms_efi-32? ( sys-boot/efibootmgr )
-               grub_platforms_efi-64? ( sys-boot/efibootmgr )
-       )
-       !sys-boot/grub:0 !sys-boot/grub-static
-       nls? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-src_unpack() {
-       if [[ ${PV} == 9999 ]]; then
-               git-r3_src_unpack
-               pushd "${P}" >/dev/null || die
-               local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git";
-               local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo 
"${GNULIB_REVISION}")
-               git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
-               git-r3_checkout "${GNULIB_URI}" gnulib
-               popd >/dev/null || die
-       fi
-       default
-}
-
-src_prepare() {
-       default
-
-       sed -i -e /autoreconf/d autogen.sh || die
-
-       # Nothing in Gentoo packages 'american-english' in the exact path
-       # wanted for the test, but all that is needed is a compressible text
-       # file, and we do have 'words' from miscfiles in the same path.
-       sed -i \
-               -e '/CFILESSRC.*=/s,american-english,words,' \
-               tests/util/grub-fs-tester.in \
-               || die
-
-       if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-               python_setup
-       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
-               eautoreconf
-       fi
-}
-
-grub_do() {
-       multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
-       multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
-       local platform
-
-       case ${MULTIBUILD_VARIANT} in
-               efi*) platform=efi ;;
-               xen-pvh) platform=xen_pvh ;;
-               xen*) platform=xen ;;
-               guessed) ;;
-               *) platform=${MULTIBUILD_VARIANT} ;;
-       esac
-
-       case ${MULTIBUILD_VARIANT} in
-               *-32)
-                       if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-                               local CTARGET=i386
-                       fi ;;
-               *-64)
-                       if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-                               local CTARGET=x86_64
-                               local -x TARGET_CFLAGS="-Os -march=x86-64 
${TARGET_CFLAGS}"
-                               local -x TARGET_CPPFLAGS="-march=x86-64 
${TARGET_CPPFLAGS}"
-                       fi ;;
-       esac
-
-       local myeconfargs=(
-               --disable-werror
-               --program-prefix=
-               --libdir="${EPREFIX}"/usr/lib
-               $(use_enable device-mapper)
-               $(use_enable mount grub-mount)
-               $(use_enable nls)
-               $(use_enable themes grub-themes)
-               $(use_enable truetype grub-mkfont)
-               $(use_enable libzfs)
-               $(use_enable sdl grub-emu-sdl)
-               ${platform:+--with-platform=}${platform}
-
-               # Let configure detect this where supported
-               $(usex efiemu '' '--disable-efiemu')
-       )
-
-       if use fonts; then
-               ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-       fi
-
-       if use themes; then
-               ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf 
|| die
-       fi
-
-       local ECONF_SOURCE="${S}"
-       econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-       # Bug 508758.
-       replace-flags -O3 -O2
-
-       # We don't want to leak flags onto boot code.
-       export HOST_CCASFLAGS=${CCASFLAGS}
-       export HOST_CFLAGS=${CFLAGS}
-       export HOST_CPPFLAGS=${CPPFLAGS}
-       export HOST_LDFLAGS=${LDFLAGS}
-       unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-       tc-ld-disable-gold #439082 #466536 #526348
-       export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
-       unset LDFLAGS
-
-       tc-export CC NM OBJCOPY RANLIB STRIP
-       tc-export BUILD_CC # Bug 485592
-
-       MULTIBUILD_VARIANTS=()
-       local p
-       for p in "${GRUB_ALL_PLATFORMS[@]}"; do
-               use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
-       done
-       [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed 
)
-       grub_do grub_configure
-}
-
-src_compile() {
-       # Sandbox bug 404013.
-       use libzfs && addpredict /etc/dfs:/dev/zfs
-
-       grub_do emake
-       use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
-       # The qemu dependency is a bit complex.
-       # You will need to adjust QEMU_SOFTMMU_TARGETS to match the 
cpu/platform.
-       grub_do emake check
-}
-
-src_install() {
-       grub_do emake install DESTDIR="${D}" 
bashcompletiondir="$(get_bashcompdir)"
-       use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
-       einstalldocs
-
-       insinto /etc/default
-       newins "${FILESDIR}"/grub.default-3 grub
-
-       # https://bugs.gentoo.org/231935
-       dostrip -x /usr/lib/grub
-}
-
-pkg_postinst() {
-       elog "For information on how to configure GRUB2 please refer to the 
guide:"
-       elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start";
-
-       if has_version 'sys-boot/grub:0'; then
-               elog "A migration guide for GRUB Legacy users is available:"
-               elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration";
-       fi
-
-       if [[ -z ${REPLACING_VERSIONS} ]]; then
-               elog
-               optfeature "detecting other operating systems (grub-mkconfig)" 
sys-boot/os-prober
-               optfeature "creating rescue media (grub-mkrescue)" 
dev-libs/libisoburn
-               optfeature "enabling RAID device detection" sys-fs/mdadm
-       fi
-}

Reply via email to