gentoo resync : 23.06.2018

5 files changed, 16 insertions, 20 deletions

diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
index 13d119cb0a6d..9e50ba7ffb7a 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
@@ -1,2 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (18 Jun 2018)
+# FSF GCC is our system compiler here
+-sys-devel/gcc
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/packages b/profiles/prefix/darwin/macos/10.5/ppc/packages
index f8f1b81f58f4..6d26e5615614 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/packages
+++ b/profiles/prefix/darwin/macos/10.5/ppc/packages
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Mac OS X Leopard/PPC uses gcc-apple (not Clang)
--*sys-devel/gcc
+# Mac OS X Leopard/PPC uses FSF gcc and gcc-apple (not Clang)
+*sys-devel/gcc
 *sys-devel/gcc-config
 -*sys-devel/clang
 *sys-devel/gcc-apple
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 9cd0b2c7bb8f..3c8c9964ce42 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Some USE-flags that only die-hards don't want:
@@ -8,13 +8,5 @@
 # ssl:       encrypted connections are a nice feature
 USE="readline zlib ncurses ssl"
 
-FEATURES="collision-protect"
-
-# Python 3.5 is unmasked for us, build stuff by default, in particular
-# for bug #572502 where the default python is set to 3.5 for it was
-# built first.  Drop Python 3.4 to avoid unnecessary builds.
-PYTHON_TARGETS="python2_7 python3_5"
-PYTHON_SINGLE_TARGET="python3_5"
-
-# Move away from ruby21, fast forward to ruby24, we don't have ruby23
-RUBY_TARGETS="ruby22 ruby24"
+# Move away from ruby22 fast forward to ruby24, we don't have ruby23
+RUBY_TARGETS="ruby24"
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index b97a4bb71789..aa30efa71a27 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (27 Jun 2016)
-# sys-libs/libseccomp is a linux interface, not sure if it will work
-# in prefix for Linux either, bug #585756
-app-misc/pax-utils seccomp
-
 # Mikle Kolyada <zlogene@gentoo.org> (29 Nov 2014)
 # Masked because of lack of manpower/time (bug #497068)
 dev-vcs/git mediawiki mediawiki-experimental
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
index 134085a9be51..80601532ae21 100644
--- a/profiles/prefix/use.mask
+++ b/profiles/prefix/use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michael Haubenwallner <haubi@gentoo.org> (21 Jun 2018)
+# sys-libs/libseccomp is a linux interface, not sure if it will work
+# in prefix for Linux either, bug #585756
+seccomp
+
 # Mask all glibc/linux combination, unmasked in the appropriate profiles
 elibc_glibc
 kernel_linux