Restore missing patches and FreeBSD compat, bug 455580.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 47 insertions, 12 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index dfb5220054cf..a40edf7c3f73 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.251 2013/02/04 17:29:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.252 2013/02/05 17:14:03 floppym Exp $
+
+  05 Feb 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00-r2.ebuild,
+  grub-9999.ebuild:
+  Restore missing patches and FreeBSD compat, bug 455580.
 
   04 Feb 2013; Richard Yao <ryao@gentoo.org> grub-2.00-r2.ebuild:
   Warn people using ZFS that grub2-install needs to be run to properly support
diff --git a/sys-boot/grub/grub-2.00-r2.ebuild b/sys-boot/grub/grub-2.00-r2.ebuild
index 0df6651db8e4..292995b2e1e1 100644
--- a/sys-boot/grub/grub-2.00-r2.ebuild
+++ b/sys-boot/grub/grub-2.00-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.3 2013/02/04 17:29:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r2.ebuild,v 1.4 2013/02/05 17:14:03 floppym Exp $
 
 EAPI=4
 
@@ -46,7 +46,8 @@ GRUB_PLATFORMS=(
 )
 IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
 
-REQUIRED_USE="grub_platforms_qemu? ( truetype )"
+REQUIRED_USE="grub_platforms_qemu? ( truetype )
+	grub_platforms_yeeloong? ( truetype )"
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
@@ -82,12 +83,15 @@ DEPEND="${RDEPEND}
 	)
 "
 RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	kernel_linux? (
+		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"
-else
+fi
+if [[ ${PV} != 9999 ]]; then
 	DEPEND+=" app-arch/xz-utils"
 fi
 
@@ -234,6 +238,8 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
 		epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
 		epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
+		epatch "${FILESDIR}/${P}-freebsd.patch" #442050
+		epatch "${FILESDIR}/${P}-compression.patch" #424527
 		epatch "${FILESDIR}/${P}-zfs-feature-flag-support.patch" #455358
 	fi
 
@@ -274,6 +280,7 @@ src_configure() {
 
 	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
+	use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
 
 	# Sandbox bug 404013.
 	use libzfs && addpredict /etc/dfs:/dev/zfs
@@ -337,6 +344,7 @@ pkg_preinst() {
 	display_zfs_feature_flag_warning=$?
 }
 
+
 pkg_postinst() {
 	# display the link to guide
 	elog "For information on how to configure grub-2 please refer to the guide:"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index db2e902b8407..ad50af6d2f3e 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.85 2012/10/20 21:46:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.86 2013/02/05 17:14:03 floppym Exp $
 
 EAPI=4
 
@@ -46,7 +46,8 @@ GRUB_PLATFORMS=(
 )
 IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
 
-REQUIRED_USE="grub_platforms_qemu? ( truetype )"
+REQUIRED_USE="grub_platforms_qemu? ( truetype )
+	grub_platforms_yeeloong? ( truetype )"
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
@@ -82,12 +83,15 @@ DEPEND="${RDEPEND}
 	)
 "
 RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	kernel_linux? (
+		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"
-else
+fi
+if [[ ${PV} != 9999 ]]; then
 	DEPEND+=" app-arch/xz-utils"
 fi
 
@@ -234,6 +238,9 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
 		epatch "${FILESDIR}/${P}-tftp-endian.patch" # 438612
 		epatch "${FILESDIR}/${P}-hardcoded-awk.patch" #424137
+		epatch "${FILESDIR}/${P}-freebsd.patch" #442050
+		epatch "${FILESDIR}/${P}-compression.patch" #424527
+		epatch "${FILESDIR}/${P}-zfs-feature-flag-support.patch" #455358
 	fi
 
 	# fix texinfo file name, bug 416035
@@ -273,6 +280,7 @@ src_configure() {
 
 	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
+	use elibc_FreeBSD && append-cppflags "-isystem /usr/include"
 
 	# Sandbox bug 404013.
 	use libzfs && addpredict /etc/dfs:/dev/zfs
@@ -330,6 +338,13 @@ src_install() {
 	newins "${FILESDIR}"/grub.default-2 grub
 }
 
+pkg_preinst() {
+	has_version "<sys-boot/grub-2.00-r2:2" && \
+		[[ "$(df -TP /boot | awk 'NR>1{print $2}')" = 'zfs' ]]
+	display_zfs_feature_flag_warning=$?
+}
+
+
 pkg_postinst() {
 	# display the link to guide
 	elog "For information on how to configure grub-2 please refer to the guide:"
@@ -345,4 +360,12 @@ pkg_postinst() {
 		ewarn "the following to add sys-boot/grub:0 to your world file."
 		ewarn "emerge --noreplace sys-boot/grub:0"
 	fi
+	if [[ $display_zfs_feature_flag_warning -eq 0 ]]; then
+		zfs_pool=$(df -TP /boot | awk 'NR>1{print $1}')
+		zfs_pool=${zfs_pool%%/*}
+		ewarn "The previous version of sys-boot/grub lacked support for ZFS feature flags."
+		ewarn "Your /boot is on ZFS. Running \"zpool upgrade ${zfs_pool}\" or \"zpool upgrade -a\""
+		ewarn "to upgrade your pool to support feature flags will prevent your system from booting."
+		ewarn "You should use grub2-install to reinstall your boot code. This will avoid problems."
+	fi
 }