Version bump #292677 by Hanno Boeck.

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

3 files changed, 112 insertions, 5 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 62e13d085c14..67f821ba9bc7 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.126 2009/11/01 19:51:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.127 2009/11/11 04:13:32 vapier Exp $
+
+*grub-1.97.1 (11 Nov 2009)
+
+  11 Nov 2009; Mike Frysinger <vapier@gentoo.org> +grub-1.97.1.ebuild:
+  Version bump #292677 by Hanno Boeck.
 
   01 Nov 2009; Mike Frysinger <vapier@gentoo.org> grub-1.97.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 2b5f1513f44a..817959d50faf 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -21,6 +21,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.96.tar.gz 639970 RMD160 80c8a41b73063706310f3f6e99acb912e2e8f9ab SHA1 6af22f354d8c551dd82e71f15196e2f96a1318ba SHA256 0cdfb104da5492b1b2b402ed45873b3b7a7407f5017ae7d8806327a619dc1d59
+DIST grub-1.97.1.tar.gz 1242959 RMD160 3f0036add7298bfd1bb2dcd963671bbeea136c3c SHA1 a8465fc16ef5d082a43df0f8e7caeea01db0c515 SHA256 51f04517a3eb730a0f66e68cf5b0e376f6a073899b4405b2ac14667825f937bf
 DIST grub-1.97.tar.gz 1246414 RMD160 82277210019561975939a4ff68de65d0b5824149 SHA1 df5345640ffe73112e11352f563d7ae619718e3b SHA256 8d582e9627ab6d7c73edaed3c30c933aefc2884aec76cf671d6d40f46ce65673
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
 EBUILD grub-0.92-r1.ebuild 2639 RMD160 cacac6d3ed808c52a05fc6b1c0c929af7f114926 SHA1 5828e84ded260a50bd7c6cd30217e1d0cf881299 SHA256 40c896a0ec005d50e9c6effd4d2ee95c1e0712d26a13f8f55bc6d7380c6d7102
@@ -37,14 +38,15 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce
 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.96.ebuild 1980 RMD160 b9389115b1490a018a7c47f897884db95856d1e1 SHA1 317379e018b0c5b7310c4a54a7aee36e9cb4a518 SHA256 bf84649fb9543d9ba92774efb68f97a5bc8ae1cb7fc6895d48357eb309fd92f2
+EBUILD grub-1.97.1.ebuild 2566 RMD160 8163edaea016fad7c754ca60c69dd6c252ef9a74 SHA1 0c0b2db2cfd5f07a65c24804c4aa15c5853f48f5 SHA256 48a5c81ef53d51b2e2135db280bad55bc0f5a06662e482b387807d4e8f86dd03
 EBUILD grub-1.97.ebuild 2564 RMD160 8093b0ba309ed04721313651fd23c1d0399dd393 SHA1 28e27348871eb191ffa87fbb23b51bbbd1f788af SHA256 3dca113213aa522e5b46a2d07e45e98de6e80d6cc62f5ca82dc90ecc9ece73aa
 EBUILD grub-9999.ebuild 2565 RMD160 dfca829c5e686c01eac5036a917961be0cf3b9dc SHA1 e7cdc7535567c060493e71b2534d23c5dc2494c4 SHA256 e13242bdc5e9c535224ed0c74242fbc2bfbbcd10ca5b93250905b8b631923147
-MISC ChangeLog 27043 RMD160 f93e55d4eda26ce0a2d028c525f369c2d4350ce1 SHA1 38f8c8d00d118175fbc6099f672349c9dd10520c SHA256 2788de663047e02a5f2c4fca4326b8e0d81286d33bb8954b4e290131c4183df4
+MISC ChangeLog 27182 RMD160 d5fc60fde11b356315ae0328a5a73da2c83cc8be SHA1 c98529a0c29312a7878c2fdfc66a2792f4f2f300 SHA256 a7c4baf970bb1c3ba47cb9cf4176238cfe7deb28d2adaa80967cc934a37d3408
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrt5uAACgkQlPl3HsVfCDpY9QCfVSMWlfppDGaETo3UJd7p1hMx
-pq0AnjpM4su2b+KoMI6Ifalx5RMW+ObR
-=QVn8
+iEYEARECAAYFAkr6OnEACgkQlPl3HsVfCDqc2gCeM7PlgbKNHoFEPwPARf0hqfjT
+S0kAn16lA2ok4q6k11ZIt1GnAr8eGeBF
+=x9JK
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.97.1.ebuild b/sys-boot/grub/grub-1.97.1.ebuild
new file mode 100644
index 000000000000..066b19fa3d7f
--- /dev/null
+++ b/sys-boot/grub/grub-1.97.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.1 2009/11/11 04:13:32 vapier Exp $
+
+inherit autotools mount-boot eutils flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://svn.sv.gnu.org/grub/trunk/grub2"
+	inherit subversion
+	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 multislot static"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+	dev-libs/lzo"
+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
+		subversion_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
+	sed -i -e 's:^auto:eauto:' autogen.sh
+	(. ./autogen.sh) || die
+}
+
+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 \
+		--enable-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}"/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
+}