Add new snapshot for bug 468136.

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

4 files changed, 282 insertions, 26 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 4c1fd0348c81..f304e43e84da 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # 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.267 2013/07/21 19:22:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.268 2013/07/28 17:27:18 floppym Exp $
+
+*grub-2.00_p4946 (28 Jul 2013)
+
+  28 Jul 2013; Mike Gilbert <floppym@gentoo.org> +grub-2.00_p4946.ebuild,
+  grub-9999.ebuild:
+  Add new snapshot for bug 468136.
 
   21 Jul 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00-r4.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f141aa340519..8c933c806e81 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -44,6 +44,7 @@ DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47
 DIST grub-1.99.tar.xz 2639224 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b SHA512 604b931eef3781cdfbd9589ed76c96d6bc9fd9d6429a7a32c94ab1ea5dc2b2e1e26b60c93353763831bddbe071368779bab8564234139cb5eb6cbc3c88395ff4 WHIRLPOOL 68d9de328eb492b9dc1771db6a356de9af5d0bbceb1e187c0aea48f117c94b492c721e773e715664d3e431bda7f0ff5d63774184d2f2c413a08554a91c13dde4
 DIST grub-2.00.tar.xz 5136412 SHA256 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458 SHA512 f0dbfc90639491e5c671d2df206dec0139171bf096a99ee236f7ebf21cdafc6e6d39a9607e14ad2a6aee7c199ecc63f0a39573d969318e1a0cd32f989aa6b44a WHIRLPOOL b9690c023ab507926b8615ce28bf9de82b793ebd02126a5ecd52a130ab4bc52e2ae650b02ae2d784d4089e2981be944ba8b4800cde742aab793ff0d9029843c8
 DIST grub-2.00~beta6.tar.xz 5122792 SHA256 e58f5ae62b3384ccb75ea9709c85f344b68823e422fd3dea127b1dc28c08abfc SHA512 e37e40f888c962c561a47c459b7d2a6e8b38d736169750199656fae72e227472695bf820267cbe9f73635cbd07d1ae2dfc967c3e18d17e4d595ba4ebcfac8e8a WHIRLPOOL c7074824bc369ef5179418acf222204ba35e87d7a582cd0e03abeca4fdff4b5a2ad89480069297da5ffd9d37cbc5941a5c38f7b7bd533860ce8a001432144862
+DIST grub-2.00~p4946.tar.xz 5850764 SHA256 b395190a89a11019453d3cfe0ccb0b2cac1b8824491a2c6f5245f6fde97de840 SHA512 0736059e4bdb6d7f2dc5c3a1be3145e28c7bd2cc7577a6482b996135f9b42b337951eb3372a89f240dbad5b4d77228d171bed3fec6a5be86fad77976a0bf6d0c WHIRLPOOL 34a8ab3b1d0c8aa8b50ba27d0b6a6a5fb863013223b72f327039502666a7f29fe542fa22dbc09c2ed01912ce4882610e9bc5669cc4d91519cd00355352fbc272
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
 EBUILD grub-0.92-r1.ebuild 2605 SHA256 cd42e232b3d1e3ce99fa391907df1019f38a853f574cfb812346d9b1db0c7596 SHA512 8e1f79d34e3398be574d83a3b6a28ba1adad2ff80fdeadf6bb13cf3d77d73224372161a27f3f079e01aa4b564395473fa658eb52a38c3e3fba937557c0c1b41a WHIRLPOOL 090466918d908b36416a48f8b5109b8042bebae5fd5769a8b27ff3cb6f80dd769ee7960e4981da7ef82f9243a945ec6397e3aa70e958423adf530baedb6731c2
 EBUILD grub-0.94-r1.ebuild 3340 SHA256 d9d07a2c87d1d6656e42559244e1c4f06e47aa7dfdbc644f2a3eeefabf3b784e SHA512 ee66f414607b9d2a14cf8b3e7af5b3614836f35417a45e1eebf3ba2e450818dc6704f80e6b62108697f99b84c3052c9b9dd0bd0a45b021de1b614106cf10641f WHIRLPOOL a538c069f51d9a12b24a083f8223907bd4c1a2ca10b1632db94dc795450739d069095f20c59c6d73528d23d22e288c36f0ca38783104b0eba5588fc9cb3aebf0
@@ -68,13 +69,14 @@ EBUILD grub-2.00-r2.ebuild 9647 SHA256 32f03a6d678df2b351fbeceb5baad0ccb3cdaa807
 EBUILD grub-2.00-r3.ebuild 9763 SHA256 99d4ee93c26b5e4569e65c733663033f96b3e23d1567e85d131c917804c01db8 SHA512 c2967d73e3b57565bf6eed0e16749381c43baaad184b44c76ee2057b05303f7ac2ef2de88daa2b2644aadddb0229955ab7221d45e47aa6b41de00ec7ea5f65e1 WHIRLPOOL 3e52963c565380e6a006da67a761499790284e22f4bebf8efab5b049689bb425d28028f791d67fe57b092f44ec2daa55574f003fc5a5dd6a766f222bb81c05e7
 EBUILD grub-2.00-r4.ebuild 6773 SHA256 cff41ddda910c1daf2ba655e25cb9b372a0bc554b0376fcfec836f402b7aa6df SHA512 7fa959f8379bc6ebc538f0c1ec99eb0bc499e5216724243606f8735303a0be08cb1e800725e208f00172961647699cfd3533f80dd0d6351b630b8041b78f0db9 WHIRLPOOL 0b7e08e517627cd69160127fc70a29556b8fd374ec7580bb2b442925414eb32f76e555e4a639806ff8d0130b06093c4074684bf3f2fc44f4aae114169468d240
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
-EBUILD grub-9999.ebuild 6771 SHA256 64e21e110ad03b58a39a3301b683850559fa48f52266d91755a11d33aa9454ea SHA512 8e2e1a90cb0d07b1e4facb9f1a2d574fd67fdf234f6b1b106741b1a1a10ea1d15f7e98617e5e7fd81923ef626e930384cf91302054a3f59d1efc7b1b4c412ad9 WHIRLPOOL ac1b384b9445248e0c11b0c7a394f8130fadde5028305ddad20ab24ce2addc6420a6f1a6f0558e4ceec31f6d465950a3c59bff5887569c89425a454e3539ce64
-MISC ChangeLog 50923 SHA256 07011f449e1ef85ce5ec348f032c3b34f9e4680afaedf25882ae34277d616a54 SHA512 5efef5d4d3f7bd4cd3475918b997a0135517e923d2ee3f4ea4271b75ed2085c37b142a0983e4b0e9aea5ad50465f4095c1b74f540baeff6efa9a6abd2c93c6d4 WHIRLPOOL cfb5bafc98c62a233a6ceff466369a4e548a6cdc40bd6916cdb6b85ec0a6fd4b7b3009fcb70b27da11d5307500c7eb0be6718484c438964e62d94a343c4812f9
+EBUILD grub-2.00_p4946.ebuild 6336 SHA256 9d32f69f6ccf2a03380a3f1111520aa3ab13bf14e4f6d5728cc2961f75129481 SHA512 e93d14720f479293e831e7ad4415068f0bd75382ffc9c6df527fb098e9e04eb8b89ed9f7a9e00ff5d02210b6e2c236c54bea995b20b23551c6a333ae26323ecd WHIRLPOOL c235dbaccbae05c997e45c051db99ef11492e9ad2e7a35d42faa165ba9b330e1473d85d455ba01d7a3a0b9f53df990f84248d0884bed591db2ab038cd4670353
+EBUILD grub-9999.ebuild 6331 SHA256 22db44a24b95aad359ea880cb8cb359abb8fdb4be61d1c5fa21e0445069e66bb SHA512 a64124f9d868d2a7cac4a8ff8cad32880dc8dcd024d58dc8915eb4518dabda006e42deaeb2ed3ea3432438eee3200fb375a644079dbbf5020f6455578ad40bfd WHIRLPOOL ac32d6ebe78511051187350b098ee8fa90c1140f2dfb3a36a10c764a979513e17f2f532c55760fe663464337a81b5faf628bdf4eab7bbf5c241db749e258af65
+MISC ChangeLog 51085 SHA256 34997f93324bf37e0f098c5d700be6459b487fb3ecb92af84574bc3a61e1cc09 SHA512 974dd7cbb084030a58381928dab1f37c537ccc2ab303d5386fa61c1d95a796826aaff0d4bb209692c513d1576597e450ca0b7e8c113ee0a1931d3cf39fc64a5c WHIRLPOOL 4b6cc8fdabcd1076a74d2698ccdd6d77b0d125e50b5b968f7cc242dab8394e72656d388f61af53099c7155592e480f487c7bdefd60e19c7106cc58760ac8400c
 MISC metadata.xml 852 SHA256 d03182ca221633a5a479beec5bad1444859f2c586ad4d7764a9f531687cc73c0 SHA512 190483450afea0409f50f592e0290744cfc9e10362ec9c0c0d02b6f9933788bfc6b88a2e37a7e5a26066b914b6979a5dac6c6a2e7fa861dc5e728b34aec37e5b WHIRLPOOL 9c904cae80a6cbe7a7b35ef1d889478e79aac5006aa693af2884a7c21483f90f943322bf9206921db39db706cb36b5b509b420199269a385b47e75c8b2c2bb42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHsNQsACgkQC77qH+pIQ6TppgD/Q4eyOdiZLev/rxCdh/lbINlZ
-xJvP5+rYfURN4FaBdxgA/3swaPvt4aTMITvSMzjhEoUWu8jmQq8RJm5NYT0if8W9
-=ckLi
+iF4EAREIAAYFAlH1VH0ACgkQC77qH+pIQ6TBxAEAqozLlXP1JuhvTRdFlAtuMtKU
+qMdWTwRZ2Hra7IRISG4BAL6BQYA/KvXZlmVTHpeuHFHYJy9Yq8Prte5YSsgxCgGK
+=Iijl
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_p4946.ebuild b/sys-boot/grub/grub-2.00_p4946.ebuild
new file mode 100644
index 000000000000..b9f1442b6478
--- /dev/null
+++ b/sys-boot/grub/grub-2.00_p4946.ebuild
@@ -0,0 +1,255 @@
+# 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_p4946.ebuild,v 1.1 2013/07/28 17:27:18 floppym Exp $
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]]; then
+	AUTOTOOLS_AUTORECONF=1
+fi
+
+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
+			http://dev.gentoo.org/~floppym/dist/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+	PATCHES=()
+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
+	if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+		bash autogen.sh || die
+		autopoint() { return 0; }
+		eautoreconf
+	fi
+}
+
+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 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}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' --disable-efiemu) 
+	)
+
+	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 23dc08e48f09..31a7e31b2605 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,9 +1,12 @@
 # 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.96 2013/07/21 19:22:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.97 2013/07/28 17:27:18 floppym Exp $
 
 EAPI=5
-AUTOTOOLS_AUTO_DEPEND=yes
+
+if [[ ${PV} == 9999 ]]; then
+	AUTOTOOLS_AUTORECONF=1
+fi
 
 inherit autotools-utils bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
 
@@ -13,24 +16,12 @@ if [[ ${PV} != 9999 ]]; 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"
+			mirror://gentoo/${MY_P}.tar.xz
+			http://dev.gentoo.org/~floppym/dist/${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
-	)
+	PATCHES=()
 else
 	inherit bzr
 	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
@@ -148,9 +139,11 @@ src_prepare() {
 		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
+	if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+		bash autogen.sh || die
+		autopoint() { return 0; }
+		eautoreconf
+	fi
 }
 
 grub_configure() {