gentoo resync : 25.03.2022

29 files changed, 537 insertions, 503 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 427dccfc2f33..facb10775747 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 2cfc3d527c7c..0d4faf84882b 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,6 +1,4 @@
-AUX cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch 4008 BLAKE2B 6a8fe1f1514b5e033319a21c2cf3e6d57affc78cf0e46a2d5d34e062a6991fd3a12893f8d0ad9f1c55d56e3e7103cc81f00f97d8e633a4649b3ba0e3d03fb2a8 SHA512 57fc9fada8da49de8e8e23f5211a9a90621b9452104322fe8cc7fbf26f7efcd65a78e324a6b5fc560920d09c865b65268df2ec71e74395cd4a10365b8be5f239
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
-AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4b0afc9929fcaaaaa6d29ecaa59cbee97a373589638c2aa0da122db0bd11142ef2790e08b8e3a97e757837f4ce420c0f588609a7 SHA512 de93e2664331a792205c29cf893317719b182bece4185452e705cc349d48dbe46d7320a337e16d923dee4da693c07ba0542b4bc4367162212c7df549313849c2
 DIST cheese-41.1.tar.xz 1092912 BLAKE2B 9bbfbc59868f39b344b1102f819ca647d82e9dee327f1d2a2e6b30fcfd2c59dd5f79236355d7148e01a4b07d80d630406708d2a152535b5732cfb52690f9f402 SHA512 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074
 EBUILD cheese-41.1.ebuild 2271 BLAKE2B a9499ac60bf74e78706c3fffa8c5567fec478defdcdaa9c1b88f02c47e916f5fb50d33c42a8b9c392f5912195d4c08bb14302cdba41481364948ef6ca9df87ee SHA512 078dc45cbc80319054c8b65c567ca861e9edbd6d1553562c7302d0e95a1c189e360a71e83f5e2d1595aa1f51bdebba0b6e19f085e6e5a894b200867b60689108
 MISC metadata.xml 429 BLAKE2B 7874cf680a041c34e7c5f29b164552d311d333853050e5486aa0f8bdae3fce50316cd00038ba8cbbd102912cdb0c8c7fd5d6370af0004c8977e053eb89be9687 SHA512 ea2a94d4981bc40d13235bfa9a544855cdeb638e46293c84bfaf14f13dc255651c0eb01752b5987b42e285765ed2dbd65dbd58eb23c730e4cbd7fc31e0003fc8
diff --git a/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch b/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
deleted file mode 100644
index 5a27eb6e7844..000000000000
--- a/media-video/cheese/files/cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From e7046d564a6f76c1af8f5640ac9c569e07284ec0 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 18 Sep 2020 12:06:45 +0200
-Subject: [PATCH] Fix infinite loop if thumbnailer is not available
-
-The code in cheese_thumb_view_idle_append_item() in
-src/thumbview/cheese-thumb-view.c didn't pop the list of items to
-thumbnail if thumbnailing failed.
-
- #0  0x00007f4a60e55314 in open64 () at /lib64/libc.so.6
- #1  0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6
- #2  0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6
- #3  0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6
- #4  0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0
- #5  0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19
- #6  0x000055cef476046f in cheese_thumb_view_idle_append_item ()
- #7  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
- #8  0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
- #9  0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
- #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
- #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0
- #12 0x000055cef4758547 in _vala_main ()
- #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
- #14 0x000055cef47554be in _start ()
-
- #0  0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6
- #1  0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0
- #2  0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0
- #3  0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0
- #4  0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0
- #5  0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0
- #6  0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0
- #7  0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0
- #8  0x000055cef47605c9 in cheese_thumb_view_idle_append_item ()
- #9  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
- #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
- #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
- #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
- #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0
- #14 0x000055cef4758547 in _vala_main ()
- #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
- #16 0x000055cef47554be in _start ()
-
-Closes: #81
----
- src/thumbview/cheese-thumb-view.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
-index 1d2d88f5..232fd4b6 100644
---- a/src/thumbview/cheese-thumb-view.c
-+++ b/src/thumbview/cheese-thumb-view.c
-@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void);
- static gboolean
- cheese_thumb_view_idle_append_item (gpointer data)
- {
--  CheeseThumbViewIdleData *item = g_queue_peek_head (data);
-+  CheeseThumbViewIdleData *item = g_queue_pop_head (data);
-   CheeseThumbView         *thumb_view;
-   CheeseThumbViewPrivate  *priv;
- 
-@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
-   if (!info)
-   {
-     g_warning ("Invalid filename\n");
-+    g_slice_free (CheeseThumbViewIdleData, item);
-     return TRUE;
-   }
-   g_file_info_get_modification_time (info, &mtime);
-@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
-     if (error)
-     {
-       g_warning ("%s", error->message);
-+      g_slice_free (CheeseThumbViewIdleData, item);
-       return TRUE;
-     }
-   }
-@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data)
-   g_object_unref (pixbuf);
-   g_object_unref (file);
-   g_slice_free (CheeseThumbViewIdleData, item);
--  g_queue_pop_head (data);
- 
-   return TRUE;
- }
--- 
-2.28.0
-
diff --git a/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch b/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
deleted file mode 100644
index dcbd1c1b2c5c..000000000000
--- a/media-video/cheese/files/cheese-3.38.0-vala-genericarray.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 7cf6268e54620bbbe5e6e61800c50fb0cb4bea57 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
-Date: Fri, 16 Oct 2020 19:56:26 +0200
-Subject: [PATCH] Change GLib.PtrArray into GLib.GenericArray
-
-This is the vala-friendly way of handling GPtrArray.
-Fix several memory leaks on the go and unnecessary reference increase.
----
- src/cheese-preferences.vala | 26 ++++++++++++--------------
- src/cheese-window.vala      | 22 +++++++++++-----------
- src/vapi/cheese-common.vapi |  2 +-
- 3 files changed, 24 insertions(+), 26 deletions(-)
-
-diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
-index f56af7e0..80a92431 100644
---- a/src/cheese-preferences.vala
-+++ b/src/cheese-preferences.vala
-@@ -100,7 +100,7 @@ public PreferencesDialog (Cheese.Camera camera)
-    */
-   private void initialize_camera_devices ()
-   {
--    unowned GLib.PtrArray devices = camera.get_camera_devices ();
-+    GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
-     camera_model = new Gtk.ListStore (2, typeof (string), typeof (Cheese.CameraDevice));
- 
-     source_combo.model = camera_model;
-@@ -357,13 +357,13 @@ public PreferencesDialog (Cheese.Camera camera)
-    */
-   private void on_camera_update_num_camera_devices ()
-   {
--    unowned GLib.PtrArray devices = camera.get_camera_devices ();
--    Cheese.CameraDevice   dev;
-+    GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
-+    unowned Cheese.CameraDevice   dev;
- 
-     // Add (if) / Remove (else) a camera device.
--    if (devices.len > camera_model.iter_n_children (null))
-+    if (devices.length > camera_model.iter_n_children (null))
-     {
--      dev = (Cheese.CameraDevice) devices.index (devices.len - 1);
-+      dev = devices.get (devices.length - 1);
-       add_camera_device(dev);
-     }
-     else
-@@ -382,12 +382,11 @@ public PreferencesDialog (Cheese.Camera camera)
-       bool device_removed = false;
-       devices.foreach ((device) =>
-       {
--        var old_device = (Cheese.CameraDevice) device;
-         Cheese.CameraDevice new_device;
-         camera_model.get (iter, 1, out new_device, -1);
- 
-         // Found the device that was removed.
--        if (old_device != new_device)
-+        if (device != new_device)
-         {
-             remove_camera_device (iter, new_device, active_device);
-             device_removed = true;
-@@ -418,17 +417,16 @@ public PreferencesDialog (Cheese.Camera camera)
-    *
-    * @param device a Cheese.CameraDevice to add to the device combo box model
-    */
--  private void add_camera_device (void *device)
-+  private void add_camera_device (Cheese.CameraDevice device)
-   {
-     TreeIter iter;
--    Cheese.CameraDevice dev = (Cheese.CameraDevice) device;
- 
-     camera_model.append (out iter);
-     camera_model.set (iter,
--                      0, dev.get_name (),
--                      1, dev);
-+                      0, device.get_name (),
-+                      1, device);
- 
--    if (camera.get_selected_device () == dev)
-+    if (camera.get_selected_device () == device)
-         source_combo.set_active_iter (iter);
- 
-     if (camera_model.iter_n_children (null) > 1)
-@@ -445,12 +443,12 @@ public PreferencesDialog (Cheese.Camera camera)
-   private void remove_camera_device (TreeIter iter, Cheese.CameraDevice device_node,
-                              Cheese.CameraDevice active_device_node)
-   {
--      unowned GLib.PtrArray devices = camera.get_camera_devices ();
-+      GLib.GenericArray<unowned Cheese.CameraDevice> devices = camera.get_camera_devices ();
- 
-       // Check if the camera that we want to remove, is the active one
-       if (device_node == active_device_node)
-       {
--        if (devices.len > 0)
-+        if (devices.length > 0)
-           set_new_available_camera_device (iter);
-         else
-           this.hide ();
-diff --git a/src/cheese-window.vala b/src/cheese-window.vala
-index ff069808..cc119b68 100644
---- a/src/cheese-window.vala
-+++ b/src/cheese-window.vala
-@@ -1216,9 +1216,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-    */
-   public void on_switch_camera_clicked ()
-   {
--      Cheese.CameraDevice selected;
--      Cheese.CameraDevice next = null;
--      GLib.PtrArray cameras;
-+      unowned Cheese.CameraDevice selected;
-+      unowned Cheese.CameraDevice next = null;
-+      GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
-       uint i;
- 
-       if (camera == null)
-@@ -1235,9 +1235,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
- 
-       cameras = camera.get_camera_devices ();
- 
--      for (i = 0; i < cameras.len; i++)
-+      for (i = 0; i < cameras.length; i++)
-       {
--          next = (Cheese.CameraDevice )cameras.index (i);
-+          next = cameras.get (i);
- 
-           if (next == selected)
-           {
-@@ -1245,13 +1245,13 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-           }
-       }
- 
--      if (i + 1 < cameras.len)
-+      if (i + 1 < cameras.length)
-       {
--          next = (Cheese.CameraDevice )cameras.index (i + 1);
-+          next = cameras.get (i + 1);
-       }
-       else
-       {
--          next = (Cheese.CameraDevice )cameras.index (0);
-+          next = cameras.get (0);
-       }
- 
-       if (next == selected)
-@@ -1269,8 +1269,8 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-    */
-   public void set_switch_camera_button_state ()
-   {
--      Cheese.CameraDevice selected;
--      GLib.PtrArray cameras;
-+      unowned Cheese.CameraDevice selected;
-+      GLib.GenericArray<unowned Cheese.CameraDevice> cameras;
- 
-       if (camera == null)
-       {
-@@ -1288,7 +1288,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
- 
-       cameras = camera.get_camera_devices ();
- 
--      if (cameras.len > 1)
-+      if (cameras.length > 1)
-       {
-          switch_camera_button.set_visible (true);
-          return;
-diff --git a/src/vapi/cheese-common.vapi b/src/vapi/cheese-common.vapi
-index 6517cdfc..e4ae7ad3 100644
---- a/src/vapi/cheese-common.vapi
-+++ b/src/vapi/cheese-common.vapi
-@@ -35,7 +35,7 @@ namespace Cheese
-     [CCode (has_construct_function = false)]
-     public Camera (Clutter.Actor video_texture, string camera_device_node, int x_resolution, int y_resolution);
-     public bool                        get_balance_property_range (string property, double min, double max, double def);
--    public unowned GLib.PtrArray       get_camera_devices ();
-+    public GLib.GenericArray<unowned Cheese.CameraDevice> get_camera_devices ();
-     public unowned Cheese.VideoFormat  get_current_video_format ();
-     public int                         get_num_camera_devices ();
-     public unowned Cheese.CameraDevice get_selected_device ();
--- 
-GitLab
-
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 52416071cce5..4f9cc03fb584 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,6 +1,5 @@
 AUX dvdrip-0.98.11-fix_parallel_make.patch 880 BLAKE2B 3011cc4503bedfd056f6c587d65cf6bdd42d481f09f5c3644d8337ea11053fb6b91a0d88112385969c3592c8407294b8d1c661701e2b4f27ef4339e096125c80 SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9
 AUX dvdrip-0.98.11-r5-fix_parallel_make.patch 888 BLAKE2B ca4882e1f0166a3fecfb8703f5f445d55a62dd84127cc0be0b6a51c85e8fa9d8b4a3bc1d9cd640f351a0aa1393fd6e2f537fa855162b2155333c282cb2f9b6f1 SHA512 db928fb2db6f5d7bffe909667650b444ed7c43291bb0970a298055072687847cf9e2e8c24395cde4f7d911bec668c6b846b44ab7af8dae180693b7b4233c84a2
 DIST dvdrip-0.98.11.tar.gz 2075302 BLAKE2B 875ea2d9ee679657b7bebce10ecf037a2467f7e61a8ae8f9417bbb93115368d439e1347b8e0f9c9aae88e8e6d0886ac7dc9b5650420618231550994cca0b65ff SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce
-EBUILD dvdrip-0.98.11-r4.ebuild 1994 BLAKE2B fa6944e5480ffdade034941f2a5cc5c4192e296e73b7affd2857dff384b75d042fd7e97f6ce241e31d23bf679941d2c4a805a575bf55fa28d9f2dbec4c3ee104 SHA512 13e1948af8f392c12e5ca7abf8aa0a8e79ff45ceb52921e78cec58d2f92cffeaf454bf31605241275a703501962ae53c39341ada173af572afdd5dbd27329609
-EBUILD dvdrip-0.98.11-r5.ebuild 2061 BLAKE2B 1da14a7ad6a2572c42f84a885c21339daa06dc658824c52c916039007fa2dd6f437658d4fc22921f9972bd3142bcabc9b5afd6660ba8b7abf4f51f83b179652a SHA512 7b1dd11e462c016b10ff494d0e181c42c84d3c2ada608fed97d4cb17bb83b65350150f8c72478cd52f1be37f737fd1b910c0413721ae7e8c1fb116076c3889ac
+EBUILD dvdrip-0.98.11-r5.ebuild 2058 BLAKE2B b20a673a00184258b496c0003f6d2be0d82909dca0e113a42c9beff34492e248d8da52e4aad885ef831e882d5203a541aa5e2bfb0bbfae0c0da51e8328bc916c SHA512 59229cd20272a51b480ac84b98d0d11ce763000b3cf8e1563180117edfd9d7aebc2d03310837126e29fdc47f37fa5ee5f510f7c5b00763d3f2f13abcefec125c
 MISC metadata.xml 390 BLAKE2B 607a5aa0d8230544494b28dd72922939d279c924f8a9f164887ff948c788f612852907770e5f0cc4729458a13b564fbdc7ca490ea727996b8491621c78886828 SHA512 3147fd355b1c207a3edcc1ba098a4832e45d656789d4980ea219fdfd02ae36126a866b61ebd9c352c2c81449d03e1dc829231bf5a7ea5f58c91fea92cf9270a8
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
deleted file mode 100644
index 31a52bda60c5..000000000000
--- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch flag-o-matic perl-module
-
-DESCRIPTION="dvd::rip is a graphical frontend for transcode"
-HOMEPAGE="https://www.exit1.org/dvdrip/"
-SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
-
-DEPEND=">=dev-perl/Event-ExecFlow-0.64
-	>=dev-perl/Event-RPC-0.89
-	dev-perl/Gtk2
-	>=dev-perl/gtk2-ex-formfactory-0.65
-	>=dev-perl/libintl-perl-1.16
-	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
-	virtual/imagemagick-tools
-	>=virtual/perl-podlators-2.5.3
-"
-RDEPEND="${DEPEND}
-	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:2
-	ffmpeg? ( media-video/ffmpeg:0 )
-	fping? ( >=net-analyzer/fping-2.2 )
-	mplayer? ( media-video/mplayer )
-	ogg? ( media-sound/ogmtools )
-	subtitles? ( media-video/subtitleripper )
-	vcd? (
-		media-video/transcode[mjpeg]
-		>=media-video/mjpegtools-1.6.0
-	)
-	vorbis? ( media-sound/vorbis-tools )
-	xine? ( media-video/xine-ui )
-	xvid? ( media-video/xvid4conf )
-	>=media-video/lsdvd-0.15
-"
-
-pkg_setup() {
-	filter-flags -ftracer
-	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
-
-	perl_set_version
-}
-
-src_prepare() {
-	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
-	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
-	# Fix default device for >=udev-180 wrt #224559
-	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
-}
-
-src_install() {
-	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
-	make_desktop_entry dvdrip dvd::rip
-
-	mydoc="Changes* Credits README TODO" perl-module_src_install
-}
-
-pkg_postinst() {
-	# bug 173924
-	if use fping; then
-		ewarn "For dvdrip-master to work correctly with cluster mode,"
-		ewarn "the fping binary must be setuid."
-		ewarn ""
-		ewarn "Run this command to fix it:"
-		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-		ewarn ""
-		ewarn "Note that this is a security risk when enabled."
-	fi
-}
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
index cf6e6e1f3569..7065ceb972ad 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.exit1.org/dvdrip/"
 SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
 
 DEPEND=">=dev-perl/Event-ExecFlow-0.64
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index de98277fc635..4048c68982e0 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,7 +1,8 @@
 AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
+AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b453198626a2178b119eab56adb73d392a8f4499735310108838f73d48c50f54c9c4b1b19db66c98ef15b39e38c3d4 SHA512 89cbf0cd5c4337e4633af7c814002cb4e909b4d4d385d5a3e265882cf1c4e24e4057512bffe7311e53b8a7886c882929221b07961ae86d115803f9b991ef6a05
 AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2
-DIST ffmpeg-chromium-94.tar.gz 14709687 BLAKE2B 06dedbd86befd8caed4c6cb34755b52cf70630f8fbd712f89d42e5b63e498f9d2a77935fbd7c87194f6d56fb0f83ff26beba00357dd51b3ac3e2e4480ff4351e SHA512 a6cf5404c892c878c50e3ba8369456db587e327bc3d77e857b9d34f3665ecfee7d3865b20e9871ccda570b30d9d34c03fd981cdc7f495809ea8f12cb8f15937e
+DIST ffmpeg-chromium-100.tar.gz 15144675 BLAKE2B 1195078e12ef0d8b5562b2eed068eea331a03727f3dfbd198fdd1088d70346f892bc9161ecd80ed54f7c5c842c9ae9b16f6d02858f3c4a538ce19de03b5ec9f8 SHA512 35f5ca7164d8d8f58b2f553ec7c6181629af217752fe49bd890051675734864ae4b5d1f135808d101fb0c9855d14842a0074759679a15e9b94fb571c9e2ccee7
 DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2
-EBUILD ffmpeg-chromium-94.ebuild 6148 BLAKE2B 3dcc0310ab9cf7280f64bddca3dd9bb120e217afacca2eff0cdb31be84cc8398eb35da3937dec968e6b5e1afeab24ebb51f100bb3db44d8d91243e22f1f3fdfb SHA512 ac8e2cd29c98a89881580d5ae4e6cba3a0f1143e36ad553520dd12244caddc02e753b4f775454f09b1ef602765713753e2976c6d3851ae3b1f4d458728e4f5c2
+EBUILD ffmpeg-chromium-100.ebuild 6224 BLAKE2B 5e24d377ba4bface5737b8c78088d970589a48d45fbad4262972d0cede8dc31649c2f7eb58c947367552be9bf8a054e53735ad605e4c33b4766f7881fa44b17e SHA512 392db2b377bdcbadfe2e57a59f86c34f6ea5b044548d06d90d753b97bbb45e0bc813d9a3d17718d193a04fb59ef038e6fbcdcc990f54e06a8d8e8bb3ddb9edd2
 EBUILD ffmpeg-chromium-96.ebuild 6152 BLAKE2B 1afb8f595b0f1bd5259de827ca614343165b97cd60f4443d23139d5162edd065d13e3c37f59a43b8a3837058cebcb360616f7b33c65df1fa408c3afc789a9166 SHA512 00a82ddb95b0457f5347b680ae6c7bf058052de6aacdd9e15435f84a3f2d70c776149f2e9c0ff7935f19e2fe35dcbf05ab2cea43cf6d97c1882353be35d019f6
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
index 94e036354132..3c7d3ee33d68 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-94.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
-COMMIT="2d6591aa0835768c437c221c88840ac0c99a50dc"
+COMMIT="574c39cce3231c69bc9a02ac475c27d944bdb113"
 DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
 HOMEPAGE="https://ffmpeg.org/"
 SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz"
@@ -16,7 +16,7 @@ LICENSE="
 	gpl? ( GPL-2 )
 "
 
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
@@ -94,7 +94,7 @@ RDEPEND="
 	vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
 	vdpau? ( >=x11-libs/libvdpau-0.7 )
-	vulkan? ( >=media-libs/vulkan-loader-1.1.97:= )
+	vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
 "
 
 DEPEND="${RDEPEND}
@@ -114,7 +114,7 @@ RESTRICT="
 S="${WORKDIR}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${PN}-100.patch
 	"${FILESDIR}"/chromium.patch
 )
 
@@ -181,7 +181,7 @@ src_configure() {
 	fi
 
 	local extra_libs
-	if use arm || use ppc ; then
+	if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
 		# bug #782811
 		# bug #790590
 		extra_libs+="$(test-flags-CCLD -latomic) "
@@ -195,6 +195,7 @@ src_configure() {
 		--cxx="$(tc-getCXX)" \
 		--ar="$(tc-getAR)" \
 		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
 		--ranlib="$(tc-getRANLIB)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--optflags="${CFLAGS}" \
diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch
new file mode 100644
index 000000000000..e0aa000faaa3
--- /dev/null
+++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-100.patch
@@ -0,0 +1,27 @@
+diff -Naur a/configure b/configure
+--- a/configure	2022-03-22 10:20:35.000000000 +0000
++++ b/configure	2022-03-23 09:17:18.914615584 +0000
+@@ -6600,15 +6600,14 @@
+                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
+ enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
+ enabled libopenvino       && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api
+-# Chromium uses a built in copy of libopus that is not visible to pkg-config.
+-# enabled libopus           && {
+-#    enabled libopus_decoder && {
+-#        require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
+-#    }
+-#    enabled libopus_encoder && {
+-#        require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
+-#    }
+-# }
++enabled libopus           && {
++    enabled libopus_decoder && {
++        require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
++    }
++    enabled libopus_encoder && {
++        require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
++    }
++}
+ enabled libplacebo        && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create
+ enabled libpulse          && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
+ enabled librabbitmq       && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4e96d87ac5bf..53a7af8cd82f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -18,5 +18,5 @@ EBUILD ffmpeg-4.3.2-r1.ebuild 17798 BLAKE2B 28f93ad79fed4eec399d8c5dfd2d5d71288c
 EBUILD ffmpeg-4.4-r1.ebuild 17866 BLAKE2B f98d4fbd55a192d157953cf10455e80d1541f54743c089aac0dc9ac7c87c1e6d3040b189236bf37cf691b2872bf5b40cfe2af494df4754e8bdc39940e85467f8 SHA512 f40dac73d8415d6e6ada730f4d476973c6c11ca48bd5c46e07121f7793c21974af1e2044d1f3aa1271f14f9b1f75bc113ee0426c34c36ccf8cabe531f829a1bd
 EBUILD ffmpeg-4.4.1-r3.ebuild 18186 BLAKE2B 773ef65426720535bfb9982e718c26546889fa72a4509181674aeb5bbc2883c737427dbaef13d294690679f6f016cef17f36313e2dafdc82edd0e102f1abb281 SHA512 54af77b2521f600ff51e25a8394002def234f9db0666b7298c85e3825da7e6014d2d229d228c3a6710e8f5521379a3b230cc3ee2fff4039746abb438e2c95c80
 EBUILD ffmpeg-5.0-r1.ebuild 18172 BLAKE2B 4c2041f9f432fa688e7a19522ae993814b9ea7c89bc261d96d2f3327a37823947403bccda66d3311785e3579db73a2056976606fdcfb1d5464312a10ef07ce0e SHA512 481a4d0f61112ff188655beb2a75d16a7fb1ff1c9520b6548a30c3a75df6efeaa0470b07a88b5e27c6af7a06aaee58ca4502fabe386dc60c697d0a686ae963e1
-EBUILD ffmpeg-9999.ebuild 18155 BLAKE2B 15cca17575575bf7a16e72186b8f09fe7a339702a72911fb9bdfdb2537ddc2f9039f56ea45292ed0389c5abae91783512935981b7d291ff7905bbcf084f0a986 SHA512 2add0b88bb2e50c70140253e020d03bfa854a2f76abe784c9454d0bc289729c33e950810205ce987ed777de05a65cc74bfcd1273a7b2458c2d69d86e86a59e2f
+EBUILD ffmpeg-9999.ebuild 18101 BLAKE2B 4501ecb2ee3124c1ab873ba93fd0a8d7074f6ff8245454a767225f598e9f2ded94a3b6906d11b11d8ed7ef0417d736a1cd69996458055c0ce23d53425f0e546c SHA512 2bfcd6e122a426a3c1f94aa7ce04d470ad2126feed3a6b6bc7c3da0185d4c5212515bb8eadd6e4a63a46f2ccfdc6415b386408b9e2562d8d2f86a4ef783a2da0
 MISC metadata.xml 6269 BLAKE2B 5d7f3a5376927ddf9d9c95c7465bc2b8df451be3c2ba62be38cce88449222fb6b9d6c30d88e89c403a2d60eb3b3d3f95f762ac85f85f07d54712a24d2712e40f SHA512 fbd108f665076751db688ddd0bf05b9d1fd004eff547a6a3707be369e6919efe989d82f43c09775456fa0035699ec249c8a9941dbdbf7952b1c6be11cd26acda
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 1f70d55ec169..89a0768ff91c 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -339,8 +339,6 @@ src_prepare() {
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 
-	eapply "${FILESDIR}/vmaf-models-default-path.patch"
-
 	default
 	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
 }
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
index 9370e9ee3466..a3fa671071d2 100644
--- a/media-video/mplayer-sh/Manifest
+++ b/media-video/mplayer-sh/Manifest
@@ -1,7 +1,4 @@
-AUX mplayer-sh-0.8.6-parameter-aid.diff 3541 BLAKE2B 40a6e3c4c4f832ca37ef4bbb49c5e1fa196a8b657b2ca30c0e1026c21c10e74a673746b854e6ec2e926bb10f46990e4a1291388c90452b02e79a6b3e01d5e3a6 SHA512 5e53a456eefd98c43c0e3adfd2ce2c3e688257d18b3cf76f74d48d94913450098427c308276f6b5831c93c93a5c4f6f0f36636777a99b9497556425ed8b09bd3
 AUX mplayer-sh-0.8.7-parameter-aid.diff 3570 BLAKE2B 52622f53c8b8992b0f2fef0e708118d5cafc05e8ba8dafa55910815cdf2dd7b49933fd1f33797faf2f055ecadc35863d6cebfe2819c8bb1ff0acc2bec3accb78 SHA512 9783f779a09143faa89ef3de5d87ec415dd797af53d4b1da6b56ed28021a414768b4393e0fd8812c74805c17970eb24cbee3ebc12ee741e036a2f4276e449e5c
-DIST mplayer.sh-0.8.6.tar.gz 7568 BLAKE2B 4eecf46b75368028f54f090e13575287bbbe9ab6fedaf2def221f539b95fcdd4fba8c3a1ad59d9aca2fd72b6ec770ee159a410383e45d53148d270043fe464c6 SHA512 ff4a11f1b8dae014646f101fcab16d6cebc0c3250bc8d259500c2819b484913270051ed9ec9b1442e647e811030f927db07f71aa64edd6221a875e067e22e36a
 DIST mplayer.sh-0.8.7.tar.gz 7851 BLAKE2B b7dbaf93c509a3d2bb38f226dafed2261ddadbff24a6e450f3fe2cf5cb5208bb3e89a1830fc3e59d674e9b045360208e7c221498e32f228be9c6e0147aef2588 SHA512 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9
-EBUILD mplayer-sh-0.8.6-r2.ebuild 1016 BLAKE2B 1f20a4d2e8dd68fe041b64cd2417d1c737442aeb026573b6c14ccd265a0329b9fd97a067e6cd97f9a2eaeb1af202a345e11a3cc3a3c0bc6b22b74e3905c07489 SHA512 bbdf22302e7e0c9d9e900602c0e7e343808bce4b6ef8fda0f653d987b7c5edb8dfb71643bd69142262a1701b605e11ed535b1fd3b03130f1fec1f8773145893a
 EBUILD mplayer-sh-0.8.7.ebuild 1040 BLAKE2B 79d5283fdd98120b0724e22e5611bd8c400dea35873e599f43d7ddc74232833015616d7f20fd615ec305bbe6f2501e955a8081ee8a31a064db939d7d4cdf5162 SHA512 06de9fb7015afe6ef615e53d9cff39342266ecc707c99b886ad6f80bddf2b7bd17853b25bd07925d355746b3dc11e5afbf7deab7d0b483a9bf2df90a8940dd7b
 MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
deleted file mode 100644
index 3b329215564b..000000000000
--- a/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- mplayer.sh.orig	2006-03-26 23:31:10.000000000 +0200
-+++ mplayer.sh	2006-03-26 23:50:39.000000000 +0200
-@@ -6,6 +6,7 @@
- declare VERSION="0.8.6"
- 
- # History (as always in the source code :-)
-+#       - add -aid to mplayer when AID is given (Matthias Schwarzott <zzam@gentoo.org>)
- # 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background 
- #	  alpha color (thanks to Christian Haider)
- #	- changed the fps values from rational values to integer ones
-@@ -208,6 +209,11 @@
-   fi
-   debugvar REMOTE "$REMOTE"
- 
-+  if test -n "${AID}"; then
-+    AUDIO="-aid ${AID}"
-+  fi
-+  debugvar AUDIO "${AUDIO}"
-+
-   if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi
-   debugvar USERDEF "$USERDEF"
- 
-@@ -478,15 +484,24 @@
- declare -i NEW_X NEW_Y
- declare -i HALF_Y FULL_Y
- declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
--declare CMDLINE AOUT REMOTE USERDEF SUFFIX
-+declare CMDLINE AOUT REMOTE AUDIO USERDEF SUFFIX
- declare FILE="$1"
--declare SLAVE="$2"
-+shift
- declare -a XResPAL[0]
- declare -a XResNTSC[0]
- declare FDSTR=""
- declare SUBTITLES=""
- declare DETC=""
- 
-+while [[ -n $1 ]]; do
-+	case ${1} in
-+	SLAVE) SLAVE=SLAVE ;;
-+	AID) AID=${2}; shift ;;
-+	esac
-+
-+	shift
-+done
-+
- echolog "*** Starting mplayer.sh Version $VERSION"
- 
- if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
-@@ -504,18 +519,18 @@
- if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then
-     if test "$FILE" == "$DVDFiles/DVD"; then
-     	$USEAC3 && AOUT="$AC3AOUT"
--        CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://"
-+        CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -dvd-device $DVD dvd://"
-     fi
-     if test "$FILE" == "$DVDFiles/VCD"; then
--        CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://"
-+        CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -cdrom-device $DVD vcd://"
-     fi
-     unset FILE
- elif test "${SUFFIX}" == ".cue"; then
-     if $MPLAYER_V1; then      
--        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
-+        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF cue://$FILE:2"
- 	unset FILE
-     else
--        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile"
-+        CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -vcd 2 -cuefile"
-     fi
- else
-     # Try to determine the video attributes
-@@ -545,9 +560,9 @@
-              \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \
-              \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \
-        \) ; then
--      CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF"
-+      CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF"
-     else
--      CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
-+      CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
-     fi
- fi
- 
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
deleted file mode 100644
index 982453ffa896..000000000000
--- a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-RESTRICT="mirror bindist"
-
-inherit epatch
-
-DESCRIPTION="Video Disk Recorder Mplayer API Script"
-HOMEPAGE="http://batleth.sapienti-sat.org/"
-SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-${PV}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="all-rights-reserved"
-IUSE=""
-
-RDEPEND=">=media-video/mplayer-0.90_rc4"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-parameter-aid.diff"
-
-	sed -i "s:^declare CFGFIL.*$:declare CFGFIL=\"\/etc\/vdr\/plugins\/mplayer\/mplayer.sh.conf\":"  mplayer.sh
-	sed -i mplayer.sh.conf -e "s:^LIRCRC.*$:LIRCRC=\/etc\/lircd.conf:" \
-		-e "s:^MPLAYER=.*$:MPLAYER=\/usr\/bin\/mplayer:"
-}
-
-src_install() {
-
-	insinto /etc/vdr/plugins/mplayer
-	doins mplayer.sh.conf
-
-	into /usr/share/vdr/mplayer
-	dobin mplayer.sh
-
-	dodir /etc/vdr/plugins/DVD-VCD
-	touch "${D}"/etc/vdr/plugins/DVD-VCD/{DVD,VCD}
-	fowners vdr:video /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
-}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index e69ef3c218b2..6266a28af09c 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,8 +1,10 @@
 DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
 DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218 SHA512 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
+DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.33.1-r2.ebuild 9717 BLAKE2B 32c6c20c5b8baf39270a040f72afc61df457617749f84b1b82ff6d65a5be1f020461f4135fc2c455d7f81061665dd82e9ed68354963bce458ece6bf212829e76 SHA512 a2cb0f953d63cf6d3430c11e464de8babb965ac5335375791f408ca08c14d842ad60b52645e508812492c4fcb2d8484d9f6930a5a962e7909fd03f2bc35fba47
 EBUILD mpv-0.34.0.ebuild 9720 BLAKE2B df9e6c42c29738fb8d4ede3b40f968fb97604b0e9834dcee6d60030c09ccceff39b2b5c35b838ff7084a2e4961cb067d8d59f0ce583c7d073fe95c42eb94994c SHA512 ef5231c4ee9bb7ac75cbae2f27acf61c180ffdc4fe5bbfd55ca7279e072d5a018064b8690480974d80bb4a513d71abab28ca2d83d00b994a5ae5d4b164414f7f
+EBUILD mpv-0.34.1.ebuild 9720 BLAKE2B df9e6c42c29738fb8d4ede3b40f968fb97604b0e9834dcee6d60030c09ccceff39b2b5c35b838ff7084a2e4961cb067d8d59f0ce583c7d073fe95c42eb94994c SHA512 ef5231c4ee9bb7ac75cbae2f27acf61c180ffdc4fe5bbfd55ca7279e072d5a018064b8690480974d80bb4a513d71abab28ca2d83d00b994a5ae5d4b164414f7f
 EBUILD mpv-9999.ebuild 9720 BLAKE2B de46a17b87a5639a9e9e59eefda60add4e8b0889c6f428c9e012d6e241689a7564ca1e9eea61124516635aedd4f1603697ab06c721c2d15190c1f7931867a0fa SHA512 717a16db932376c9dbbdb913283e3af60c92fff63c244f991b07e24f1988412bb2f0b6057bdc898c5a403dd1208e74bcac2d571fe7af38d64116c559b9cfc778
 MISC metadata.xml 2137 BLAKE2B fe78cb8478cac266c72c939fd87043c0a685c12c840e0966d34d58b1c9dd39767197d93762d8150454a5e2f58ecf0c68cde1289bb392cd92b0d199a81d5f4ff6 SHA512 bd37f4f676eaf2507484d28b0b29f861e575a6232bc67413cae1c09fd16481d5a62b2646ee2e9e5b5a0c5bd8a0dfa63d1b4ef80e3f70c1ef8ff040d103fd6beb
diff --git a/media-video/mpv/mpv-0.34.1.ebuild b/media-video/mpv/mpv-0.34.1.ebuild
new file mode 100644
index 000000000000..e0f0ee5c96cf
--- /dev/null
+++ b/media-video/mpv/mpv-0.34.1.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=2.0.22
+
+inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+	DOCS=(); SRC_URI=""
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
+	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
+	nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
+	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	egl? ( || ( gbm X wayland ) )
+	gamepad? ( sdl )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	nvenc? ( opengl )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	vulkan? ( || ( X wayland ) )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	${PYTHON_REQUIRED_USE}
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.4.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia
+			dev-libs/libcdio:= )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0:=
+		>=media-libs/libdvdread-4.1.0:=
+	)
+	egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
+	gamepad? ( media-libs/libsdl2 )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
+	virtual/ttf-fonts
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? ( ${LUA_DEPS} )
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? (
+		>=media-libs/libplacebo-3.104.0:=[vulkan]
+		media-libs/shaderc
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=dev-libs/wayland-protocols-1.14
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+	zimg? ( >=media-libs/zimg-2.9.2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dvb? ( virtual/linuxtv-dvb-headers )
+	nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+"
+RDEPEND="${COMMON_DEPEND}
+	nvenc? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+BDEPEND="dev-python/docutils
+	virtual/pkgconfig
+	test? ( >=dev-util/cmocka-1.0.0 )
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default
+}
+
+src_configure() {
+	python_setup
+	tc-export CC PKG_CONFIG AR
+
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize # Don't add '-O2' to CFLAGS.
+		$(usex debug '' '--disable-debug-build')
+
+		$(use_enable doc html-build)
+		--disable-pdf-build
+		--enable-manpage-build
+		$(use_enable cplugins)
+		$(use_enable test)
+
+		$(use_enable iconv)
+		$(use_enable lua)
+		$(use_enable javascript)
+		$(use_enable zlib)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth # Only available in overlays.
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland wayland-scanner)
+		$(use_enable wayland wayland-protocols)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable vulkan shaderc)
+		$(use_enable vulkan libplacebo)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		$(usex opengl '' '--disable-gl')
+		$(use_enable vulkan)
+		$(use_enable gamepad sdl2-gamepad)
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable nvenc cuda-hwaccel)
+		$(use_enable nvenc cuda-interop)
+
+		# TV features:
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		$(use_enable zimg)
+	)
+	if use lua; then
+		if use lua_single_target_luajit; then
+			mywafargs+=( --lua="luajit" )
+		else
+			# Because it would be too simple to just let the user directly
+			# specify the package name to check, wouldn't it.
+			mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" )
+		fi
+	fi
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Not for us
+	mywafargs+=(
+		--disable-android
+		--disable-egl-android
+		--disable-uwp
+		--disable-audiounit
+		--disable-macos-media-player
+		--disable-wasapi
+		--disable-ios-gl
+		--disable-macos-touchbar
+		--disable-macos-cocoa-cb
+		--disable-tvos
+		--disable-egl-angle-win32
+	)
+
+	mywafargs+=(
+		--bashdir="$(get_bashcompdir)"
+		--zshdir="${EPREFIX}"/usr/share/zsh/site-functions
+)
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use lua_single_target_luajit; then
+		pax-mark -m "${ED}"/usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"/usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
+		ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
+		ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
+		ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	optfeature "URL support" net-misc/yt-dlp
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index a1ae6f90ce40..b02655b33ff8 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -7,5 +7,5 @@ DIST projectx-0.91.0.10.tar.xz 830104 BLAKE2B 511481dd2c391a6a26acfa0603f1c221d0
 DIST projectx-icon.png 1692 BLAKE2B 6da85b69961b81f64638b04860b467e8cf599287513d85157aa71e4575003b8ef6e96cbe4b0b40b54bb15b6ca74c14f4bf1855c80f1f6db89294567a77f9e151 SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a
 DIST projectx-idctfast.tar.xz 12444 BLAKE2B e4b2a6ab235601dbdd1acf8a73a14fecb5da455670bad52598e0dbd8a7300305fad1b22b3d550dd046dcac68975af4b225e042f7c968ce9108f702d01586302f SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8
 DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b
-EBUILD projectx-0.91.0.10-r3.ebuild 3281 BLAKE2B ee583ac243692e5e6ad22e0fc1e8f62b31d89f336612fc46560069d554b5fe753081145dcbe2deca44e7ac1d468c7e09a22ed217e392a832caae9a40a084fd9a SHA512 2c1c1fe0231da7fe3f950ede177c207ca223e0abdc2242dc7d0b6fffe24707fab63a280514e5b272615cf19c278c8824b02e0688608b9f20e83d77d9ff618d60
+EBUILD projectx-0.91.0.10-r3.ebuild 3283 BLAKE2B 819949b4f47bfb66b93cb99708f46ff86ada60bdd11239ae2e12a9784357c7d21e883b68ef281e1d3802b26dff92136320f565734b3bde4ac184fa2eabfac77a SHA512 0c45821af059a1ccdd85024a7440ec380951a8b8d61fbc5bb965396c14a3058b9bac3a12bfff651f16f89ec7ca8f57939b3de0af1bf9cc120e498445d78658a0
 MISC metadata.xml 743 BLAKE2B 1100ef8186544c4605495d3cee7ba506559e124fd500a20b54a7cbd912a792b6873143040f46d9b30837c6dd79c0e1f18f6464d25b84dc1681b0886c209471b0 SHA512 7644cbc684eaaaec7838c38a7856b3421e4e9069dc208bad12c9b4c40567ecce706633148656d2ceb193ebd925761599856f6290126ecf88405f9b86af49ab25
diff --git a/media-video/projectx/projectx-0.91.0.10-r3.ebuild b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
index a6df47e09cb3..366fdb7843d2 100644
--- a/media-video/projectx/projectx-0.91.0.10-r3.ebuild
+++ b/media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -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
 
 EAPI=7
@@ -107,7 +107,7 @@ src_compile() {
 	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
 
 	cd lib/PORTABLE || die
-	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+	emake CC="$(tc-getCC)" IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
 		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
 }
 
diff --git a/media-video/v4l2loopback/Manifest b/media-video/v4l2loopback/Manifest
index 09794dbbcc82..3eb193c3f794 100644
--- a/media-video/v4l2loopback/Manifest
+++ b/media-video/v4l2loopback/Manifest
@@ -1,4 +1,4 @@
 DIST v4l2loopback-0.12.5.tar.gz 51468 BLAKE2B 514f686fc6f87feebedb1b047e764fa03938c265c88db0fedfb6aba3544f5b8b495631fc0bcdf4b88c1c4d522f6b4d7546b4d0d10381f6be2efc7f405511033a SHA512 5fd2affbb4a7f38bb78f996179de6570b2bd69cfed2a79c4505e7ea2cdf5b65c0a6807f1f4e03f320b667f5cbe62f26fadd412bc0fec5944e4e394635bf5fb3d
-EBUILD v4l2loopback-0.12.5-r1.ebuild 1109 BLAKE2B 5380d879c782aeda966be880fc2cb67f59c6077eb820df343b14e75fde9eed17bd15725f2bd744330a767080c313c73ab1fcc72152a8f99474478237b11aa379 SHA512 33995ae92485b4f769881419ec51d5d55bcc435e984ad94f958ccf978421a822d73d65f070b65abc9a1bf107bffb4aca50491ea99ed5dede0341daa1367fb34c
-EBUILD v4l2loopback-9999.ebuild 1131 BLAKE2B d327ae4bfdda3a4f1c822ae469e5afb2c6a81c5b9aa26a4345b58732f55d8f1357b868ca6b8b553d9755f153601062c784e76ed68e81b050b89f921b17ba3e05 SHA512 9c1eb098d12f0ef96421974481d5272ad66a61d4c7ff20588b7b4e40013664c9ddea8889603e4f073660c6164e4838b9ba15d3a3f6e77edb34c0a18c8ef07124
+EBUILD v4l2loopback-0.12.5-r1.ebuild 1111 BLAKE2B 31929aa7ccf2fc89409ee34e02d365f3937a624ee4de351ebe64677b9dba4a8218c5e97b85357cecdea5a4a9062537cd12b6262ecbd77eb42dfa76242b3addce SHA512 51e911a9ebd032b97a5d19ad4c781b808c66a61f23ce6ccd73bca73d4595b0ac36b0447d84afb27e424281f600724f4140b04691fe6d8a6af7696cb623b27729
+EBUILD v4l2loopback-9999.ebuild 1133 BLAKE2B baa88185bf1d82c52e1c4788c7a21b04d3191acda4081eaad5bee2ae290b80813d8e416d1764582851696702610964b2dca2db80470cdb32ba2960925f51056d SHA512 70a0a9d6d7527883731302fd385c494949678a58b12d61003fc490a50e30917438937eef32d3c0b248939711a690742d9a214193a6d9dfe88c33dcb7979d0067
 MISC metadata.xml 350 BLAKE2B d9a59e7368e495faf38e1663514d9ab1b0b152b0154f3b513ccc08770f4ca3dcc3236010431101e8bd279594c60fe5afa26a1be886d5eb5ecfc54b3a5fc27ffa SHA512 0a86fe8cb27cd34495a9e9baab914faf53ea652befce624d8494864cd86276c6b648f09b9f75a191e3f4b1f7a3d84622db5eacd628ccbe689b9e516b12a48c88
diff --git a/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild b/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
index 6c744550640b..6c4fb6dc4f4b 100644
--- a/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-0.12.5-r1.ebuild
@@ -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
 
 EAPI=7
@@ -40,7 +40,7 @@ src_prepare() {
 src_compile() {
 	linux-mod_src_compile
 	if use examples; then
-		emake CC=$(tc-getCC) -C examples
+		emake CC="$(tc-getCC)" -C examples
 	fi
 }
 
diff --git a/media-video/v4l2loopback/v4l2loopback-9999.ebuild b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
index 712f4d2b8c0f..760951059416 100644
--- a/media-video/v4l2loopback/v4l2loopback-9999.ebuild
+++ b/media-video/v4l2loopback/v4l2loopback-9999.ebuild
@@ -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
 
 EAPI=7
@@ -41,7 +41,7 @@ src_prepare() {
 src_compile() {
 	linux-mod_src_compile
 	if use examples; then
-		emake CC=$(tc-getCC) -C examples
+		emake CC="$(tc-getCC)" -C examples
 	fi
 }
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5899de71a973..d5462417749d 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,8 +10,8 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 DIST vlc-3.0.17.3.tar.xz 26393440 BLAKE2B 5079caa779335647394eb4af631ae89098b22545531ecf95ed81f9551f7004b8469a6e44de08f512e381164dc64e011d42be14d675d20c09ab043a00348f6b83 SHA512 99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6
-EBUILD vlc-3.0.16-r7.ebuild 13944 BLAKE2B 3d5bf8d410492da8614845eab3e1fb58756f5b01559f014856dab785df4f5877df92d16e776fc73e6fd3be8d44d10aa3dd4b76bbd8d32129ccecb36d768665a7 SHA512 c459f6b79d293ca0ca42c80331b0948044042eee77d97308b4540738332c26bbc9dd556f1d7dc08d20018bfa301eb25b5d281c985373c1a8ceff0788e368669e
-EBUILD vlc-3.0.17.3.ebuild 13600 BLAKE2B fc4916bfff6370a23c4848edb4224b8fbd77ac001312921a8f62c747582ebf61ebc60889a9fee34c3e58d58e3080878e2412204d7f37c52486e6216d7b7d9d1c SHA512 cdc421a72253f5a104dabe3dbd995c3fcdfc90948ce81a8c6da2412518c10f294f16b434ebb1690bf8f0b7159e0bc5f95d592c3da4202a68a79cbbc539ab414d
-EBUILD vlc-3.0.9999.ebuild 13525 BLAKE2B 5de3d5fade37bb5b82d5d4fe28a11929fc6b70d5b85ee0a213d3637f0f8d264d985262afac419306b1fb248e4d0bb0bd42db289be7cd5e19da561b1a28b0a89f SHA512 6cd72cbd9b9f5908cdd594a706c518e461747ab99feb375e5e2aef26d5ca464a04eda647fa5c0a06d6ea915d58db268e5fc71b896721d0bead74ab8ce58d8f37
-EBUILD vlc-9999.ebuild 13580 BLAKE2B afe39a6a17e9088844015a2aefbd39a514b8a5f13ea306e63b21064d59bae94b2f78903aa3f3f748c13ffbf6fa0444d34ef5da421d414be5b840a59a7dcfcc38 SHA512 de84d311f4f674769835687ad67c52c20bc4aafa3c8337a56b4b8452556b911ca637c9080f71e17b0fc84e903b2c0d5cff254a3a6d48aaf1080ce06cf1e8d8a8
+EBUILD vlc-3.0.16-r7.ebuild 13946 BLAKE2B cd43fba1f30bf10d5cc9db74c23adb94324cc7945fa7de9f48d5b77ff8f68c5b789a127dc8f89c981478224603422fc9146b25badcd8eebd24a0b655c99a4e58 SHA512 eeae7cb14f9dba68d4f45b789967d731d2941c5d107131bec0765a76d2957f7222c120fe78cd40711de0466fe6e066832a4e25615617b84090cfa0b70d9660db
+EBUILD vlc-3.0.17.3.ebuild 13602 BLAKE2B 5489eb00da13a276b881cc9bef367e7775ac4453d6ce9e75858ea513f1362df2939d97457624d37cd45b1170f3315401f86b8342c66d4f59198dd867fadbf4ea SHA512 aabd6951cb799b2cf06fc72aef10d83b621016af165d491c54cf842225e0a7c5395e5dbcc79635220d79eb779914e2a6d4899ea14a8cbad739a10e2f1f5bb5d5
+EBUILD vlc-3.0.9999.ebuild 13527 BLAKE2B b5e14fea96effc5e6474f86f0fd1343904440c759edb569b5cb93d29eb40c50c2d37cedd11120efca48af745b2a078c73babaae29ebab8352addbbf6f572074b SHA512 ac9e367a284df724ae6f24edce329883e85721e6cdc1d1f9ece4f7096c4656fd109e368217fac691735f5108eb71bd0f3f4e52724f4c98ffc6af27ab61070c87
+EBUILD vlc-9999.ebuild 13582 BLAKE2B f8140ab87c25f1d257ff79e6021bd7d093e73b874c4de923c542dcf18b783520012b21f44bc70b32cf8c654cd224436f2e5a89ee2c459d3805d41db4b28eb565 SHA512 14e3352062b1582665d769589b5f08e1f60a3234f385474e1f2ee2495e142d4807f00a1622931568d8e67f50020819d1344f3064fdd55cc6b8a9ea4eed4afe18
 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.16-r7.ebuild b/media-video/vlc/vlc-3.0.16-r7.ebuild
index 6c0852eb7fb2..a489be732bc1 100644
--- a/media-video/vlc/vlc-3.0.16-r7.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2021 Gentoo Authors
+# Copyright 2000-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -285,7 +285,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
+	local -x BUILDCC="$(tc-getBUILD_CC)"
 
 	local myeconfargs=(
 		--disable-aa
diff --git a/media-video/vlc/vlc-3.0.17.3.ebuild b/media-video/vlc/vlc-3.0.17.3.ebuild
index cbf2809db75f..b22877009420 100644
--- a/media-video/vlc/vlc-3.0.17.3.ebuild
+++ b/media-video/vlc/vlc-3.0.17.3.ebuild
@@ -279,7 +279,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
+	local -x BUILDCC="$(tc-getBUILD_CC)"
 
 	local myeconfargs=(
 		--disable-aa
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index da3784db8aee..423213f43413 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -278,7 +278,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
+	local -x BUILDCC="$(tc-getBUILD_CC)"
 
 	local myeconfargs=(
 		--disable-aa
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 68cc07eff6bc..9eb1890b6c9a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -281,7 +281,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
+	local -x BUILDCC="$(tc-getBUILD_CC)"
 
 	local myeconfargs=(
 		--disable-optimizations
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 48f340fc8837..3dd501821d69 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -5,8 +5,10 @@ AUX wireplumber-0.4.8-si-audio-adapter-relax-format-parsing.patch 1965 BLAKE2B 8
 AUX wireplumber-0.4.8-spa-json-fix-va-list-APIs-for-different-architecture.patch 9630 BLAKE2B 5255aa33fd37af8c89db86c9f686d93612f0d84ac6a19a3d30ccf53ef94c8867ab14fa460be7b3976c7e78b98f31cf836b121123041689648629d2a2042a6646 SHA512 96e5d6d197f26ad1e3c9a6c5b56eb6e4e8d9eeca9b60d55ba8d3355aa79954dc9bbf88c57797f8131128631de3037f5b12359b4e86c8468394d6f431db1ec1c9
 DIST wireplumber-0.4.7.tar.gz 358718 BLAKE2B a7e708ccfb9e95b3f3e2ddc5dfc1dc437ac8a2831a7cdaf03f33af65fcce8fc27dd91b2a6f346e60f68873724c2d165616005b485189604863213b5d5565f894 SHA512 8b472e1b3c7a29045326b30989d24224e510f93021c1b5b6aee59859daf594e91a738b8ad9d46d24736b7de29624d9faff40e1061bd3eddc559c95e325bfbf19
 DIST wireplumber-0.4.8.tar.gz 374824 BLAKE2B 7b5c8492d58be8b40c4c98bc807d031c453904a7df51c9b0d96c353c93018ba8cbd699b2c3c885defe7b5360df4256ad5e175015dc0102e5007853f6e0132cb7 SHA512 cb96b1d55be7e9d1433fc4a4fb4accce63f5f318a9a2b5cffc51a9f052765df777a0ba4ac73579771084295a73e6f05ed3a16a5fb9d0f5da4e183cfd74483c2c
+DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929
 EBUILD wireplumber-0.4.7-r2.ebuild 3599 BLAKE2B f26870c8f99bbd77c423a1d3e76a8111a3eb1537bc66da6435263a230d23933a36190f7bdfd974e65eb19c39ac0d1675f505e4b755cfae87c27fe25e82128219 SHA512 2033157b0cfcb61e5644899ab8954a9ec6f01391afe347b5b3850c8ac496f5801983a0ac5d1fd3726b475cb55a7816174df353afa71a9d880e6d2691f414d4bf
 EBUILD wireplumber-0.4.8-r2.ebuild 3768 BLAKE2B 631d7f8587ac270b5753a64c7a0836be51cd14e41a9909ffab651fb5357775a5fa5443a9785a7d26caee9fe3d6e832d8a2d7e74838c6cb5380de776cacbac937 SHA512 aab5a562f4d45cab757dbab197287169f5bcb377b79029aee72f97a7f8c407bfc15c78de8a437c132321e9138080c4c9661444fbeee561a5a54d22eb164bf395
 EBUILD wireplumber-0.4.8-r3.ebuild 3832 BLAKE2B 9ae35b177ad87113e0ebdbbe5c22f3eb5704cb6f917d5a2f26d52c04a02a6a70be1b625948ea010ece704fa90d25d7f591bd726475092694c81e03f3ffbe88b3 SHA512 0317a54de35494bb09ee011ecb15dd5ce062b9a0aeb0dce2078c5e31b2500383fb619e26e921120ebe6477bebae47f9d80b5a6e7d8e3f566003a9a81e9159b53
+EBUILD wireplumber-0.4.9.ebuild 3518 BLAKE2B 23a038f529999f541365e117265392b366ba467e9880a5d5b738a7fcac08d00a59923bee22589577f740e3eeda8d6f0e1b01b954b417e0d15f0b8e6114760749 SHA512 5e96363b6d98f45eb38665840c159a3d3c130738f93374ac62e0de0941cc9d715d46d6b57f5c5b02aa032eb4da44b3d0732daff67f1c64c1a56f2936539b0349
 EBUILD wireplumber-9999.ebuild 3518 BLAKE2B 23a038f529999f541365e117265392b366ba467e9880a5d5b738a7fcac08d00a59923bee22589577f740e3eeda8d6f0e1b01b954b417e0d15f0b8e6114760749 SHA512 5e96363b6d98f45eb38665840c159a3d3c130738f93374ac62e0de0941cc9d715d46d6b57f5c5b02aa032eb4da44b3d0732daff67f1c64c1a56f2936539b0349
 MISC metadata.xml 803 BLAKE2B d05f76db401a8f71c5c1504d17dd8c0a87686f4b0ab2da450a47f71b1a15eeee2aef17107a3a987af70a097c3004c582fdda4c46e37c89466bfb470d032446dd SHA512 cfa42b1862175344b23fe65fb97d86783ded19352988790aefc6a062da212423dd81d8147525e4256025cdcfc6850909ca61d77d6b4243add0a3339b2eb319ee
diff --git a/media-video/wireplumber/wireplumber-0.4.9.ebuild b/media-video/wireplumber/wireplumber-0.4.9.ebuild
new file mode 100644
index 000000000000..2e425ab4a17e
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.9.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+IUSE="elogind system-service systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+	system-service? ( systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.45:=
+	virtual/libc
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+# Any dev-lua/* deps get declared like this inside RDEPEND:
+#	$(lua_gen_cond_dep '
+#		dev-lua/<NAME>[${LUA_USEDEP}]
+#	')
+RDEPEND="${DEPEND}
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+"
+
+DOCS=( {NEWS,README}.rst )
+
+src_configure() {
+	local emesonargs=(
+		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Dintrospection=disabled # Only used for Sphinx doc generation
+		-Dsystem-lua=true # We always unbundle everything we can
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		$(meson_use system-service systemd-system-service)
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# We copy the default config, so that Gentoo tools can pick up on any
+	# updates and /etc does not end up with stale overrides.
+	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
+	# will not actually get stored twice until modified.
+	insinto /etc
+	doins -r ${ED}/usr/share/wireplumber
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable pipewire-media-session.service"
+		ewarn "systemctl --user --force enable wireplumber.service"
+	else
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
+	fi
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}