gentoo resync : 29.12.2022

11 files changed, 27 insertions, 32 deletions

diff --git a/profiles/prefix/darwin/macos/11.0/arm64/gcc/package.accept_keywords b/profiles/prefix/darwin/macos/11.0/arm64/gcc/package.accept_keywords
deleted file mode 100644
index bd43de88a9a0..000000000000
--- a/profiles/prefix/darwin/macos/11.0/arm64/gcc/package.accept_keywords
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Apple SI support only exists in Ians' WIP
-=sys-devel/gcc-11* **
diff --git a/profiles/prefix/darwin/macos/12.0/arm64/gcc/package.accept_keywords b/profiles/prefix/darwin/macos/12.0/arm64/gcc/package.accept_keywords
deleted file mode 100644
index bd43de88a9a0..000000000000
--- a/profiles/prefix/darwin/macos/12.0/arm64/gcc/package.accept_keywords
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Apple SI support only exists in Ians' WIP
-=sys-devel/gcc-11* **
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.force b/profiles/prefix/darwin/macos/arch/x64/package.use.force
index e59fb1aa91b0..5de42499068a 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -1,10 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2018-11-29)
-# libgcrypt relies on GCC pragma to disable optimisation, but we use Clang
-dev-libs/libgcrypt o-flag-munging
-
 # Fabian Groffen <grobian@gentoo.org> (2016-12-20)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_X86
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 0b90c5562381..525d9a18e980 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2022-01-08)
-# malloc crash during install on >=11.0, bug #830425
-=dev-util/cmake-3.22.1
+# Fabian Groffen <grobian@gentoo.org> (2022-06-14)
+# timer_create build-failure, corrected upstream in 5067
+# https://github.com/vim/vim/commit/f78b52ba24d8d294869cd013dcc4cd5d4a65cea7
+=app-editors/vim-8.2.5066
+=app-editors/vim-core-8.2.5066
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index eb3e4c4d1487..70aa17d0cb7c 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,14 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # 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
-
 # Fabian Groffen <grobian@gentoo.org> (2016-01-10)
 # libutempter isn't ported for Darwin, bug #506494
 net-misc/mosh utempter
diff --git a/profiles/prefix/linux/riscv/eapi b/profiles/prefix/linux/riscv/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/linux/riscv/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/linux/riscv/make.defaults b/profiles/prefix/linux/riscv/make.defaults
new file mode 100644
index 000000000000..55cdae5090dc
--- /dev/null
+++ b/profiles/prefix/linux/riscv/make.defaults
@@ -0,0 +1,14 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="riscv"
+
+CHOST="riscv64-pc-linux-gnu"
+
+ACCEPT_KEYWORDS="~riscv"
+
+SYMLINK_LIB=""
+
+LIBDIR_lp64d="lib"
+
+LIBDIR_lp64="lib"
\ No newline at end of file
diff --git a/profiles/prefix/linux/riscv/packages b/profiles/prefix/linux/riscv/packages
new file mode 100644
index 000000000000..7084783a52c6
--- /dev/null
+++ b/profiles/prefix/linux/riscv/packages
@@ -0,0 +1,2 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/linux/riscv/parent b/profiles/prefix/linux/riscv/parent
new file mode 100644
index 000000000000..d3b49d5628bb
--- /dev/null
+++ b/profiles/prefix/linux/riscv/parent
@@ -0,0 +1,2 @@
+../../../default/linux/riscv/20.0/rv64gc/lp64d
+..
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 1aac924c7446..321dccb561cb 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # When you add an entry to the top of this file, add your name, the date, and
@@ -9,10 +9,6 @@
 #
 
 # Fabian Groffen <grobian@gentoo.org> (2020-08-02)
-# Python 3.6 is soon going away and won't be updated for Prefix anymore.
-dev-lang/python:3.6
-
-# Fabian Groffen <grobian@gentoo.org> (2020-08-02)
 # Python 2 is no longer supported
 # Recent Portage releases no longer supports Python 2, and the version
 # available in the Prefix tree has security issues.  If you still need
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
index c05175fdd3c2..527f8709bb19 100644
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ b/profiles/prefix/sunos/solaris/package.use.mask
@@ -6,10 +6,6 @@
 # chg client fails to compile, bug #683374
 dev-vcs/mercurial chg
 
-# Fabian Groffen <grobian@gentoo.org> (2016-04-06)
-# dev-libs/re2 needs love, bug #563932
-app-misc/sphinx re2
-
 # Fabian Groffen <grobian@gentoo.org> (2015-05-26)
 # Avoid pulling in broken and unnecessary ossp-uuid, bug #324527
 dev-db/postgresql uuid