Version bump.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 120 insertions, 7 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 41bef1082094..d5b8e8cade12 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.132 2010/03/07 17:37:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.133 2010/03/10 19:47:34 vapier Exp $
+
+*grub-1.98 (10 Mar 2010)
+
+  10 Mar 2010; Mike Frysinger <vapier@gentoo.org> +grub-1.98.ebuild:
+  Version bump.
 
 *grub-1.97.2 (07 Mar 2010)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1e8e79c04901..dab9796800f0 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -19,8 +19,8 @@ DIST grub-0.97-patches-1.7.tar.bz2 31190 RMD160 f72f956c36d07e914bb7b4512ff9c883
 DIST grub-0.97-patches-1.8.tar.bz2 48274 RMD160 99c967daca704e853e9d161a51db3d39040bab4f SHA1 3e643d8de0d77456409176ebc4b3b14d547d99dc SHA256 fcd16e6def8ace7bb5928c2d16ddb032a57a5df24a69f9cfae5ce6292785318b
 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.97.1.tar.gz 1242959 RMD160 3f0036add7298bfd1bb2dcd963671bbeea136c3c SHA1 a8465fc16ef5d082a43df0f8e7caeea01db0c515 SHA256 51f04517a3eb730a0f66e68cf5b0e376f6a073899b4405b2ac14667825f937bf
 DIST grub-1.97.2.tar.gz 1249181 RMD160 6f1779edb70f5d111fbc6e018547e78c042d2c3b SHA1 90aca596add560afeb9f2a829421dfd360d4c725 SHA256 98c1d2623ce809ec25ba9136ea59c15a4580c71478d122be765e819cb06a1c49
+DIST grub-1.98.tar.gz 2449386 RMD160 197fb8d7c673bd67ae81eda53a2baa2968cc1e69 SHA1 e83a2c438f4773a2e272c225983c0145e1ffd641 SHA256 bef2c1892e052967b65aab6aa62ac702c0e50ef8848506eacf3c0b2f5007c614
 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
@@ -35,15 +35,15 @@ EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6
 EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce SHA1 9557b2edc8ba61766cd35a2a4d37e26434aaeff7 SHA256 34a4d4ffb38e0bf0ba2647933b7aa341c72537add518bc4ec217419619c1f960
 EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.97.1.ebuild 2761 RMD160 376c05fcd9cf9d954f5e83861a76830563c6f150 SHA1 5c67b5a0b299ef59f7894ff2a5d884a2ba289e50 SHA256 37516f9180f3cc9ba86f861eff32f155ff1706c243b4a792fad1f05d2295d9bf
 EBUILD grub-1.97.2.ebuild 2841 RMD160 c8569b5b8369a9527b910f935453ceeff59e24cc SHA1 67354179a4e25d48b512be2eba92859014a0c06a SHA256 14e50db40b83927eaff99a07c6473421185df26da2fb49f07949cb766f27c8ce
+EBUILD grub-1.98.ebuild 2806 RMD160 fc78a95be7b9eced79805ce4b4022661775dfb30 SHA1 3c74316e7de46f7854c1d91f80d6b0256205a2f6 SHA256 40246e6622568b02cffeea04974ceee0e063a2a7973b6943b3ede06d8bc41620
 EBUILD grub-9999.ebuild 2760 RMD160 b0042e35abb0524c67aecf254543221cbd9f0b28 SHA1 7a581e7cbdccfe58301d80ba3bf30134673d34b4 SHA256 d3a692836f7bd705e0f646331aa8d6dd50f55c4c5a0eaf89acdd81d40f13d842
-MISC ChangeLog 27890 RMD160 8d0cf0ab484aaaedc5917dbd7c92e0f045bf6564 SHA1 0d1a6f7bf96e3df0bf9537fc20f35f8f78293942 SHA256 f1b1c9d5204863d5b50a996e3585e89a833d1b66b365254082c529f0102e3a31
+MISC ChangeLog 28002 RMD160 34f5e974ef32e50f16a319cb90bb4e28987558e9 SHA1 eb16b829d292b705391295092df7d838f14daa8d SHA256 4d80c55033e7519b8d1a7f05d7ef6dc862507e9df740298cf06d5e22283b4cf1
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkuT5EYACgkQTwhj9JtAlp6GwgD/WJCSnyWGdohl30c6zvJ99UA+
-0z+yo06JBCqU8XF+jF0BAIY+QTWnSZkB6PiQKNR6cRxwZ/pkOw9k25dQmikIAZqb
-=z+Nb
+iF4EAREIAAYFAkuX94UACgkQTwhj9JtAlp4tzQD9FlzsZUVmHrqQSG8ywtH8ztLT
++Q9n62gNYIBzcnuP+HcA/3N3LcQsEdVBgR1AxthCOX4HmiHt02nsUOaf+7isL/tm
+=AihP
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild
new file mode 100644
index 000000000000..cd97bb82172a
--- /dev/null
+++ b/sys-boot/grub/grub-1.98.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.1 2010/03/10 19:47:34 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
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+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 )"
+DEPEND="${RDEPEND}
+	dev-lang/ruby"
+PROVIDE="virtual/bootloader"
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		bzr_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.96-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 '/^\(auto\|ac\)/s:^:e:' \
+			-e "s:^eautomake:`which automake`:" \
+			autogen.sh
+		(. ./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-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}"/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() {
+	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
+}