gentoo auto-resync : 26:01:2023 - 01:54:54

4 files changed, 16 insertions, 12 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c928c92b563c..87db1f6f4857 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 35fcbdee5ee4..28d7bd0e645e 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -13,7 +13,7 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5
 DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa SHA512 0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805
 DIST pipewire-0.3.64.tar.bz2 1490475 BLAKE2B 9a4d9e23a5d60da7c5788ce5145ce083f13fe771f3f5bcb3dfd1e9560d982f20415f32f756b875081464e1b175ef80af56d7babb3bbbd7a5eaf034c9c43b810a SHA512 4dff77cf1ab9fefffad1b6f7182115dbb5e4f0339f052dcfcc34b62687b461d25a6f891d1ad0246dab5a8cb80ca190d97d358a6494da8c6a8cc64e0b38452093
 EBUILD pipewire-0.3.63-r2.ebuild 16344 BLAKE2B 2897cf44a92dc35a2444f088f3e119bfe004cdce7ed84949244477e28a6fc27a3ef1e6fec7f4f5b475c75779fd79847d4184210ad6a141d7a3d6dd80b62f2070 SHA512 ec27287f348b4989b9c0950006cb83969971c65a86698feaee983d328bf08c1478d953176f32ac1b5de815bc3ea470cd5ac048e092004f07f17052a58e3e379d
-EBUILD pipewire-0.3.64-r1.ebuild 16279 BLAKE2B 79b07015a27169d774379ec203de944fbcbac9663be63adac5e957436c713e9fb06715d45aa50ff68799e6a9fcb3d7a7776fd51dae2eb2085f7530c28ed5e956 SHA512 37d8672b9761ee6ae3defb42b01218edfac3b2e90248328ea3f37cf684ef85b96afc853085edbd02f414fdab5f5ed3f7451be4d2ef5c011370b216afb5ce75aa
+EBUILD pipewire-0.3.64-r2.ebuild 16354 BLAKE2B 84136a657c2db4e7b4e4749d3f125521779e400f3da6c7e7a33b301edfffa3c4dc694dcb73457c1d34ffc61a90ec0795a0e6307919bc5db3bc8298113be546ae SHA512 5585a237d9a7d7d933c3868beea447829a3037abcd1166719522f839875412f3984c2383131d38c1c8b6a3adcd44119eed9db084bfb316864c7fb070555a8518
 EBUILD pipewire-0.3.64.ebuild 16187 BLAKE2B f9036abc280611f3e9a82733e6f8ecdf9ec123d491f86c46734346ea3e890b19e72e0806fd532f31dbefb9fca964fb8a15a94386d85b7364cb2a30834f005459 SHA512 2311b635e07226a064c5e0ea55ea12fbe58c163dbf8813d343cadfc67f859fb32b6649bcf2134e52f5e34c6e84eaf7b3fb6e138df91442bd7ce0b4777dde6820
-EBUILD pipewire-9999.ebuild 16279 BLAKE2B 79b07015a27169d774379ec203de944fbcbac9663be63adac5e957436c713e9fb06715d45aa50ff68799e6a9fcb3d7a7776fd51dae2eb2085f7530c28ed5e956 SHA512 37d8672b9761ee6ae3defb42b01218edfac3b2e90248328ea3f37cf684ef85b96afc853085edbd02f414fdab5f5ed3f7451be4d2ef5c011370b216afb5ce75aa
+EBUILD pipewire-9999.ebuild 16354 BLAKE2B 84136a657c2db4e7b4e4749d3f125521779e400f3da6c7e7a33b301edfffa3c4dc694dcb73457c1d34ffc61a90ec0795a0e6307919bc5db3bc8298113be546ae SHA512 5585a237d9a7d7d933c3868beea447829a3037abcd1166719522f839875412f3984c2383131d38c1c8b6a3adcd44119eed9db084bfb316864c7fb070555a8518
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/pipewire-0.3.64-r1.ebuild b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
index 67d0679def54..8de21fdb95cc 100644
--- a/media-video/pipewire/pipewire-0.3.64-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
@@ -39,7 +39,7 @@ LICENSE="MIT LGPL-2.1+ GPL-2"
 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
 SLOT="0/0.4"
 IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2
-modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -72,11 +72,14 @@ BDEPEND="
 		media-gfx/graphviz
 	)
 "
+# While udev could technically be optional, it's needed for a numebr of options,
+# and not really worth it, bug #877769.
 RDEPEND="
 	acct-group/audio
 	media-libs/alsa-lib
 	sys-libs/ncurses:=[unicode(+)]
 	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
 	bluetooth? (
 		media-libs/fdk-aac
 		media-libs/libldac
@@ -123,7 +126,6 @@ RDEPEND="
 		acct-user/pipewire
 		acct-group/pipewire
 	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l )
 	X? (
 		media-libs/libcanberra
@@ -251,7 +253,7 @@ multilib_src_configure() {
 		-Dvolume=enabled # Matches upstream
 		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
 		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
+		-Dudev=enabled
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
 		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
@@ -317,11 +319,11 @@ multilib_src_install_all() {
 }
 
 pkg_postrm() {
-	use udev && udev_reload
+	udev_reload
 }
 
 pkg_postinst() {
-	use udev && udev_reload
+	udev_reload
 
 	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
 	elog "using PipeWire. Do it either manually or add yourself"
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 67d0679def54..8de21fdb95cc 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -39,7 +39,7 @@ LICENSE="MIT LGPL-2.1+ GPL-2"
 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
 SLOT="0/0.4"
 IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2
-modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -72,11 +72,14 @@ BDEPEND="
 		media-gfx/graphviz
 	)
 "
+# While udev could technically be optional, it's needed for a numebr of options,
+# and not really worth it, bug #877769.
 RDEPEND="
 	acct-group/audio
 	media-libs/alsa-lib
 	sys-libs/ncurses:=[unicode(+)]
 	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
 	bluetooth? (
 		media-libs/fdk-aac
 		media-libs/libldac
@@ -123,7 +126,6 @@ RDEPEND="
 		acct-user/pipewire
 		acct-group/pipewire
 	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l )
 	X? (
 		media-libs/libcanberra
@@ -251,7 +253,7 @@ multilib_src_configure() {
 		-Dvolume=enabled # Matches upstream
 		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
 		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
+		-Dudev=enabled
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
 		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
@@ -317,11 +319,11 @@ multilib_src_install_all() {
 }
 
 pkg_postrm() {
-	use udev && udev_reload
+	udev_reload
 }
 
 pkg_postinst() {
-	use udev && udev_reload
+	udev_reload
 
 	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
 	elog "using PipeWire. Do it either manually or add yourself"