[gentoo-commits] repo/gentoo:master commit in: media-sound/jack2/

[Ionen Wolkens]

commit:     c02e54298a283a491ec77afeb3a5656fe17c9312
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 22:21:29 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 03:14:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02e5429

media-sound/jack2: fix systemd automagic

libsystemd is only optionally used by the classic daemon,
so no multilib needed

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-sound/jack2/{jack2-1.9.21.ebuild => jack2-1.9.21-r1.ebuild} | 6 ++++--
 media-sound/jack2/jack2-9999.ebuild                               | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/media-sound/jack2/jack2-1.9.21.ebuild 
b/media-sound/jack2/jack2-1.9.21-r1.ebuild
similarity index 93%
rename from media-sound/jack2/jack2-1.9.21.ebuild
rename to media-sound/jack2/jack2-1.9.21-r1.ebuild
index 4ed7d3847d9c..638893912fc3 100644
--- a/media-sound/jack2/jack2-1.9.21.ebuild
+++ b/media-sound/jack2/jack2-1.9.21-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/";
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools 
systemd"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
        || ( classic dbus )"
@@ -34,7 +34,8 @@ DEPEND="
        libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
        ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
        metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-       opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+       opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+       systemd? ( classic? ( sys-apps/systemd:= ) )"
 RDEPEND="
        ${DEPEND}
        dbus? (
@@ -83,6 +84,7 @@ multilib_src_configure() {
                --opus=$(usex opus)
                --portaudio=no
                --samplerate=$(usex libsamplerate)
+               --systemd=$(multilib_native_usex systemd $(usex classic))
                --winmme=no
 
                # obsolete options, migrated to media-sound/jack-example-tools

diff --git a/media-sound/jack2/jack2-9999.ebuild 
b/media-sound/jack2/jack2-9999.ebuild
index 49be304b89f7..921a47e80ec9 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/";
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools 
systemd"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}
        || ( classic dbus )"
@@ -34,7 +34,8 @@ DEPEND="
        libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
        ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
        metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-       opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+       opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+       systemd? ( classic? ( sys-apps/systemd:= ) )"
 RDEPEND="
        ${DEPEND}
        dbus? (
@@ -83,6 +84,7 @@ multilib_src_configure() {
                --opus=$(usex opus)
                --portaudio=no
                --samplerate=$(usex libsamplerate)
+               --systemd=$(multilib_native_usex systemd $(usex classic))
                --winmme=no
        )