Version bump. Tweak efiemu configure option, bug 422835 by Rafał Mużyło.

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

4 files changed, 330 insertions, 11 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 0985a54f8955..c7f66f5ccbab 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.212 2012/06/17 03:37:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.213 2012/06/25 03:53:43 floppym Exp $
+
+*grub-2.00_rc1 (25 Jun 2012)
+
+  25 Jun 2012; Mike Gilbert <floppym@gentoo.org> +grub-2.00_rc1.ebuild,
+  grub-9999.ebuild:
+  Version bump. Tweak efiemu configure option, bug 422835 by Rafał Mużyło.
 
   17 Jun 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
   Remove redundant maintainer node.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index cff425d1250a..9c1ca0bed331 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -35,6 +35,7 @@ DIST grub-2.00~beta2.tar.xz 4984612 RMD160 5f3905a1c0e813183394e4063ea51c8ff3c71
 DIST grub-2.00~beta3.tar.xz 5069092 RMD160 ba29fd56637ed5d872442abab5267d131d566f93 SHA1 96bfdf4d53767faaf2c744ee82d4d703e4b672a2 SHA256 b0953e0b65767751fd9308374eecd26ba71d9b73425824a865708176ec0b8e94
 DIST grub-2.00~beta5.tar.xz 5102572 RMD160 816f642cfc392718d51ec3a729b34419e1cdadad SHA1 d64df2b5376a1a2062305fca90c481fcefbc7256 SHA256 e30362f6d28157cbff6c677fddfcfd9e349266baf3fc50a31042712591294f5d
 DIST grub-2.00~beta6.tar.xz 5122792 RMD160 0e02ab0d346f2ddc8228e43d204afea50085ac16 SHA1 0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb SHA256 e58f5ae62b3384ccb75ea9709c85f344b68823e422fd3dea127b1dc28c08abfc
+DIST grub-2.00~rc1.tar.xz 5133756 RMD160 60dda60fbd617d83673156d016414488dc41e34d SHA1 2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13 SHA256 b203d04589bfb743d2844a695c2ae8ea11a3ee034c346a989f4474addb4ed032
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
 EBUILD grub-0.92-r1.ebuild 2605 RMD160 5229d164def7c4bd6dc43923e91e064bcbdcc43b SHA1 14503ef04599d61b3cdd1a02ea0d78eb36109215 SHA256 cd42e232b3d1e3ce99fa391907df1019f38a853f574cfb812346d9b1db0c7596
 EBUILD grub-0.94-r1.ebuild 3340 RMD160 38b586e0a6f7a97cb6ea5fbff6f0c64a6e505052 SHA1 272d005f296a5089c29857a050a4c013735793b9 SHA256 d9d07a2c87d1d6656e42559244e1c4f06e47aa7dfdbc644f2a3eeefabf3b784e
@@ -61,13 +62,14 @@ EBUILD grub-2.00_beta3-r2.ebuild 6692 RMD160 31ba77ba971c2c588d4c112d9e800cb2b44
 EBUILD grub-2.00_beta3.ebuild 6488 RMD160 d0cbccc50d81e7b6e70c27c5309c2faec2ff3b44 SHA1 a2c074dcd6c535fb66a0ffb189dcf00394528772 SHA256 d39abf04dc1d6b4e03511647c3585ab8950b5778ec3a1fe0fe87de615b334477
 EBUILD grub-2.00_beta5.ebuild 7006 RMD160 78c31378b2dc61507d53801bf38066ca04c75ee1 SHA1 b5dcffe2bfd062757d10fbae746e5351cc56526b SHA256 72916bb6f2adec657ae76fcfc1bf2b9ff0dcfaa7be133a64aa4e4903dc000b83
 EBUILD grub-2.00_beta6.ebuild 7140 RMD160 a514ef13f06d98a97469f4e7e8ede54b81dae133 SHA1 36b3cf0674c1c4170bceb50015f4e58d00f61dfd SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68
-EBUILD grub-9999.ebuild 7165 RMD160 b011b5ddb92f81679f55290a6b83dc8880862496 SHA1 dfee72aa924669b93c0e79800645002af43599d6 SHA256 ae0b6e12c52410325dbf9e3dffed5402b1c07a08fa466378de4aaa72862dd229
-MISC ChangeLog 42065 RMD160 3009837228af918e292b3996c7b9a57a7b105ae7 SHA1 0eb5d1cece918b10fa203a9ee1167a55add52327 SHA256 ef523d46d8e39a71388e4432f8c27121931386af99d0f91623225c9eb56edf1a
+EBUILD grub-2.00_rc1.ebuild 7335 RMD160 df4b2e90ddcca55a7f12fd2ea1fdcf1ece48afeb SHA1 7c24400b7f6ad41a41b862b2859b08c48f0d533d SHA256 3762061f876c71926bc996b8424c73a89a5ea1e94d667950d0b0595a3fcd970f
+EBUILD grub-9999.ebuild 7332 RMD160 5a6b0f62b003bbf931747c027f85be84c5be5d43 SHA1 33a29e7cfe0ac7ebc7b642145ad6beceae63db76 SHA256 6c96bdaebfe12651d08127707d13904b1f28dfa9860dcff9c40736d99dd26258
+MISC ChangeLog 42266 RMD160 b4553cd63dc018e67a809b9b49b0231feff9ba0b SHA1 e1b5c8a5c94babf34fb9263c55116d76fd08016a SHA256 01dc1416a479bf153a77a652d83e7a752955767a9c728a1378c8138692b68f6e
 MISC metadata.xml 607 RMD160 4d6c4e92248479483d0ca45a34567921ad970b86 SHA1 fd20ee64f83670b9bd29b2cbe9a93508af9fe0bd SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/dUQwACgkQC77qH+pIQ6RO7QEAjc7VXCIhoL35i41yMkmMPF15
-KPNaBydHu8eWPiIoWo4BAKTMeQkptiV4WC46n0tNaIxDdp2LljT0bnHvR8TTYzpj
-=6J8p
+iF4EAREIAAYFAk/n4NAACgkQC77qH+pIQ6QYyAEAr+8Fxh60haSamZwD26Mjmvgz
+ztoxLjTiRh/dTyIcA6wA/1Cp8m7XkObsg3B86qW1NwGQ9TgJnAh4b+hL5gXXcKjW
+=ohy6
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_rc1.ebuild b/sys-boot/grub/grub-2.00_rc1.ebuild
new file mode 100644
index 000000000000..451ff843672c
--- /dev/null
+++ b/sys-boot/grub/grub-2.00_rc1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_rc1.ebuild,v 1.1 2012/06/25 03:53:43 floppym Exp $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
+	LIVE_ECLASS="bzr"
+	SRC_URI=""
+	DO_AUTORECONF="true"
+else
+	MY_P=${P/_/\~}
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+	else
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+		mirror://gentoo/${MY_P}.tar.xz"
+	fi
+	# Masked until documentation guys consolidate the guide and approve
+	# it for usage.
+	#KEYWORDS="~amd64 ~mips ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
+unset LIVE_ECLASS
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+SLOT="2"
+IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
+
+GRUB_PLATFORMS=(
+	# everywhere:
+	emu
+	# mips only:
+	qemu-mips yeeloong
+	# amd64, x86, ppc, ppc64:
+	ieee1275
+	# amd64, x86:
+	coreboot multiboot efi-32 pc qemu
+	# amd64, ia64:
+	efi-64
+)
+IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+	dev-libs/lzo
+	>=sys-libs/ncurses-5.2-r5
+	debug? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs )
+	mount? ( sys-fs/fuse )
+	truetype? (
+		media-libs/freetype
+		>=media-fonts/unifont-5
+	)
+	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/python-2.5.2
+	sys-devel/flex
+	virtual/yacc
+	sys-apps/texinfo
+	static? (
+		truetype? (
+			app-arch/bzip2[static-libs(+)]
+			media-libs/freetype[static-libs(+)]
+			sys-libs/zlib[static-libs(+)]
+		)
+	)
+"
+RDEPEND+="
+	grub_platforms_efi-32? ( sys-boot/efibootmgr )
+	grub_platforms_efi-64? ( sys-boot/efibootmgr )
+"
+if [[ -n ${DO_AUTORECONF} ]] ; then
+	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+else
+	DEPEND+=" app-arch/xz-utils"
+fi
+
+export STRIP_MASK="*/grub/*/*.{mod,img}"
+
+QA_EXECSTACK="
+	usr/bin/grub*
+	usr/sbin/grub*
+	usr/lib*/grub/*/*.mod
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+	usr/lib*/grub/*/setjmp.module
+"
+
+QA_WX_LOAD="
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+	usr/lib*/grub/*/*.image
+"
+
+QA_PRESTRIPPED="
+	usr/lib.*/grub/.*/kernel.img
+"
+
+grub_run_phase() {
+	local phase=$1
+	local platform=$2
+	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
+
+	[[ -d "${WORKDIR}/build-${platform}" ]] || \
+		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
+	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
+
+	echo ">>> Running ${phase} for platform \"${platform}\""
+	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
+
+	grub_${phase} ${platform}
+
+	popd > /dev/null || die
+}
+
+grub_src_configure() {
+	local platform=$1
+	local with_platform=
+	local enable_efiemu="--disable-efiemu"
+
+	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
+
+	# Used below for efi cross-building
+	tc-export CC NM OBJCOPY STRIP
+
+	estack_push CTARGET "${CTARGET}"
+	estack_push TARGET_CC "${TARGET_CC}"
+	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
+	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
+
+	case ${platform} in
+		efi-32)
+			if [[ ${CHOST} == x86_64* ]]; then
+				CTARGET="${CTARGET:-i386}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				export TARGET_CC
+			fi
+			with_platform="--with-platform=efi"
+			;;
+		efi-64)
+			if [[ ${CHOST} == i?86* ]]; then
+				CTARGET="${CTARGET:-x86_64}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
+			fi
+			with_platform="--with-platform=efi"
+			;;
+		guessed) ;;
+		*)
+			with_platform="--with-platform=${platform}"
+			case ${CTARGET:-${CHOST}} in
+				i?86*|x86_64*)
+					enable_efiemu=$(use_enable efiemu)
+					;;
+			esac
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-werror \
+		--program-prefix= \
+		--program-transform-name="s,grub,grub2," \
+		--with-grubdir=grub2 \
+		${with_platform} \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable device-mapper) \
+		${enable_efiemu} \
+		$(use_enable mount grub-mount) \
+		$(use_enable nls) \
+		$(use_enable truetype grub-mkfont) \
+		$(use_enable libzfs) \
+		$(use sdl && use_enable debug grub-emu-sdl)
+
+	estack_pop CTARGET CTARGET || die
+	estack_pop TARGET_CC TARGET_CC || die
+	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
+	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
+}
+
+grub_src_compile() {
+	default_src_compile
+	pax-mark -mpes "${grub_binaries[@]}"
+}
+
+grub_src_install() {
+	default_src_install
+}
+
+src_prepare() {
+	local i j
+
+	# fix texinfo file name, bug 416035
+	sed -i \
+		-e 's/^\* GRUB:/* GRUB2:/' \
+		-e 's/(grub)/(grub2)/' -- \
+		"${S}"/docs/grub.texi
+
+	epatch_user
+
+	# autogen.sh does more than just run autotools
+	if [[ -n ${DO_AUTORECONF} ]] ; then
+		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
+		(
+			autopoint() { :; }
+			. ./autogen.sh
+		) || die
+	fi
+
+	# install into the right dir for eselect #372735
+	sed -i \
+		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
+		util/bash-completion.d/Makefile.in || die
+
+	# get enabled platforms
+	GRUB_ENABLED_PLATFORMS=""
+	for i in ${GRUB_PLATFORMS[@]}; do
+		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+	done
+	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
+	einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+}
+
+src_configure() {
+	local i
+
+	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use libzfs && addpredict /etc/dfs
+	use static && append-ldflags -static
+
+	for i in ${GRUB_ENABLED_PLATFORMS}; do
+		grub_run_phase ${FUNCNAME} ${i}
+	done
+}
+
+src_compile() {
+	# Used for pax marking in grub_src_compile
+	local grub_binaries=(
+		grub-editenv
+		grub-fstest
+		grub-menulst2cfg
+		grub-mkimage
+		grub-mklayout
+		grub-mkpasswd-pbkdf2
+		grub-mkrelpath
+		grub-script-check
+		grub-bios-setup
+		grub-ofpathname
+		grub-probe
+		grub-sparc64-setup
+	)
+	use mount && grub_binaries+=( grub-mount )
+	use truetype && grub_binaries+=( grub-mkfont )
+
+	local i
+
+	for i in ${GRUB_ENABLED_PLATFORMS}; do
+		grub_run_phase ${FUNCNAME} ${i}
+	done
+}
+
+src_install() {
+	local i
+
+	for i in ${GRUB_ENABLED_PLATFORMS}; do
+		grub_run_phase ${FUNCNAME} ${i}
+	done
+
+	mv "${ED}"usr/share/info/grub{,2}.info || die
+
+	# 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
+}
+
+pkg_postinst() {
+	# display the link to guide
+	elog "For information on how to configure grub-2 please refer to the guide:"
+	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+	if ! has_version sys-boot/os-prober; then
+		elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
+	fi
+	if ! has_version dev-libs/libisoburn; then
+		elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2d919eafafb7..33ce15d5dc3b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.67 2012/06/09 04:47:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.68 2012/06/25 03:53:43 floppym Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	DO_AUTORECONF="true"
 else
 	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
 		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
 	else
 		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
@@ -129,6 +129,7 @@ grub_run_phase() {
 grub_src_configure() {
 	local platform=$1
 	local with_platform=
+	local enable_efiemu="--disable-efiemu"
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
@@ -160,7 +161,14 @@ grub_src_configure() {
 			with_platform="--with-platform=efi"
 			;;
 		guessed) ;;
-		*) with_platform="--with-platform=${platform}" ;;
+		*)
+			with_platform="--with-platform=${platform}"
+			case ${CTARGET:-${CHOST}} in
+				i?86*|x86_64*)
+					enable_efiemu=$(use_enable efiemu)
+					;;
+			esac
+			;;
 	esac
 
 	ECONF_SOURCE="${S}" \
@@ -173,7 +181,7 @@ grub_src_configure() {
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \
 		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
+		${enable_efiemu} \
 		$(use_enable mount grub-mount) \
 		$(use_enable nls) \
 		$(use_enable truetype grub-mkfont) \