gentoo resync : 19.03.2019

15 files changed, 22 insertions, 28 deletions

diff --git a/profiles/default/linux/ia64/make.defaults b/profiles/default/linux/ia64/make.defaults
deleted file mode 100644
index f68144503406..000000000000
--- a/profiles/default/linux/ia64/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Disable as-needed by default until #541828 is fixed.
-# (The as-needed flag is added in default/linux/.)
-LDFLAGS="-Wl,-O1"
diff --git a/profiles/default/linux/musl/amd64/package.use.force b/profiles/default/linux/musl/amd64/package.use.force
index ca264fedc8ce..553802649559 100644
--- a/profiles/default/linux/musl/amd64/package.use.force
+++ b/profiles/default/linux/musl/amd64/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/musl/arm/package.use.force b/profiles/default/linux/musl/arm/package.use.force
index b92b1029f52a..da0371bfbf6e 100644
--- a/profiles/default/linux/musl/arm/package.use.force
+++ b/profiles/default/linux/musl/arm/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
diff --git a/profiles/default/linux/musl/arm64/package.use.force b/profiles/default/linux/musl/arm64/package.use.force
index d90dd06eaf22..476eb96b7ec4 100644
--- a/profiles/default/linux/musl/arm64/package.use.force
+++ b/profiles/default/linux/musl/arm64/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_AArch64
 sys-devel/clang llvm_targets_AArch64
 sys-devel/llvm llvm_targets_AArch64
diff --git a/profiles/default/linux/musl/mips/package.use.force b/profiles/default/linux/musl/mips/package.use.force
index c184bfa93060..0668465065ef 100644
--- a/profiles/default/linux/musl/mips/package.use.force
+++ b/profiles/default/linux/musl/mips/package.use.force
@@ -1,5 +1,6 @@
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
 
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 709efdd81d3d..13f432aa76d3 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -4,9 +4,6 @@
 sys-libs/uclibc-ng
 sys-libs/glibc
 
-# Older versions of net-mail/mailutils fail on musl, bug #604212
-<net-mail/mailutils-3.2
-
 # We use eudev which is tested on both uclibc and musl
 sys-apps/systemd
 sys-fs/udev
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index d7dd0ba8ca40..ed9d78166df7 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See bug #604542
@@ -7,9 +7,6 @@ net-misc/iputils idn
 # See bug #504200
 sys-devel/gcc sanitize
 
-# llvm's sanitizers are also incompatible with musl
-sys-devel/llvm sanitize
-
 # These cause collisions with <libintl.h>
 # even with --without-included-gettext
 sys-devel/gettext nls
diff --git a/profiles/default/linux/musl/ppc/package.use.force b/profiles/default/linux/musl/ppc/package.use.force
index e18275fe8cd6..fc297563763a 100644
--- a/profiles/default/linux/musl/ppc/package.use.force
+++ b/profiles/default/linux/musl/ppc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
diff --git a/profiles/default/linux/musl/x86/package.use.force b/profiles/default/linux/musl/x86/package.use.force
index ca264fedc8ce..553802649559 100644
--- a/profiles/default/linux/musl/x86/package.use.force
+++ b/profiles/default/linux/musl/x86/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index e575798087fc..dd84e65b1a8a 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -84,7 +84,6 @@ games-roguelike/adom
 games-rpg/eschalon-book-1-demo
 games-server/etqw-ded
 games-server/nwn-ded
-games-server/ut2003-ded
 games-simulation/bcs-demo
 games-strategy/darwinia
 games-strategy/darwinia-demo
@@ -106,7 +105,3 @@ sci-electronics/eagle
 sci-chemistry/cara-bin
 sci-chemistry/mars
 sys-libs/lib-compat-loki
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub-1 is not available on no-multilib-profiles;
-<sys-boot/grub-1.99
diff --git a/profiles/default/linux/uclibc/amd64/package.use.force b/profiles/default/linux/uclibc/amd64/package.use.force
index ca264fedc8ce..553802649559 100644
--- a/profiles/default/linux/uclibc/amd64/package.use.force
+++ b/profiles/default/linux/uclibc/amd64/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
diff --git a/profiles/default/linux/uclibc/arm/package.use.force b/profiles/default/linux/uclibc/arm/package.use.force
index b92b1029f52a..da0371bfbf6e 100644
--- a/profiles/default/linux/uclibc/arm/package.use.force
+++ b/profiles/default/linux/uclibc/arm/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
diff --git a/profiles/default/linux/uclibc/mips/package.use.force b/profiles/default/linux/uclibc/mips/package.use.force
index 42de426a5838..9dea18f73958 100644
--- a/profiles/default/linux/uclibc/mips/package.use.force
+++ b/profiles/default/linux/uclibc/mips/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_Mips
 sys-devel/clang llvm_targets_Mips
 sys-devel/llvm llvm_targets_Mips
diff --git a/profiles/default/linux/uclibc/ppc/package.use.force b/profiles/default/linux/uclibc/ppc/package.use.force
index e18275fe8cd6..fc297563763a 100644
--- a/profiles/default/linux/uclibc/ppc/package.use.force
+++ b/profiles/default/linux/uclibc/ppc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
diff --git a/profiles/default/linux/uclibc/x86/package.use.force b/profiles/default/linux/uclibc/x86/package.use.force
index ca264fedc8ce..553802649559 100644
--- a/profiles/default/linux/uclibc/x86/package.use.force
+++ b/profiles/default/linux/uclibc/x86/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86