gentoo auto-resync : 10:05:2024 - 00:01:13

3 files changed, 32 insertions, 30 deletions

diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 29adc7aba914..39e4519b9216 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -3,6 +3,6 @@ AUX wireplumber-0.4.81-config-disable-sound-server-parts.patch 906 BLAKE2B 9373b
 DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8
 DIST wireplumber-0.5.2.tar.bz2 408788 BLAKE2B 51a9c0268212b353b54099d2d57fd93dec5b42d4ec3151f93b4ebd4df3f4478a19858ec8302af58558a9387afa647a00a0872d471f0f2ea5e681978afbdcf553 SHA512 4cd2949739b8af86f73e072fe8c1d8606fa9be77b6e109aa0825d516f11953c4811ae1162da07ae245f7039f4243d01c43b8e9c083d4e0be1066b180484abbfb
 EBUILD wireplumber-0.4.17-r1.ebuild 3785 BLAKE2B c6108e4a024cb00a63bcc82a215fc80b6fe106903339e892416a017bc6d607d7bfb268a305b30e82988f2dcda793ecfd8fcc4e15d2691b8a6ba248e93e72916a SHA512 4bcda3c48ba1a23f61f6678e26eb420aeb057c193cc61ba5d65cbf560e5d292fe4dbd7dddc8fa7bf1d6f190a6297d4969961b8358707707d6a067e58feb94f89
-EBUILD wireplumber-0.5.2.ebuild 3793 BLAKE2B b3632f12b90b1049751b866eca67c370b0ed064384c8d45396b30d5c4b2f9a317cee81ad32eea178e328fa1f1ec628dc713a2224c2a8da38539aa6e3254eadcb SHA512 524b7a5d50a395e9c202d700debc27788c76497c5430eeb80a0742b09f9145220acfb766bae3cbff33d08659b2f627bbe594bb5d339d56d6e147fde30408fe65
-EBUILD wireplumber-9999.ebuild 3793 BLAKE2B b3632f12b90b1049751b866eca67c370b0ed064384c8d45396b30d5c4b2f9a317cee81ad32eea178e328fa1f1ec628dc713a2224c2a8da38539aa6e3254eadcb SHA512 524b7a5d50a395e9c202d700debc27788c76497c5430eeb80a0742b09f9145220acfb766bae3cbff33d08659b2f627bbe594bb5d339d56d6e147fde30408fe65
+EBUILD wireplumber-0.5.2.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
+EBUILD wireplumber-9999.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.5.2.ebuild b/media-video/wireplumber/wireplumber-0.5.2.ebuild
index 21dc5de57874..ea1b71883dbb 100644
--- a/media-video/wireplumber/wireplumber-0.5.2.ebuild
+++ b/media-video/wireplumber/wireplumber-0.5.2.ebuild
@@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} )
 
 inherit lua-single meson systemd
 
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
 	EGIT_BRANCH="master"
@@ -23,9 +26,6 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
 LICENSE="MIT"
 SLOT="0/0.5"
 IUSE="elogind system-service systemd test"
@@ -46,7 +46,6 @@ BDEPEND="
 	sys-devel/gettext
 	test? ( sys-apps/dbus )
 "
-
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.68
@@ -55,12 +54,8 @@ DEPEND="
 	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}
+RDEPEND="
+	${DEPEND}
 	system-service? (
 		acct-user/pipewire
 		acct-group/pipewire
@@ -70,7 +65,10 @@ RDEPEND="${DEPEND}
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	# Defer enabling sound server parts to media-video/pipewire
+	# TODO: Soon, we should be able to migrate to just a dropin at
+	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
 )
 
 src_configure() {
@@ -78,9 +76,11 @@ src_configure() {
 		-Ddaemon=true
 		-Dtools=true
 		-Dmodules=true
-		-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
+		# Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Ddoc=disabled
+		# Only used for Sphinx doc generation
+		-Dintrospection=disabled
+		-Dsystem-lua=true
 		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
 		$(meson_feature elogind)
 		$(meson_feature systemd)
@@ -109,6 +109,7 @@ pkg_postinst() {
 		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"
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 21dc5de57874..ea1b71883dbb 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} )
 
 inherit lua-single meson systemd
 
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
 	EGIT_BRANCH="master"
@@ -23,9 +26,6 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
 LICENSE="MIT"
 SLOT="0/0.5"
 IUSE="elogind system-service systemd test"
@@ -46,7 +46,6 @@ BDEPEND="
 	sys-devel/gettext
 	test? ( sys-apps/dbus )
 "
-
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.68
@@ -55,12 +54,8 @@ DEPEND="
 	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}
+RDEPEND="
+	${DEPEND}
 	system-service? (
 		acct-user/pipewire
 		acct-group/pipewire
@@ -70,7 +65,10 @@ RDEPEND="${DEPEND}
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	# Defer enabling sound server parts to media-video/pipewire
+	# TODO: Soon, we should be able to migrate to just a dropin at
+	# /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735.
+	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch
 )
 
 src_configure() {
@@ -78,9 +76,11 @@ src_configure() {
 		-Ddaemon=true
 		-Dtools=true
 		-Dmodules=true
-		-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
+		# Ebuild not wired up yet (Sphinx, Doxygen?)
+		-Ddoc=disabled
+		# Only used for Sphinx doc generation
+		-Dintrospection=disabled
+		-Dsystem-lua=true
 		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
 		$(meson_feature elogind)
 		$(meson_feature systemd)
@@ -109,6 +109,7 @@ pkg_postinst() {
 		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"