gentoo auto-resync : 07:12:2022 - 21:14:14

11 files changed, 34 insertions, 10 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a71a0e854d15..5fa4dff236ee 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index b7d40c41c51a..7bc44f63108e 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -496,7 +496,7 @@ x11-wm/fvwm lock
 dev-lisp/clisp hyperspec svm
 
 # missing keywords
-media-plugins/gst-plugins-meta dts dv lame libvisual modplug taglib vcd wavpack
+media-plugins/gst-plugins-meta dts dv lame libvisual modplug jack taglib vcd wavpack
 
 # Marius Brehler <marfbre@linux.sungazer.de> (2015-08-13)
 # missing keyword
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index decc363f2408..a414cf650bea 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sam James <sam@gentoo.org> (2022-12-07)
+# Needs unstable media-libs/oneVPL
+media-libs/gst-plugins-bad qsv
+
 # Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
 # app-text/pandoc is not stable
 net-libs/gssdp man
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi b/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent b/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi b/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent b/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi b/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent b/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/package.mask b/profiles/package.mask
index e3ae0a1bf641..b54278d2c788 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-12-07)
+# HOMEPAGE & remote-id are for a different project, SRC_URI is gone,
+# only results on Google are for Gentoo mirrors, EAPI 6. Removal on 2023-01-07.
+# bug #630264, bug #655964, bug #750071.
+dev-vcs/git-pimp
+
+# Sam James <sam@gentoo.org> (2022-12-07)
+# These versions have been masked for testing since 2014(!). These versions
+# had a controversial licence change and therefore had limited adoption.
+# See also the old 2021-05-30-deprecate-old-bdb-slots news item for
+# additional context.
+# Removal on 2023-01-07.
+=sys-libs/db-6.1*
+=sys-libs/db-6.2*
+=sys-libs/db-18.1*
+
 # Naohiro Aota <naota@gentoo.org> (2022-12-07)
 # Masked for removal in 30 days. Depends on gnome-base/gconf. Last release
 # in 2011. See bug #873880.
@@ -143,6 +159,7 @@ dev-util/cucumber-core:3.2
 dev-util/cucumber-expressions
 dev-util/cucumber-tag_expressions
 dev-util/cucumber-wire:0
+dev-util/protobuf-cucumber
 
 # Hans de Graaff <graaff@gentoo.org> (2022-12-01)
 # Old slot without dependencies on it. Blocks removal of
@@ -824,15 +841,6 @@ app-office/texmacs
 # use. See bugs 603346 and 604998 for more information.
 app-admin/amazon-ec2-init
 
-# Robin H. Johnson <robbat2@gentoo.org> (2014-08-04)
-# Masked for testing, presently fails upstream testsuite:
-# FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
-# FAIL:07:02:35 (00:00:00) Dump/load of ./TESTDIR.3/recd001.db failed.
-# FAIL:07:02:35 (00:00:00) db_verify_preop: expected 0, got 1
-=sys-libs/db-6.1*
-=sys-libs/db-6.2*
-=sys-libs/db-18.1*
-
 # Mike Gilbert <floppym@gentoo.org> (2014-03-04)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index d5b936f5bae6..04783d940cda 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -43,9 +43,11 @@ amd64		default/linux/amd64/17.1/no-multilib/hardened/selinux		stable
 amd64		default/linux/amd64/17.1/no-multilib/systemd			dev
 amd64		default/linux/amd64/17.1/no-multilib/systemd/merged-usr		dev
 amd64		default/linux/amd64/17.1/no-multilib/systemd/selinux		exp
+amd64		default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr		exp
 amd64		default/linux/amd64/17.1/systemd				stable
 amd64		default/linux/amd64/17.1/systemd/merged-usr			stable
 amd64		default/linux/amd64/17.1/systemd/selinux			exp
+amd64		default/linux/amd64/17.1/systemd/selinux/merged-usr			exp
 amd64		default/linux/amd64/17.1/clang					exp
 amd64		default/linux/amd64/17.1/systemd/clang				exp
 amd64		default/linux/amd64/17.1/systemd/clang/merged-usr		exp
@@ -129,6 +131,7 @@ arm64		default/linux/arm64/17.0/developer				exp
 arm64		default/linux/arm64/17.0/systemd				stable
 arm64		default/linux/arm64/17.0/systemd/merged-usr			stable
 arm64		default/linux/arm64/17.0/systemd/selinux			exp
+arm64		default/linux/arm64/17.0/systemd/selinux/merged-usr			exp
 arm64		default/linux/arm64/17.0/llvm					exp
 arm64		default/linux/arm64/17.0/systemd/llvm				exp
 arm64		default/linux/arm64/17.0/systemd/llvm/merged-usr		exp