profiles/arch/amd64*: force full multilib on sys-apps/sandbox, #611292

diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force
index 8025d872db45c3a81b4bd5b2559706c051166fb9..b3a9e1d3fe1bca85d5faf1bc6fb912aefb599393 100644 (file)
--- a/profiles/arch/amd64-fbsd/package.use.force
+++ b/profiles/arch/amd64-fbsd/package.use.force
@@ -1,6 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (08 Apr 2017)
+# Require sandbox to be multilib-capable to avoid failures when building
+# multilib packages, #611292.
+sys-apps/sandbox abi_x86_32
+
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
 sys-devel/clang llvm_targets_X86

diff --git a/profiles/arch/amd64/no-multilib/package.use.force b/profiles/arch/amd64/no-multilib/package.use.force
new file mode 100644 (file)
index 0000000..0f2c76d
--- /dev/null
+++ b/profiles/arch/amd64/no-multilib/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (08 Apr 2017)
+# Undo multilib forcing.
+sys-apps/sandbox -abi_x86_32

diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index ab5831aebbc8064339011493b2ac04b9d9cbfc1d..c267fe03e14d48bd4e032debb0764ce5a1590d0f 100644 (file)
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (08 Apr 2017)
+# Require sandbox to be multilib-capable to avoid failures when building
+# multilib packages, #611292.
+sys-apps/sandbox abi_x86_32
+
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
 sys-devel/clang llvm_targets_X86

diff --git a/profiles/arch/amd64/x32/package.use.force b/profiles/arch/amd64/x32/package.use.force
new file mode 100644 (file)
index 0000000..104f780
--- /dev/null
+++ b/profiles/arch/amd64/x32/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@gentoo.org> (08 Apr 2017)
+# Require sandbox to be multilib-capable to avoid failures when building
+# multilib packages, #611292.
+sys-apps/sandbox abi_x86_64