Version bump #357023 by Boian Berberov.

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

3 files changed, 129 insertions, 5 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index d45cc11bd9dc..184fb9d2eef5 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.149 2011/02/13 07:41:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.150 2011/03/02 00:39:09 vapier Exp $
+
+*grub-1.99_rc1 (02 Mar 2011)
+
+  02 Mar 2011; Mike Frysinger <vapier@gentoo.org> +grub-1.99_rc1.ebuild:
+  Version bump #357023 by Boian Berberov.
 
   13 Feb 2011; Mike Frysinger <vapier@gentoo.org> grub-0.97-r8.ebuild,
   grub-0.97-r9.ebuild, grub-0.97-r10.ebuild, grub-1.98.ebuild,
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 29fb41e3ef27..9d8951e6a35c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -22,6 +22,7 @@ DIST grub-0.97-patches-1.8.tar.bz2 48274 RMD160 99c967daca704e853e9d161a51db3d39
 DIST grub-0.97-patches-1.9.tar.bz2 51809 RMD160 a745902212dbd22f4d9f0bb0d563ffd44b429eaa SHA1 1d9da2df8bccef9821ebbbc2f5c5353dbd90bf4d SHA256 6b8445c9260803f059031cbe7475a45fee6499fc2dbd911288af6169455c4028
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST grub-1.98.tar.gz 2449386 RMD160 197fb8d7c673bd67ae81eda53a2baa2968cc1e69 SHA1 e83a2c438f4773a2e272c225983c0145e1ffd641 SHA256 bef2c1892e052967b65aab6aa62ac702c0e50ef8848506eacf3c0b2f5007c614
+DIST grub-1.99~rc1.tar.gz 4256752 RMD160 e99ac336db296cd2aaaf9529a230833383b2fdbf SHA1 866b6979974ad7209d236cb4e1819039f0bd1c6d SHA256 f0333efa6c5e3198f658b8124eebcf613b916b7873d647abb009169d1ff39d52
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
 EBUILD grub-0.92-r1.ebuild 2639 RMD160 cacac6d3ed808c52a05fc6b1c0c929af7f114926 SHA1 5828e84ded260a50bd7c6cd30217e1d0cf881299 SHA256 40c896a0ec005d50e9c6effd4d2ee95c1e0712d26a13f8f55bc6d7380c6d7102
 EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a SHA1 a2131f5f673ad9f5dbf6288d7484eb844de52e37 SHA256 864ca6f410a0a6caf18d4bdc4a0389bb922802459e0c2a975c0442f6bd4a4fd5
@@ -38,13 +39,14 @@ EBUILD grub-0.97-r8.ebuild 8973 RMD160 5bb9c6e19ea7f80fc5bccbb1d1b70ce5369e9f70
 EBUILD grub-0.97-r9.ebuild 9077 RMD160 dd85bded8ff1f243949873e56aeca30aef51f194 SHA1 95324e4f094be9abd7f1266dc79fd6bb7a1352fd SHA256 580561ad14a72f313b6ca161d8f5f2d620b5f11f964174f64e90b195a7682660
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.98.ebuild 3070 RMD160 521713befc67c22b5718693d646e9cc95f3efe93 SHA1 7919195340c23eceabd3e0f686fb33d4788de61d SHA256 b3a1c3092eb9b377d4b3d1d0f5ba8186b986c86d6f84a68bc5cdca455ddac3d4
+EBUILD grub-1.99_rc1.ebuild 3199 RMD160 aa6adb0bfc07fca143761e872f07dba946b4ae2b SHA1 467f31295a30a52af6202f4bbb230085da52926e SHA256 15a2f89746a6d34b3962f481912d88181e16bd05f29b89fcb3c015347bc94290
 EBUILD grub-9999.ebuild 3152 RMD160 f59276af6496876954c7528a5d59ac58208187ae SHA1 c9e1fc13b444a9842670a967e69151b869a2d7d8 SHA256 1f8b361376dfbd75b355c3f7a78db51bb67e6cfd405aa1df6e818c597ff6bb75
-MISC ChangeLog 30665 RMD160 7ffcd8f88e2ce0d2c760c91cd9d6bbea0e487c96 SHA1 bd3eaf31c9312f7ee1da01ffa3b304a8a59544ee SHA256 3b6c9c91675faa0a920b858a472dc9a89881b0e9245486b16c9f3649328fc96f
+MISC ChangeLog 30811 RMD160 9f83f8c7b38db1d6408ede14b2398087b3b39549 SHA1 d208f8dc62a31b5a975b55fad2dd4692483d1734 SHA256 ccea6a40e1e226efdfee74b94fd520171d05bb7f5e4fa6925470e6d241acb840
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1XiyIACgkQaC/OocHi7JYd5wD/Rh13kt3JKGR2KA76puGajxcr
-7nG4+oFL3kUbAanVIH8A/0T5x6EQcoh662QGSpXf+ETKMTxEXFUj+EPcY+FlSxVk
-=0d1A
+iF4EAREIAAYFAk1tkbAACgkQaC/OocHi7JYyLwD9GjDn8sr14/o4xE7OPrjW9teN
++jvbk2jSiXTuDn+7ZlAA/RNcBD5GuTZOkhcntjWIFxgFLv/44cinVTLnOGpdXdkx
+=3ZpB
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.99_rc1.ebuild b/sys-boot/grub/grub-1.99_rc1.ebuild
new file mode 100644
index 000000000000..87393d9c40b1
--- /dev/null
+++ b/sys-boot/grub/grub-1.99_rc1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.1 2011/03/02 00:39:09 vapier Exp $
+
+# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub"
+	inherit autotools bzr
+	SRC_URI=""
+else
+	MY_P=${P/_/\~}
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.gz
+		mirror://gentoo/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="GNU GRUB 2 boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+use multislot && SLOT="2" || SLOT="0"
+KEYWORDS=""
+IUSE="custom-cflags debug truetype multislot static"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+	dev-libs/lzo
+	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autogen-5.10
+	>=dev-lang/python-2.5.2"
+[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+PROVIDE="virtual/bootloader"
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		bzr_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.99-genkernel.patch #256335
+	epatch_user
+
+	# autogen.sh does more than just run autotools
+	# need to eautomake due to weirdness #296013
+	if [[ ${PV} == "9999" ]] ; then
+		sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
+		(. ./autogen.sh) || die
+	fi
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	econf \
+		--disable-werror \
+		--sbindir=/sbin \
+		--bindir=/bin \
+		--libdir=/$(get_libdir) \
+		--disable-efiemu \
+		$(use_enable truetype grub-mkfont) \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable debug grub-fstest)
+	emake -j1 || die "making regular stuff"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+	GRUB_DISTRIBUTOR="Gentoo"
+	EOF
+	if use multislot ; then
+		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
+		mv "${D}"/sbin/grub{,2}-install || die
+		mv "${D}"/sbin/grub{,2}-set-default || die
+		mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
+		mv "${D}"/usr/share/info/grub{,2}.info || die
+	fi
+}
+
+setup_boot_dir() {
+	local boot_dir=$1
+	local dir=${boot_dir}/grub
+
+	if [[ ! -e ${dir}/grub.cfg ]] ; then
+		einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
+		grub-mkconfig -o "${dir}/grub.cfg"
+	fi
+
+	#local install=grub-install
+	#use multislot && install="grub2-install --grub-setup=/bin/true"
+	#einfo "Running: ${install} "
+	#${install}
+}
+
+pkg_postinst() {
+	mount-boot_mount_boot_partition
+
+	if use multislot ; then
+		elog "You have installed grub2 with USE=multislot, so to coexist"
+		elog "with grub1, the grub2 install binary is named grub2-install."
+	fi
+	setup_boot_dir "${ROOT}"boot
+
+	# needs to be after we call setup_boot_dir
+	mount-boot_pkg_postinst
+}