gentoo auto-resync : 03:06:2024 - 00:07:25

15 files changed, 26 insertions, 32 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 26900ba6d85a..4e312645f34e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index f4cd5a5e7e69..90ec7af71c71 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
+# Requires FFmpeg 7.0, which we don't have yet, so force Chromium fork.
+>=www-client/vivaldi-6.8.3371.4 ffmpeg-chromium
+>=www-client/vivaldi-snapshot-6.8.3371.4 ffmpeg-chromium
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-04-10)
 # Flipping the zstd USE state is unsafe and can break *tons* of Qt revdeps
 # including many KDE packages and Qt itself without rebuilds due to losing
diff --git a/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.mask
index c021f45d8508..c021f45d8508 100644
--- a/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.stable.mask
+++ b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.mask
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
index b794980bdad7..3ced25c30235 100644
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
@@ -1,8 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
 # file-5.39-portage_sandbox.patch is broken
 sys-apps/file seccomp
+
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
 # Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
 # The patch added for 5.39-r1 breaks on musl i686
 # file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5e6dbb5b962b..32b0a833df80 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5001,12 +5001,8 @@ media-tv/mythtv:vpx - Enable VP8/VP9 support for media-libs/libvpx
 media-tv/mythtv:wrapper - Use Ubuntu mythtfrontend wrapper
 media-tv/mythtv:x265 - Enable h265 encoding using x265
 media-tv/mythtv:xmltv - Support media-tv/xmltv TV listing - not used by Schedules Direct]
-media-tv/tvheadend:capmt - Enable support for capmt (dvbapi) protocol
-media-tv/tvheadend:constcw - Enable support for the constcw protocol
-media-tv/tvheadend:cwc - Enable support for the cwc (newcamd) protocol
 media-tv/tvheadend:ddci - Enable support for DDCI hardware
 media-tv/tvheadend:dvbcsa - Enable decryption of the DVB Common Scrambling Algorithm
-media-tv/tvheadend:dvben50221 - Enable support for hardware CAM
 media-tv/tvheadend:hdhomerun - Enable support for the HDHomeRun device
 media-tv/tvheadend:imagecache - Enable support for image caching
 media-tv/tvheadend:iptv - Enable support for Internet Protocol TV