commit: 0fbec3a0d5d059d244cc6e383e28daadeb226092 Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com> AuthorDate: Fri Feb 18 19:21:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 21 00:42:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fbec3a0
media-libs/pulseaudio: Allow pulseaudio-daemon if required Some packages would require actual pulseaudio daemon, allow these to depend on media-sound/pulseaudio-daemon Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../cadence/{cadence-0.9.1.ebuild => cadence-0.9.1-r1.ebuild} | 4 ++-- media-sound/paprefs/{paprefs-1.2.ebuild => paprefs-1.2-r1.ebuild} | 2 +- .../{pulseaudio-ctl-1.70.ebuild => pulseaudio-ctl-1.70-r1.ebuild} | 4 ++-- ...-modules-bt-1.4-r2.ebuild => pulseaudio-modules-bt-1.4-r3.ebuild} | 5 ++++- net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1-r1.ebuild similarity index 94% rename from media-sound/cadence/cadence-0.9.1.ebuild rename to media-sound/cadence/cadence-0.9.1-r1.ebuild index b58caa5bcf98..a7de1a49fe15 100644 --- a/media-sound/cadence/cadence-0.9.1.ebuild +++ b/media-sound/cadence/cadence-0.9.1-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 @@ -34,7 +34,7 @@ CDEPEND=" media-sound/jack_capture virtual/jack a2jmidid? ( media-sound/a2jmidid[dbus] ) - pulseaudio? ( media-sound/pulseaudio[jack] ) + pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] media-sound/pulseaudio[daemon(+),jack] ) ) " RDEPEND="${CDEPEND}" DEPEND="${CDEPEND}" diff --git a/media-sound/paprefs/paprefs-1.2.ebuild b/media-sound/paprefs/paprefs-1.2-r1.ebuild similarity index 90% rename from media-sound/paprefs/paprefs-1.2.ebuild rename to media-sound/paprefs/paprefs-1.2-r1.ebuild index 0e6bd7270503..299081971142 100644 --- a/media-sound/paprefs/paprefs-1.2.ebuild +++ b/media-sound/paprefs/paprefs-1.2-r1.ebuild @@ -17,7 +17,7 @@ RDEPEND="dev-cpp/atkmm:0 dev-cpp/gtkmm:3.0 dev-libs/glib:2 dev-libs/libsigc++:2 - media-sound/pulseaudio[glib] + || ( media-sound/pulseaudio-daemon[glib] media-sound/pulseaudio[daemon(+),glib] ) x11-libs/gtk+:3 || ( x11-themes/tango-icon-theme diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild similarity index 82% rename from media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild rename to media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild index fc2d4914d693..757d436aadd5 100644 --- a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild +++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ IUSE="" # Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify # in both cases they should be already present if DE supports them -RDEPEND="media-sound/pulseaudio" +RDEPEND="|| ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )" src_install() { emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r3.ebuild similarity index 94% rename from media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild rename to media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r3.ebuild index 5ce55a2c7a12..f40fc7b8e73d 100644 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r3.ebuild @@ -26,7 +26,10 @@ DEPEND=" >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 ofono-headset? ( >=net-misc/ofono-1.13 ) - >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth,daemon(+)] + || ( + >=media-sound/pulseaudio-daemon-${PULSE_VER}[-bluetooth] + >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth,daemon(+)] + ) !media-sound/pulseaudio[bluetooth] " # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead. diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild index d314e16809df..6fc29c68a643 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-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 @@ -56,7 +56,7 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - media-sound/pulseaudio" + || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )" python_prepare_all() { sed -i '/dbus-python/d' setup.py || die