Extend workaround for sandbox bug 404013.

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

4 files changed, 19 insertions, 11 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5dfd0a386ec8..43698848eaad 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.222 2012/06/29 16:21:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.223 2012/06/29 22:06:15 floppym Exp $
+
+  29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+  grub-9999.ebuild:
+  Extend workaround for sandbox bug 404013.
 
   29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-0.97-r12.ebuild:
   grub-0.97 does not actually install files in /usr/lib, so don't copy that
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e7297b71397e..83895f21c5a1 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -50,15 +50,15 @@ EBUILD grub-0.97-r8.ebuild 8948 RMD160 16358e22e4806fce95513bc4faff3ba01ababd21
 EBUILD grub-0.97-r9.ebuild 9053 RMD160 23b5973daff5607e8e35d9746cef8c86a1de0a1b SHA1 944114e731617a4b967d0539377c59f1a8667871 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726
 EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA1 1bd9a4792eaca92500c0c40e9dedda8fead92c27 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1
 EBUILD grub-1.99-r2.ebuild 8413 RMD160 77c4579d76acd48b3a1d5f4784fb512df3002007 SHA1 ed90c12ebc31d4729230fa6daf67b5d310c2c131 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585
-EBUILD grub-2.00.ebuild 7549 RMD160 3995c31354bc0755c547a20f78a5141f23d7de04 SHA1 49bd0e3006499d2beab10afa1501a6d9f215df05 SHA256 ffc52d72d8b6a0b473c194b911f7383be3124400eae555e614be5827a201a666
+EBUILD grub-2.00.ebuild 7582 RMD160 249f259f7192f1f76fe633db8db7f5fe9c798f3f SHA1 f353740957fcd00de16b4e3c17c1335ecc4ab306 SHA256 5d253a8183bb549f09fed2bdc03e6c344c39dc23c996cefab418366b612e64ba
 EBUILD grub-2.00_beta6.ebuild 7140 RMD160 a514ef13f06d98a97469f4e7e8ede54b81dae133 SHA1 36b3cf0674c1c4170bceb50015f4e58d00f61dfd SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68
-EBUILD grub-9999.ebuild 7550 RMD160 0538abfa79ff3a1660f93ef658050529f389002c SHA1 0e01163bf325103446258b053c182f1b883e4089 SHA256 174fb859195b6fef23b9aec079256724b84dec8191acfdd4839a955143b7dc87
-MISC ChangeLog 43930 RMD160 7c9e5066219698fa3648106375534a979a672a9c SHA1 0581101d2e6a9c1c0f179893924f49adf071d77e SHA256 df211915ca116ae3d54eb8cd437872fe865bd19e98cb98288d34762e93756e5f
+EBUILD grub-9999.ebuild 7583 RMD160 0a1f221e257f3b204620e608a53dc6a1e90963c8 SHA1 5337cd9354292444f7998b843f7d26b8ff250698 SHA256 93c79d52a9ccdde0d042881e8cace9e0af1db8db08bb80c012c4283f2144188c
+MISC ChangeLog 44062 RMD160 41387e2220362e8f289dc5488465ceae586b0902 SHA1 886bb15766159d4ef6990aa39cab80641111cee9 SHA256 4d4c5ecb8821ce720f8af9a4eaacf9ff8b7130125d19489be6ae2cc417189ef3
 MISC metadata.xml 607 RMD160 4d6c4e92248479483d0ca45a34567921ad970b86 SHA1 fd20ee64f83670b9bd29b2cbe9a93508af9fe0bd SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/t1gcACgkQC77qH+pIQ6RZlQD/TBRM47HYIJyda116kguCAZMw
-bhBs/w0qrYVC/GNmjRUA/AmHMLjnyPb+JbhDDs5aa5cuEAOa/iNW5mLlVWkZphw2
-=nmxp
+iF4EAREIAAYFAk/uJt4ACgkQC77qH+pIQ6RryAEAyItPeDfc5TL0MvmG9vFtmeCD
+oZvAd2dqcMaz+krTixgBAMZ38WM2KwlWEocLyPwhQIVUKvOfLHG/sNEx72kGRjY5
+=Jn6O
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index 7c70bb19f2dc..fef8e8bb8ed0 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.7 2012/06/29 15:34:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.8 2012/06/29 22:06:15 floppym Exp $
 
 EAPI=4
 
@@ -242,9 +242,11 @@ src_configure() {
 	local i
 
 	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
 	use static && append-ldflags -static
 
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
 	for i in ${GRUB_ENABLED_PLATFORMS}; do
 		grub_run_phase ${FUNCNAME} ${i}
 	done
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4db838fa210b..e1441639b298 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.73 2012/06/29 15:34:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.74 2012/06/29 22:06:15 floppym Exp $
 
 EAPI=4
 
@@ -242,9 +242,11 @@ src_configure() {
 	local i
 
 	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
 	use static && append-ldflags -static
 
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
 	for i in ${GRUB_ENABLED_PLATFORMS}; do
 		grub_run_phase ${FUNCNAME} ${i}
 	done