gentoo resync : 25.09.2021

5 files changed, 5 insertions, 11 deletions

diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
index b4557bfe8498..3055521d22e8 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -1,7 +1,6 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force the flag corresponding to the default ABI
 x64-macos
 arm64-macos
-abi_arm64
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
index 2b0df2c9ccf9..1460af56464c 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -1,7 +1,6 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag corresponding to the default ABI
 -x64-macos
 -arm64-macos
--abi_arm64
diff --git a/profiles/prefix/linux/package.use.mask b/profiles/prefix/linux/package.use.mask
index 2893cbd9af7a..1c74e8a689af 100644
--- a/profiles/prefix/linux/package.use.mask
+++ b/profiles/prefix/linux/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-05-02)
 # gold is linux only, and is required by cxx
-sys-devel/binutils -cxx -gold -default-gold
+sys-devel/binutils -gold -default-gold
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 01d4dcdb0ee4..1aac924c7446 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -19,10 +19,6 @@ dev-lang/python:3.6
 # Python 2, you should really look into moving away from it.
 dev-lang/python:2.7
 
-# Fabian Groffen <grobian@gentoo.org> (2017-04-15)
-# reentrant patch breaks prefix option, bug #615560
-=sys-devel/flex-2.6.3-r1
-
 # Elias Pipping <pipping@gentoo.org> (2007-10-09)
 # darwin-miscutils are only available on darwin
 sys-apps/darwin-miscutils
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index 609e639cf0de..e30a2b1415de 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -17,7 +17,7 @@ sys-apps/debianutils installkernel
 
 # Michael Haubenwallner <haubi@gentoo.org> (2019-05-02)
 # gold is linux only, and is required by cxx
-sys-devel/binutils cxx gold default-gold
+sys-devel/binutils gold default-gold
 
 # Fabian Groffen <grobian@gentoo.org> (2018-12-27)
 # USE-dep fixing, bugs #665088, #667266, #671730,