Drop the --with-grubdir=grub2 option and emit a warning on upgrades.

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

4 files changed, 295 insertions, 12 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 88e44349150c..62a998ec7c83 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.273 2013/08/16 00:54:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.274 2013/09/07 23:01:12 floppym Exp $
+
+*grub-2.00_p5107-r1 (07 Sep 2013)
+
+  07 Sep 2013; Mike Gilbert <floppym@gentoo.org> +grub-2.00_p5107-r1.ebuild,
+  grub-9999.ebuild:
+  Drop the --with-grubdir=grub2 option and emit a warning on upgrades.
 
 *grub-2.00_p5107 (16 Aug 2013)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a6efb5c24d89..357a8c1c8a00 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -71,14 +71,15 @@ EBUILD grub-2.00-r3.ebuild 9763 SHA256 99d4ee93c26b5e4569e65c733663033f96b3e23d1
 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
 EBUILD grub-2.00_p5086.ebuild 6567 SHA256 025f464aa0148b78acde60825971970ba3697a9666fee5152e6c1ac66bafed3b SHA512 f010f5cc42cbb139d4a23bab3747685425dd3c71678a4f4bd076ecdce114713f66fcdf950146945db69887673de7d48243d01fd73cd7415c6c32b73fa69e3909 WHIRLPOOL 01a8a9e4361c69fb2757b69d5775b9f7c70652bd5b3fedcd8e6fea6c443b1720aec4d7f2b963970b006cc757c13254836683c3ed3fa0cd8b0f8f519311e87ff5
+EBUILD grub-2.00_p5107-r1.ebuild 6842 SHA256 65d3ef8363faefa89598440188cedf9665b6f83ad51d616c00718e0fb93fc1cf SHA512 d5e577c052b050cdf9d66f69e7b742fa34f325cf91e93d4d71a8bae86906242ccfa4561ecf3a994fe1d8d942eac8133bebe50776350b238c36ddeb60f1bd43d6 WHIRLPOOL d04a323f77fd0bd055ede2033d73e32685733c5da941539f7230078aa2d0f8aa8204ff1c70be91a6ff3db43f4053e5190cbde67ac66ad4b590b55f2084de1b8d
 EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593
-EBUILD grub-9999.ebuild 6563 SHA256 8da3208e69027b750a84a835457864655c6981d74e7855784e49e5d0cd1621fd SHA512 42a15a88d2a98795130c662c2f09ef82564515e39c300871d5deb4ec668ae5330bb7de05618b05cf917e90c90e9c5cd232c81b3c131f98393bade26649dab640 WHIRLPOOL c0c3c718c71cac621bad386ef6fcc678d24888cbcef255b0e3897f283b9b16951cf35aa85498b2faf057777697746a8a7c10bf6e08042703ce685f87889fef41
-MISC ChangeLog 51867 SHA256 b2b6ba99553de2458883ecad5681e1a06ff068773524a69ecbb0d527062ab0d0 SHA512 4c882f5f13ebda2cc616a93be5e7d6c6d344a7489134cc4904f0162679fc57ff577608cac11b4cc06103c3857347f74f5ed39dbc4f8ab4586d454a94183b4e55 WHIRLPOOL 874efb8e863e10f7252262eaacb1b44a7042f42804f71a488d09541a2bc69804170074fef50aa9647e24c35deacff47a7a615e2e3f46a6a4060201dac8732280
+EBUILD grub-9999.ebuild 6835 SHA256 5a9fd99b94e1b19e1da2bfc26bcae3ef17f27b44fddbc27ec91a7049922b0cb4 SHA512 d2b04240d5c41eeb7ab774fa6eddfbde7d81ea41a0a52ef07e56aa260480d50dae8c9e95a936b4790109eee72d45358bb044893bb0675596f33c4708c72d72fd WHIRLPOOL 03d20accaff23948022d63beccbc42cc677b587e710e76b94fc1a57e11226794ef0246abf12f128ef8da7cc87307016f04e7d5d359b2f8dfea8abc7841e39768
+MISC ChangeLog 52071 SHA256 ceaf17adfd60457d831df767218981e925ab7e5b54d82570b2d62be738343648 SHA512 22e7bc13d75a24ea00f4846b8b0f6c7ad50541bdfbe37eb2925b3942260074057df27540e26cec4135f95c826afb29d6371ff5d231ccfc91faeca922d40ce58f WHIRLPOOL a7605ee375c5337fd8820f44dba9f318692702b04e355f7f1635416085559f6ec7f29588ce6ee671de53029ee8ef8fc5bfa7f2638a9ef0b70da6e37bfbfa307e
 MISC metadata.xml 852 SHA256 d03182ca221633a5a479beec5bad1444859f2c586ad4d7764a9f531687cc73c0 SHA512 190483450afea0409f50f592e0290744cfc9e10362ec9c0c0d02b6f9933788bfc6b88a2e37a7e5a26066b914b6979a5dac6c6a2e7fa861dc5e728b34aec37e5b WHIRLPOOL 9c904cae80a6cbe7a7b35ef1d889478e79aac5006aa693af2884a7c21483f90f943322bf9206921db39db706cb36b5b509b420199269a385b47e75c8b2c2bb42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlINeD8ACgkQC77qH+pIQ6TXHgEAkyK+DGSBr2CMjfta//4VN8vI
-BgJYfHPSANqJ0NcLMlsA/0PoaoUgCJ8T2plBdWP7uRROSBWNvBrJm/VOOBoRAeWU
-=eSAy
+iF4EAREIAAYFAlIrsDsACgkQC77qH+pIQ6Q5iwD+JZ6aG8mSy3tx/zFmgLq7lGRq
+t5vtmrLEsYlYmIErAOwBAKKNRfMXUekKavE1gs89RUQZI0XOxgCxvrltPrbBNXx1
+=kpOG
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_p5107-r1.ebuild b/sys-boot/grub/grub-2.00_p5107-r1.ebuild
new file mode 100644
index 000000000000..01b6c319323f
--- /dev/null
+++ b/sys-boot/grub/grub-2.00_p5107-r1.ebuild
@@ -0,0 +1,270 @@
+# 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_p5107-r1.ebuild,v 1.1 2013/09/07 23:01:12 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 versionator
+
+if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		MY_P=${P/_/~}
+		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+			mirror://gentoo/${P}.tar.xz
+			http://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	KEYWORDS="~amd64 ~x86"
+	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
+	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 )
+"
+
+if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+	DEPEND+=" >=sys-devel/autogen-5.10"
+fi
+
+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 ! version_is_at_least 4.8 "$(gcc-version)" &&
+			$(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," )
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_configure() {
+	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	if version_is_at_least 4.8 "$(gcc-version)"; then
+		export TARGET_LDFLAGS+=" -fuse-ld=bfd"
+	fi
+
+	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
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then
+				ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
+				ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
+				break
+			fi
+		done
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 11f88920da4b..4d082fef290e 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.100 2013/08/14 09:16:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.101 2013/09/07 23:01:12 floppym Exp $
 
 EAPI=5
 
@@ -191,10 +191,7 @@ grub_configure() {
 	)
 
 	if use multislot; then
-		myeconfargs+=(
-			--program-transform-name="s,grub,grub2,"
-			--with-grubdir=grub2
-		)
+		myeconfargs+=( --program-transform-name="s,grub,grub2," )
 	fi
 
 	autotools-utils_src_configure
@@ -260,5 +257,14 @@ pkg_postinst() {
 		if ! has_version dev-libs/libisoburn; then
 			elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
 		fi
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then
+				ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
+				ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
+				break
+			fi
+		done
 	fi
 }