Add support for probing EFI system partition, bug 477314 by Ben Kohler. Respect bashcompdir, bug 477392 by Alphat-PC.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 312 insertions, 9 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index d45b19fca1d9..98522be7ede8 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.265 2013/07/07 00:49:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.266 2013/07/21 00:37:11 floppym Exp $
+
+*grub-2.00-r4 (21 Jul 2013)
+
+  21 Jul 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/grub-2.00-os-prober-efi-system.patch, +grub-2.00-r4.ebuild,
+  grub-9999.ebuild:
+  Add support for probing EFI system partition, bug 477314 by Ben Kohler.
+  Respect bashcompdir, bug 477392 by Alphat-PC.
 
   07 Jul 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00-r3.ebuild:
   sed || die
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 74131defba5e..4b16f9fe81fd 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -14,6 +14,7 @@ AUX grub-2.00-dmraid.patch 695 SHA256 de077f5511fa41effdcfd215e15b8bd3cff741522d
 AUX grub-2.00-freebsd.patch 16465 SHA256 5464dda43bed28634e406a3b182db1d76e70059e0a3b3c276ee91ff27ca78cbd SHA512 d0fecaf83796971ef6f2cd43cab4c89faf1496d4241e249467d7839b366c616e15a8c6961d9224ed0e139d018d5d9f354cf59ddf2ef5e915a4b03e11dbdf568e WHIRLPOOL 963c61923503a57894634f0b3431e8e701a83f6514e5829f0ed91fc3c9011fa39870c319e1cbfee62341f1d37dfd0fdadcd4a028b725bb65d2f06fbedfd31166
 AUX grub-2.00-hardcoded-awk.patch 599 SHA256 438c7357a632c7c9efe406b1d7cbb2524694e68c5783b401d3dd17ae0aba6816 SHA512 f47b742b9fa4c57e36e767ace6e14318678cc429ae88cd275e07d95abbc8d3d01d831058da2f6f91662bfdfc4396aed5417198245534488359a43023459d1a1f WHIRLPOOL 17be198f854466ff8a50c5b7d46eaf7883a4ce8cbe3a89cbc0e62d75ae71e94ce863341c0650b113bbee4415220da38896da73177ab59d2b53d3bde7ec9809ba
 AUX grub-2.00-no-gets.patch 805 SHA256 054d85619905055a0ea0e5f9d27eb8c8596959598ac9a5bae7e82543c19adeaf SHA512 8b89fa40efe232474e7bb03d12542030d40fea1fe0839a9493f6704fbe6de77516b5976841bf652c7236104513f427750efc668248c71ba0ea7f676557e8c9e3 WHIRLPOOL 796a7bc4583829abd1a552f7d16d6cc4f2999707af1ae0b5231fa53e87ce22a265a35a3d0f486fcac2e74dbed5fd54e3a572186cc2ba1a849433adc021a0a65b
+AUX grub-2.00-os-prober-efi-system.patch 834 SHA256 486ab3e6b7aef74c3e81be3fdb0ceb357b6115cb56ac80a470820a00d10cc884 SHA512 671a847abac49b098d455f473a97c9f47c7e9d837898ed5e53e751aa65bdfca32b9bb2f3d8f7ec544730cb1fe1208ebbb9163ae9cf6b16a3c0ae1b087921b097 WHIRLPOOL 402f8530d2b9f4ec496f8aa454a6f0720542034f58acd6d5c9f17bbec83e3e9ab2d6fc7b5720fcfae4eacf04800c846bd7f33ff2949c22e4a822dad15abec7fe
 AUX grub-2.00-parallel-make.patch 1907 SHA256 7d8eda92eeeeb87001bc44dd1390b96c927c45542af2984c5d80f9ca3a552362 SHA512 cc2c47858ca2fa76b081ca78b6090fe61f0b41d6aad21f07e269dd9f98355b7c148f62659418257c24aa370634060ead2c3a612aae07c6f53e9ba13a25a1d7fc WHIRLPOOL 9b5aad7db3ec5c60151984861690b64e90d6adbeb1dec4257d33873156ae6ce6ded432377520cfb9cbbbbf2f30e69e134d6dbc0007355cfa74521042500d844e
 AUX grub-2.00-texinfo.patch 463 SHA256 1e8965a2740cdb39eee26a6b90ffb7a79a6c59904fc4abf1b0e45000cd8cb921 SHA512 da59e991feae18a3210a60a94e2f9245c3e680ea714d38ecc6f39333e80ebe3af256dfcaec6ade108a31c724b6b8b0f92535ab3d84f102ba97ef6f53c74feff4 WHIRLPOOL 40e85536791f94c456b89bb7784ca5f5554c749e12edf8531c6d027ad1318d0ed36dd8c3d3ca7bff69ce0643b62fee7f57fdd426610f1cb413880e95405dacf2
 AUX grub-2.00-tftp-endian.patch 728 SHA256 4806fb14471fe6547cb69e6fab97e66c8245654acbc4738071cf2717368de458 SHA512 8fee95b06b50f8721d7013ecf8fb954e9b1ba83f99790e165ec334dfcd41fe7655f37868069a315acd4af97d3c4466aa36e0ab5a8b767faf862f1d71f88b3252 WHIRLPOOL 53779e4952049f069824eefcaaaa0e46fc9a7036ed0f9b67008e523f618105d760300ffcd315f861de786c63de02b2753d3ed14637b39fd7af47aadd02355695
@@ -65,14 +66,15 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5
 EBUILD grub-2.00-r1.ebuild 8862 SHA256 c88e12c0de910726920616a0fb9fecd1dab504532287d9742015faab713268ab SHA512 2589fb92dee5d6a25af6a9584ccb45c6b019d219fde0c3dbde1e35abc8a82e7ce8793375e694c30372ea98da9e7383db98b6639c8ee93d23dfb0b9cb6f0cc838 WHIRLPOOL 06f3d43667856a0d6c2fe6ebf3b89930171f047e66ed9df5d766b8851b9bb5ae0db7f72a6d319d16db18a1968b6a4d6c4bcf1b8532df168141bb9c9f0733d24a
 EBUILD grub-2.00-r2.ebuild 9647 SHA256 32f03a6d678df2b351fbeceb5baad0ccb3cdaa807c7176c4a8a881cbee34eb97 SHA512 5d2ccd978741e46d4dd5a8895371be56e89426adfb99e556b2236a8bcd3f2aa441035c528112a86d00a5ea69cf2555d8d2505a608ff80be570a0d50c17997cc5 WHIRLPOOL eb49e0cddc27fabc18770d76bc2019e6925abaaa7be5a963f181af1a4e1507e8c9fd6e28e78d35ad6bff7f13cf145707252bc1524a9eca8c880e82984755a961
 EBUILD grub-2.00-r3.ebuild 9763 SHA256 99d4ee93c26b5e4569e65c733663033f96b3e23d1567e85d131c917804c01db8 SHA512 c2967d73e3b57565bf6eed0e16749381c43baaad184b44c76ee2057b05303f7ac2ef2de88daa2b2644aadddb0229955ab7221d45e47aa6b41de00ec7ea5f65e1 WHIRLPOOL 3e52963c565380e6a006da67a761499790284e22f4bebf8efab5b049689bb425d28028f791d67fe57b092f44ec2daa55574f003fc5a5dd6a766f222bb81c05e7
+EBUILD grub-2.00-r4.ebuild 6711 SHA256 6ccf97a6d9a4a10363f721615ae5fd5e6cf4e63bd192ae31d49ff88cb2aa5247 SHA512 e5a378832e36fb56533a3f61ecf6351e30c9493fbd8af70bcc65af983ee9542bec5817366b83db5d0165e6cdabdebdee5e99f4c42345fc2451fc61c70cae8102 WHIRLPOOL 9a435b975dbbfc34839c89fd792d74befd6710ca42819aa267acd5d2a60c535d6262c399ab3356c4a9c04d3e38b6edeeee1a5c9a87d86f127dc0b4fe4d644530
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
-EBUILD grub-9999.ebuild 6477 SHA256 baccb8e7fb79c5b9b18541cb4ec3131524d12e33484838f724115a2070d07933 SHA512 ce9c162f95da5eb7e1bee04b6432b2aea59fe8f8c0c128001d297a64e3e4b7fbed45e2fa0534d79551226421c9e5f15488bb3f172ead60cb0e0e98be54909f7e WHIRLPOOL c385eb6867c9fcbf9dee40f0452ab0326f5f0d71f70730e5b1a7deb7b1659cf7907ae34710ce7b30e73214f25d363b53b7da36a78e928655c6f6c485950a4f94
-MISC ChangeLog 50498 SHA256 9a55606b8cb668b9018e4f199ca39e876834a9dab802f2428dd4e4567900afa0 SHA512 e77e1295dd157dee85b0d9b32ede20ca69f0f300f860d61690b318df40b9ddc532005a478325e38cdc4aecec14ca1280a9604197515f864eb83180b627065b65 WHIRLPOOL c73d02bd0e59f13cdb4ed9a84b8bd370f568c5b8ee509fbea82ea4f83bb73e977855f15d81e9eda14384dc354fc71022da75ce58b479558b4526906c35bb8e98
+EBUILD grub-9999.ebuild 6709 SHA256 c0d7503e7bada9947c48deb1133388f2828761ea32b4838fea88e02d567eaff4 SHA512 ef18743579b0ff844df4ce12c32a20ed057fc2ae4f71c1afea75e5c89ba1556f04e5afcfdad990afbef81b1add955163cbe1abe19ab94d0d3ed79b56ace1cd1e WHIRLPOOL 472a0d43d6e2f702c807a73c956b6f50ba06d9e126afb133daebe07302924fa39fba58a1eedcc897bb9307de1473f75035147313c70e6569b22f51f6177c5095
+MISC ChangeLog 50788 SHA256 2996104a027ac6a6c0ce451c7b72b5e5ef29233eb401af38947c78ec12d91f91 SHA512 54ba64959c4c3540919f11e6c499275939ee950a0b84f7aa1606b2b4d5bd73119c8aca52398ca0c7cc01646c53d61501c54820f1cc6e2aa62f22de3b1a1c8c13 WHIRLPOOL 13f972e7124843e365cbd8e06d891c5d26a4f978a85a083263a12a03db717ade907cc160f9d995fe922f48fa29b0f1c533d8e014ba7e848c4c1280dc513be28a
 MISC metadata.xml 852 SHA256 d03182ca221633a5a479beec5bad1444859f2c586ad4d7764a9f531687cc73c0 SHA512 190483450afea0409f50f592e0290744cfc9e10362ec9c0c0d02b6f9933788bfc6b88a2e37a7e5a26066b914b6979a5dac6c6a2e7fa861dc5e728b34aec37e5b WHIRLPOOL 9c904cae80a6cbe7a7b35ef1d889478e79aac5006aa693af2884a7c21483f90f943322bf9206921db39db706cb36b5b509b420199269a385b47e75c8b2c2bb42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHYuxkACgkQC77qH+pIQ6Rn6QEAhkP1v/UvC/Y/pdVWoGRJlCMa
-OubuEthaF+vKP6L6nUoA/1AS02M3uN56/p3YRitzCHoeJI020t9+1YnF1B+qU3W5
-=fdPb
+iF4EAREIAAYFAlHrLTwACgkQC77qH+pIQ6SBtAD+NoyJ/G2MfXlBpe+UK8Cy0sUw
+SULIUhmJqsE3xPw3aioA/jxiAXavFgU01CAibHvbC1K7Doi/NhnfhroBzgOSricl
+=9DDP
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-2.00-os-prober-efi-system.patch b/sys-boot/grub/files/grub-2.00-os-prober-efi-system.patch
new file mode 100644
index 000000000000..7e0888a86daa
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.00-os-prober-efi-system.patch
@@ -0,0 +1,27 @@
+=== modified file 'util/grub.d/30_os-prober.in'
+--- util/grub.d/30_os-prober.in	2013-04-19 08:08:46 +0000
++++ util/grub.d/30_os-prober.in	2013-05-31 16:29:03 +0000
+@@ -149,6 +149,22 @@
+ }
+ EOF
+     ;;
++    efi)
++
++	EFIPATH=${DEVICE#*@}
++	DEVICE=${DEVICE%@*}
++	onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
++      cat << EOF
++menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
++EOF
++      save_default_entry | sed -e "s/^/\t/"
++      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
++
++      cat <<EOF
++	chainloader ${EFIPATH}
++}
++EOF
++    ;;
+     linux)
+       if [ "x$BTRFS" = "xbtrfs" ]; then
+          LINUXPROBED="`linux-boot-prober btrfs ${BTRFSuuid} ${BTRFSsubvol}  2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
+
diff --git a/sys-boot/grub/grub-2.00-r4.ebuild b/sys-boot/grub/grub-2.00-r4.ebuild
new file mode 100644
index 000000000000..06b58b8d083d
--- /dev/null
+++ b/sys-boot/grub/grub-2.00-r4.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r4.ebuild,v 1.1 2013/07/21 00:37:11 floppym Exp $
+
+EAPI=5
+AUTOTOOLS_AUTO_DEPEND=yes
+
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	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
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+	PATCHES=(
+		"${FILESDIR}/${P}-parallel-make.patch" #424231
+		"${FILESDIR}/${P}-no-gets.patch" #424703
+		"${FILESDIR}/${P}-config-quoting.patch" #426364
+		"${FILESDIR}/${P}-tftp-endian.patch" # 438612
+		"${FILESDIR}/${P}-hardcoded-awk.patch" #424137
+		"${FILESDIR}/${P}-freebsd.patch" #442050
+		"${FILESDIR}/${P}-compression.patch" #424527
+		"${FILESDIR}/${P}-zfs-feature-flag-support-r1.patch" #455358
+		"${FILESDIR}/${P}-20_linux_xen.patch" #463992
+		"${FILESDIR}/${P}-dmraid.patch" #430748
+		"${FILESDIR}/${P}-texinfo.patch"
+		"${FILESDIR}/${P}-os-prober-efi-system.patch" #477314
+	)
+else
+	inherit bzr
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
+fi
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+SLOT="2"
+IUSE="custom-cflags debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs"
+
+GRUB_ALL_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_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="grub_platforms_qemu? ( truetype )
+	grub_platforms_yeeloong? ( truetype )"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+	app-arch/xz-utils
+	>=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/dejavu
+		>=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}
+	app-misc/pax-utils
+	>=dev-lang/python-2.5.2
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	>=sys-devel/autogen-5.10
+	static? (
+		truetype? (
+			app-arch/bzip2[static-libs(+)]
+			media-libs/freetype[static-libs(+)]
+			sys-libs/zlib[static-libs(+)]
+		)
+	)
+	test? (
+		dev-libs/libisoburn
+		app-emulation/qemu
+	)
+"
+RDEPEND+="
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!multislot? ( !sys-boot/grub:0 )
+"
+
+STRIP_MASK="*/grub/*/*.{mod,img}"
+RESTRICT="test"
+
+QA_EXECSTACK="
+	usr/bin/grub*
+	usr/sbin/grub*
+	usr/lib*/grub/*/*.mod
+	usr/lib*/grub/*/*.module
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+"
+
+QA_WX_LOAD="
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+	usr/lib*/grub/*/*.image
+"
+
+QA_PRESTRIPPED="
+	usr/lib.*/grub/.*/kernel.img
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 439082
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "GRUB does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
+src_prepare() {
+	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+	sed -i -e /autoreconf/d autogen.sh || die
+	if use multislot; then
+		# fix texinfo file name, bug 416035
+		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+	fi
+	epatch_user
+	bash autogen.sh || die
+	autopoint() { return 0; }
+	eautoreconf
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi-32)
+			platform=efi
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=${CTARGET:-i386}
+			fi ;;
+		efi-64)
+			platform=efi
+			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+				local CTARGET=${CTARGET:-x86_64}
+				local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+				export TARGET_CFLAGS TARGET_CPPFLAGS
+			fi ;;
+		guessed) ;;
+		*)	platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--libdir="${EPREFIX}"/usr/lib
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable debug mm-debug)
+		$(use_enable debug grub-emu-usb)
+		$(use_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)
+		${platform:+--with-platform=}${platform}
+	)
+
+	if use multislot; then
+		myeconfargs+=(
+			--program-transform-name="s,grub,grub2,"
+			--with-grubdir=grub2
+		)
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_configure() {
+	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	tc-export CC NM OBJCOPY STRIP
+	export TARGET_CC=${TARGET_CC:-${CC}}
+
+	# Portage will take care of cleaning up GRUB_PLATFORMS
+	MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+	multibuild_parallel_foreach_variant grub_configure
+}
+
+src_compile() {
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
+	multibuild_foreach_variant autotools-utils_src_compile
+
+	use doc && multibuild_for_best_variant \
+		autotools-utils_src_compile -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.
+	multibuild_foreach_variant autotools-utils_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant autotools-utils_src_install \
+		bashcompletiondir="$(get_bashcompdir)"
+
+	use doc && multibuild_for_best_variant run_in_build_dir \
+		emake -C docs DESTDIR="${D}" install-html
+
+	if use multislot; then
+		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+	fi
+
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default-2 grub
+
+	cd "${ED}" || die
+	pax-mark mpes $(scanelf -BF %F usr/{bin,sbin})
+}
+
+pkg_postinst() {
+	elog "For information on how to configure grub-2 please refer to the guide:"
+	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		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
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 35b890829200..edd09828326e 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 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.94 2013/06/30 18:25:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.95 2013/07/21 00:37:11 floppym Exp $
 
 EAPI=5
 AUTOTOOLS_AUTO_DEPEND=yes
 
-inherit autotools-utils eutils flag-o-matic multibuild pax-utils toolchain-funcs
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/\~}
@@ -29,6 +29,7 @@ if [[ ${PV} != 9999 ]]; then
 		"${FILESDIR}/${P}-20_linux_xen.patch" #463992
 		"${FILESDIR}/${P}-dmraid.patch" #430748
 		"${FILESDIR}/${P}-texinfo.patch"
+		"${FILESDIR}/${P}-os-prober-efi-system.patch" #477314
 	)
 else
 	inherit bzr
@@ -107,6 +108,7 @@ RDEPEND+="
 "
 
 STRIP_MASK="*/grub/*/*.{mod,img}"
+RESTRICT="test"
 
 QA_EXECSTACK="
 	usr/bin/grub*
@@ -141,6 +143,10 @@ pkg_pretend() {
 src_prepare() {
 	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
 	sed -i -e /autoreconf/d autogen.sh || die
+	if use multislot; then
+		# fix texinfo file name, bug 416035
+		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+	fi
 	epatch_user
 	bash autogen.sh || die
 	autopoint() { return 0; }
@@ -224,7 +230,7 @@ src_test() {
 
 src_install() {
 	multibuild_foreach_variant autotools-utils_src_install \
-		bashcompletiondir=/usr/share/bash-completion
+		bashcompletiondir="$(get_bashcompdir)"
 
 	use doc && multibuild_for_best_variant run_in_build_dir \
 		emake -C docs DESTDIR="${D}" install-html