Grab a bunch of patches from Debian.

Package-Manager: portage-2.1.1_rc1-r6

4 files changed, 202 insertions, 15 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 856d072facc1..8191208736f6 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.66 2006/08/30 05:14:08 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.67 2006/09/08 06:13:23 vapier Exp $
+
+*grub-0.97-r3 (08 Sep 2006)
+
+  08 Sep 2006; Mike Frysinger <vapier@gentoo.org> +grub-0.97-r3.ebuild:
+  Grab a bunch of patches from Debian.
 
   30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> grub-0.97-r2.ebuild:
   Stable x86; bug #144998
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 010671194f2f..6d04b5f3d494 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -5,12 +5,13 @@ DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a11218793822658
 DIST grub-0.92.tar.gz 877112 RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37
 DIST grub-0.94-gentoo-0.1.tar.bz2 40585 RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3
 DIST grub-0.94.tar.gz 923518 RMD160 144e085e2eb139f135a7e6eb65d15489da4cf225 SHA256 010d15c823cbccc7b5943735799bf8412ae18391307d4c2d5f8dbed158cc4a1b
-DIST grub-0.96-patches-1.0.tar.bz2 49828 RMD160 baa7cadabff9896bb784e32f3283c008fa3d05db SHA256 3d31cab8131d728673d1b866890a54f7652cab23dc2c4b9499e1f51f0ea6e956
+DIST grub-0.96-patches-1.0.tar.bz2 49828 RMD160 baa7cadabff9896bb784e32f3283c008fa3d05db SHA1 d10c873c3f94deca3f49645f39b44672193be69c SHA256 3d31cab8131d728673d1b866890a54f7652cab23dc2c4b9499e1f51f0ea6e956
 DIST grub-0.96-r1-gentoo-0.1.tar.bz2 47051 RMD160 6dea68ba610fd68c99cf2080648df9a66469450b SHA256 3457a18707a0c733cc9e6caea5b41ce182b55add08bc69aa5b4e2fb92676431e
 DIST grub-0.96-r2-gentoo-0.1.tar.bz2 47639 RMD160 fceb2193a32e8657390045cfc390829aa056fd5d SHA1 9fcb15861e9c9ec4d46fa80a6c91402c7f3e05dc SHA256 78fabb16c53518a3e96b9984ee49258ed5cdf23b8c33591c38ddf84912ea7e6c
 DIST grub-0.96.tar.gz 985761 RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa SHA1 2520b03c8990ffe900cfc4fabd800d1056014f48 SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba
-DIST grub-0.97-patches-1.0.tar.bz2 46259 RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f
+DIST grub-0.97-patches-1.0.tar.bz2 46259 RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 SHA1 36184739f02b582bbe76857d83aae7ea81a06e7e SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f
 DIST grub-0.97-patches-1.2.tar.bz2 20872 RMD160 7d91e01873f52daad271eda85e67f031e72570c9 SHA1 d9a11b6142931baeb8d13adb06fc86706ea17e3d SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049
+DIST grub-0.97-patches-1.3.tar.bz2 24317 RMD160 9cbea5ed4a5bfdd7a6c785d02adfc64f5a76dc4d SHA1 4460e2ff597a3bdc7917285f2f39baa36f943675 SHA256 2a9cf0b5507c9b7dc7ccb787e3883e5e8baa324a63a79322eb81f2f594fda411
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST grub-1.94.tar.gz 502058 RMD160 0651800f7dd8d07f313ee9f1dd723f7bc047dcc8 SHA1 701542dffe9acf85399f4d4accf81d06108013a9 SHA256 1483c0073ab0823e6928f565b375f312f704e8945c0f9941dbe315d68813208e
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
@@ -38,18 +39,22 @@ EBUILD grub-0.97-r2.ebuild 4837 RMD160 0354978e70fc78dc77f2075dddb625fda8a30855
 MD5 cc64596d5c0074754c380757b93f76d5 grub-0.97-r2.ebuild 4837
 RMD160 0354978e70fc78dc77f2075dddb625fda8a30855 grub-0.97-r2.ebuild 4837
 SHA256 4d51ab395a6346b5f8753bb3bc04c547b1162dcf0381796e8d2f1cea96086496 grub-0.97-r2.ebuild 4837
+EBUILD grub-0.97-r3.ebuild 4811 RMD160 cf848bb7165ebb6e828386d8c862308f80775c20 SHA1 27555d2e4a1f73689ca216ebc931399cf4e92480 SHA256 91d99f44fb470b7afde58b9f9ff473c50aec696907c512ddee386bff1dd37a6d
+MD5 9a11ea27f12f8d47e2ce2575b4383bdb grub-0.97-r3.ebuild 4811
+RMD160 cf848bb7165ebb6e828386d8c862308f80775c20 grub-0.97-r3.ebuild 4811
+SHA256 91d99f44fb470b7afde58b9f9ff473c50aec696907c512ddee386bff1dd37a6d grub-0.97-r3.ebuild 4811
 EBUILD grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 SHA1 07484f2e49a04c267a8f3dec6118b4a2833dbdcd SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6
 MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 grub-0.97.ebuild 4518
 SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6 grub-0.97.ebuild 4518
-EBUILD grub-1.94.ebuild 972 RMD160 c307385e9d50db7124a47533ce85820bd5ee83de SHA1 dda1ea247568a2bfe92d290509a765a953cad00c SHA256 73cf15e42c5daee1d28ffb7681b02a547f88c5d88b05a38d0beb7bc84c757a0d
-MD5 58a1c365618c76276a231b56c997856f grub-1.94.ebuild 972
-RMD160 c307385e9d50db7124a47533ce85820bd5ee83de grub-1.94.ebuild 972
-SHA256 73cf15e42c5daee1d28ffb7681b02a547f88c5d88b05a38d0beb7bc84c757a0d grub-1.94.ebuild 972
-MISC ChangeLog 17669 RMD160 f68e79d5f25254c663696b6f0babf64d539c732c SHA1 522c3e4bd4ffae10dfa62602173e43e92772c54f SHA256 3e9133c342af07fcb9f323ba85720c2556d990b940c642eaa0828132ace4e5ff
-MD5 a93ba617dbc3208ece2f8135de23849b ChangeLog 17669
-RMD160 f68e79d5f25254c663696b6f0babf64d539c732c ChangeLog 17669
-SHA256 3e9133c342af07fcb9f323ba85720c2556d990b940c642eaa0828132ace4e5ff ChangeLog 17669
+EBUILD grub-1.94.ebuild 943 RMD160 1b8caa2ef0a8a18a257d143dada8c3a985076e43 SHA1 18db758e4acb0950adaa8108116536e8ae53a0d9 SHA256 72ec215b134b39af932feca5492083d5094c2c8e58290536411c4819744abb9c
+MD5 047864bbc510a67da1057e2d74a892fc grub-1.94.ebuild 943
+RMD160 1b8caa2ef0a8a18a257d143dada8c3a985076e43 grub-1.94.ebuild 943
+SHA256 72ec215b134b39af932feca5492083d5094c2c8e58290536411c4819744abb9c grub-1.94.ebuild 943
+MISC ChangeLog 17810 RMD160 e4b053f9e6bba53589896ed7a4350b6bd89ffe13 SHA1 ee484d321ba13ace7afcd495471d1adb0087e815 SHA256 1410d51f48ae4609ab45c93ec6a9f55db445d314d223fc4fe0408764c5dacafd
+MD5 c7007243765efb64e7f0d03de02b03d9 ChangeLog 17810
+RMD160 e4b053f9e6bba53589896ed7a4350b6bd89ffe13 ChangeLog 17810
+SHA256 1410d51f48ae4609ab45c93ec6a9f55db445d314d223fc4fe0408764c5dacafd ChangeLog 17810
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -75,13 +80,16 @@ SHA256 a9b9d0d6eda41218f5011138aa52a4bb1bcab702da1b1342fed3d275d1d1bd9c files/di
 MD5 660ca8ffb71c2a1008754fc599c5dc32 files/digest-grub-0.97-r2 711
 RMD160 17ed023bb1e3e7eb935ae3b5d6f46a1447ae4ae7 files/digest-grub-0.97-r2 711
 SHA256 b0934e5e43d1417abb03e4adc7fbe5b3b6c36bc4db651ceaf832a6eff42bb931 files/digest-grub-0.97-r2 711
+MD5 675b51a800202486c75d9ec5351ed0ea files/digest-grub-0.97-r3 711
+RMD160 fa8c68666cd862e02b9a85c50de48862f50c4f3d files/digest-grub-0.97-r3 711
+SHA256 74637ee02b2119b995d20ec740c804419123b95ad9d4c25538cac671cc268b1e files/digest-grub-0.97-r3 711
 MD5 aa912ac34f4c9abd12340d3629edb679 files/digest-grub-1.94 229
 RMD160 89524a89bc154ce22bf0c5c9563a2d2b8f6e5aa9 files/digest-grub-1.94 229
 SHA256 c3b2f59fa9ba49b4e91cb3111fa85a6e03cda9164455a518808337796d97d2b4 files/digest-grub-1.94 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE9R8M2ZWR0Jhg/EsRAhJwAJ9/Yhu5Rm8/JqPRDcfoogQKKkbd7QCbB0AZ
-jpxr6p6gh2DVnq0A/seOa64=
-=5nU0
+iD8DBQFFAQoOamhnQswr0vIRAj9SAKCDHcB3blqOJ3j9CYxbFnHcJ15/DgCeKXop
+7xeeEAn1yX53uwzz3wC9bx8=
+=GF2h
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/digest-grub-0.97-r3 b/sys-boot/grub/files/digest-grub-0.97-r3
new file mode 100644
index 000000000000..1a217f08f67d
--- /dev/null
+++ b/sys-boot/grub/files/digest-grub-0.97-r3
@@ -0,0 +1,9 @@
+MD5 a5b91d09a7a941b347e60c0796913a35 grub-0.97-patches-1.3.tar.bz2 24317
+RMD160 9cbea5ed4a5bfdd7a6c785d02adfc64f5a76dc4d grub-0.97-patches-1.3.tar.bz2 24317
+SHA256 2a9cf0b5507c9b7dc7ccb787e3883e5e8baa324a63a79322eb81f2f594fda411 grub-0.97-patches-1.3.tar.bz2 24317
+MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
+RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
+SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/sys-boot/grub/grub-0.97-r3.ebuild b/sys-boot/grub/grub-0.97-r3.ebuild
new file mode 100644
index 000000000000..d3791d21ea20
--- /dev/null
+++ b/sys-boot/grub/grub-0.97-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.1 2006/09/08 06:13:23 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER="1.3"
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# patch breaks booting for some people #111885
+	rm "${WORKDIR}"/patch/400_*
+
+	if [[ -n ${PATCHVER} ]] ; then
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patch
+
+		# a bunch of patches apply to raw autotool files
+		autoconf || die "autoconf failed"
+		aclocal || die "aclocal failed"
+		automake || die "automake failed"
+	fi
+}
+
+src_compile() {
+	use amd64 && multilib_toolchain_setup x86
+
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	if use netboot ; then
+		exeinto /usr/lib/grub/${CHOST}
+		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
+	fi
+
+	insinto /boot/grub
+	doins "${DISTDIR}"/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+}
+
+setup_boot_dir() {
+	local dir="${1}"
+
+	[[ ! -e "${dir}" ]] && die "${dir} does not exist!"
+
+	[[ ! -e "${dir}/grub" ]] && mkdir "${dir}/grub"
+
+	# change menu.lst to grub.conf
+	if [[ ! -e "${dir}/grub/grub.conf" && -e "${dir}/grub/menu.lst" ]] ; then
+		mv -f "${dir}/grub/menu.lst ${dir}/grub/grub.conf"
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+
+	if [[ ! -e "${dir}"/grub/menu.lst ]]; then
+	einfo "Linking from new grub.conf name to menu.lst"
+		ln -snf grub.conf "${dir}/grub/menu.lst"
+	fi
+
+	[[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
+	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
+	done
+
+	if [[ -e "${dir}"/grub/grub.conf ]] ; then
+		egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' "${dir}"/grub/grub.conf | \
+		/sbin/grub --batch \
+			--device-map="${dir}"/grub/device.map \
+			> /dev/null
+	fi
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+	setup_boot_dir /boot
+	einfo "To install grub files to another device (like a usb stick), just run:"
+	einfo "   emerge --config =${PF}"
+}
+
+pkg_config() {
+	local dir
+	einfo "Enter the directory where you want to setup grub:"
+	read dir
+	setup_boot_dir ${dir}
+}