Version bump.

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

3 files changed, 262 insertions, 5 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 51a51423364e..bcb25d1bf0c7 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # 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.184 2012/03/06 01:35:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.185 2012/03/07 04:01:34 floppym Exp $
+
+*grub-2.00_beta1 (07 Mar 2012)
+
+  07 Mar 2012; Mike Gilbert <floppym@gentoo.org> +grub-2.00_beta1.ebuild:
+  Version bump.
 
   06 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta0.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 5a81293ebe97..a9764da2db45 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -27,6 +27,7 @@ DIST grub-0.97-patches-1.9.tar.bz2 51809 RMD160 a745902212dbd22f4d9f0bb0d563ffd4
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
 DIST grub-2.00~beta0.tar.xz 4833964 RMD160 8c3f6b1a54d028c4fa4e181e1b1bfc4e401e4414 SHA1 de5aadcfb8e0a52de8870560ebfb30dc62adaf44 SHA256 e96e81341e7cf931721cbdd2cff1f4aeb643566aad6ab0bcf97173821409019a
+DIST grub-2.00~beta1.tar.xz 4893780 RMD160 5bff1bbcfb6e7fb3aad5289bd2947891d299c077 SHA1 b1eb0ca9349e59098cec0f4873a8689b7e9c57c3 SHA256 c99332bbf666ea4a4adc0cd900ec9d3ab2018f3ea7ce108b16773fc0fc78bfe9
 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
@@ -44,13 +45,14 @@ EBUILD grub-0.97-r9.ebuild 9044 RMD160 4c4de37d7e995920f065eb2952226401a90af015
 EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA1 1bd9a4792eaca92500c0c40e9dedda8fead92c27 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1
 EBUILD grub-1.99-r2.ebuild 8285 RMD160 2b6ae9f59dda41f0893438c9c03e7ad9b0c2e7d9 SHA1 8aaae86ab3ae0092e3c343e7fd1fd58d0d19dac3 SHA256 783fad22b5cae394862725d5eaeed80ad7a26dcce833f65fed0b3135858ae171
 EBUILD grub-2.00_beta0.ebuild 5993 RMD160 88832dcfd48236a47039c12c89c0099f2033b1de SHA1 9453ac5ec45265ddf5be0003e4e858757f00f6de SHA256 ff8d30de025e10e061f47097d502501e628c146ea2ce8d91b2b1bbf04ffb52ef
+EBUILD grub-2.00_beta1.ebuild 5993 RMD160 e5029160b4467e3fccc793aa69fbec54c7987bb4 SHA1 b6e2b452414fc05e52dd6c1ffcb3470f10ba4b9a SHA256 364c29dcff037120656b006652dfaa648dfa865e935a6f346c5f80b82f86d0f2
 EBUILD grub-9999.ebuild 5988 RMD160 203185fdf7c8494f3147d215dcb0079159ebf9cb SHA1 c64718374b9ea92e9bf572c95289bac0d7bc2596 SHA256 cbfa5d7e76e8b223339e0d2c1e80da0fa315ea7cac7de9c8422972519c506bf1
-MISC ChangeLog 37675 RMD160 deba26365c5152830866dd0e1b299b6ad183e233 SHA1 b59c040db74b76d10fe1974a440359805136117e SHA256 cd2bc997cd5894978fc607611a04b6851a3ed23a87585f215fd6bb5c0b1eb051
+MISC ChangeLog 37798 RMD160 82059f03c6f2ade89d6223d247b368abc8297150 SHA1 eaf4f82c55e34a4c29355be42c219efb381cfc0c SHA256 82047afe8c0f9e559910137d15393a8976bb5a97641fe39e4b0a34527bf15cea
 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9VagQACgkQC77qH+pIQ6TWyQD/fP0cnUBMUSiehwveAeGsx55N
-fRkeNMqjvVly7Q6/a2cBAMf09eJDYyj3eXuujUg47XtU3LgaqsigwaA1o/qP02UG
-=DAq3
+iF4EAREIAAYFAk9W3agACgkQC77qH+pIQ6SQwAEAnawXkwE4J/ymdCXVHDJKN09w
+ZvIQmNCRBtNYvgeaehoBAMeWdkLxFozxNWYZyXYYSGrHJvjPH/4sFCmIrZUjhSQZ
+=KxfD
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_beta1.ebuild b/sys-boot/grub/grub-2.00_beta1.ebuild
new file mode 100644
index 000000000000..bc467f9297a4
--- /dev/null
+++ b/sys-boot/grub/grub-2.00_beta1.ebuild
@@ -0,0 +1,250 @@
+# 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_beta1.ebuild,v 1.1 2012/03/07 04:01:34 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* ]]; 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:
+	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/libisoburn
+	dev-libs/lzo
+	sys-boot/os-prober
+	>=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 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/python-2.5.2
+	sys-devel/flex
+	virtual/yacc
+	sys-apps/texinfo
+"
+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 target
+	local with_platform
+
+	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
+
+	# check if we have to specify the target (EFI)
+	# or just append correct --with-platform
+	if [[ ${platform} == efi* ]]; then
+		# EFI platform hack
+		[[ ${platform/*-} == 32 ]] && target=i386
+		[[ ${platform/*-} == 64 ]] && target=x86_64
+		# program-prefix is required empty because otherwise it is equal to
+		# target variable, which we do not want at all
+		with_platform="
+			--with-platform=${platform/-*}
+			--target=${target}
+			--program-prefix=
+		"
+	elif [[ ${platform} != "guessed" ]]; then
+		with_platform=" --with-platform=${platform}"
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-werror \
+		--program-transform-name="s,grub,grub2," \
+		--with-grubdir=grub2 \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable device-mapper) \
+		$(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) \
+		${with_platform}
+}
+
+grub_src_compile() {
+	default_src_compile
+	pax-mark -mpes "${grub_binaries[@]}"
+}
+
+grub_src_install() {
+	default_src_install
+}
+
+src_prepare() {
+	local i j
+
+	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
+		(. ./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"
+	elog "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"
+}