gentoo resync : 14.12.2020

14 files changed, 71 insertions, 16 deletions

diff --git a/profiles/prefix/darwin/macos/10.15/package.accept_keywords b/profiles/prefix/darwin/macos/10.15/package.accept_keywords
deleted file mode 100644
index 268e7873bb54..000000000000
--- a/profiles/prefix/darwin/macos/10.15/package.accept_keywords
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# this is the only version known to compile on macOS Catalina
-=app-shells/bash-5.1_rc3 **
-=sys-libs/readline-8.1_rc3 **
diff --git a/profiles/prefix/darwin/macos/10.15/package.unmask b/profiles/prefix/darwin/macos/10.15/package.unmask
new file mode 100644
index 000000000000..08df86b1e664
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/package.unmask
@@ -0,0 +1,10 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2020-12-10)
+# Unmask only working versions for Catalina
+# (and Big Sur)
+# They're currently masked in main tree
+# for testing.
+~sys-libs/readline-8.1
+~app-shells/bash-5.1
diff --git a/profiles/prefix/darwin/macos/11.0/package.accept_keywords b/profiles/prefix/darwin/macos/11.0/package.accept_keywords
deleted file mode 100644
index 625d924768ff..000000000000
--- a/profiles/prefix/darwin/macos/11.0/package.accept_keywords
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# this is the only version known to compile on macOS Big Sur
-=app-shells/bash-5.1_rc3 **
-=sys-libs/readline-8.1_rc3 **
diff --git a/profiles/prefix/darwin/macos/11.0/package.unmask b/profiles/prefix/darwin/macos/11.0/package.unmask
new file mode 100644
index 000000000000..c962eae041f1
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/package.unmask
@@ -0,0 +1,10 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2020-12-07)
+# Unmask only working versions for Big Sur
+# (and Catalina)
+# They're currently masked in main tree
+# for testing.
+~sys-libs/readline-8.1
+~app-shells/bash-5.1
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
index a6f14621678f..aee08c4624e1 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (2020-11-29)
+# GCC's Objective-C compiler fails to build the Aqua/Cocoa interface.
+# Bug #757300
+app-editors/emacs aqua
+
 # Cocoa integration requires frameworks, and this is a bridge too far
 # for current FSF GCC
 x11-libs/cairo aqua
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 502af5fe4ab9..831cbe6cf8a8 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -6,10 +6,6 @@
 =net-misc/openssh-8.3_p1-r5
 =net-misc/openssh-8.4_p1-r2
 
-# Fabian Groffen <grobian@gentoo.org> (2020-11-23)
-# doesn't link, some unresolved symbol from gnulib
-=sys-devel/gettext-0.21
-
 # Fabian Groffen <grobian@gentoo.org> (2020-06-09)
 # fails to compile, needs fixing
 =sys-apps/gentoo-functions-0.13
diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
index f379b249c796..4b4798eb7ee5 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-12-10)
+# Fails to compile without nls during link with undefined symbol for
+# _gl_get_setlocale_null_lock, related, but causing other issues:
+# https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24276d89d7c30abb460e786497fe7d50605bcdf7
+~sys-devel/gettext-0.21 nls
+
 # Fabian Groffen <grobian@gentoo.org> (2020-06-08)
 # Do NOT enable tinfo, it breaks ANYTHING existing, and it also breaks
 # ncurses itself, for it apparently doesn't link against tinfo itself,
diff --git a/profiles/prefix/darwin/package.use b/profiles/prefix/darwin/package.use
new file mode 100644
index 000000000000..e3c75ca4bc07
--- /dev/null
+++ b/profiles/prefix/darwin/package.use
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2020-11-30)
+# Undo +vala which drags in introspection
+# We don't (yet?)  have introspection support here
+# (Avoid users having to turn it off)
+dev-libs/gmime -vala
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 8cf6f41b0078..4b41e3402a55 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-12-01)
+# Needs more work to make bindings build
+dev-db/qdbm java perl ruby
+
 # Fabian Groffen <grobian@gentoo.org> (2016-04-06)
 # dev-libs/re2 needs love, bug #563932
 app-misc/sphinx re2
diff --git a/profiles/prefix/linux/ppc64le/eapi b/profiles/prefix/linux/ppc64le/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/linux/ppc64le/make.defaults b/profiles/prefix/linux/ppc64le/make.defaults
new file mode 100644
index 000000000000..477b3c262767
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="ppc64"
+CHOST="powerpc64le-pc-linux-gnu"
+# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
+# Eventually, ~* should be removed once someone is motivated for this arch
+ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
+
+# We don't have lib64 in prefix so, remove it here.
+SYMLINK_LIB=""
+LIBDIR_ppc64="lib"
diff --git a/profiles/prefix/linux/ppc64le/packages b/profiles/prefix/linux/ppc64le/packages
new file mode 100644
index 000000000000..13fe69af5f81
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/packages
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Those are part of the base powerpc profile's @system set, but having them as
+# part of @system makes no sense for Gentoo Prefix.
+-*sys-fs/hfsutils
+-*sys-fs/hfsplusutils
diff --git a/profiles/prefix/linux/ppc64le/parent b/profiles/prefix/linux/ppc64le/parent
new file mode 100644
index 000000000000..ba569be12a9a
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/parent
@@ -0,0 +1,2 @@
+../../../default/linux/powerpc/ppc64/17.0/64bit-userland
+..
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index 87169c7c52c4..e256f5fbba1a 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-12-10)
+# Disable systemtap for now to be consistent
+# with ::prefix pre-merge.
+# Not yet tested so we may be able to drop this later.
+dev-lang/ruby systemtap
+
 # Fabian Groffen <grobian@gentoo.org> (2020-06-07)
 # installing kernels has no business in Prefix
 sys-apps/debianutils installkernel