| 1 |
commit: c02e54298a283a491ec77afeb3a5656fe17c9312 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 22:21:29 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 03:14:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02e5429 |
| 7 |
|
| 8 |
media-sound/jack2: fix systemd automagic |
| 9 |
|
| 10 |
libsystemd is only optionally used by the classic daemon, |
| 11 |
so no multilib needed |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
media-sound/jack2/{jack2-1.9.21.ebuild => jack2-1.9.21-r1.ebuild} | 6 ++++-- |
| 16 |
media-sound/jack2/jack2-9999.ebuild | 6 ++++-- |
| 17 |
2 files changed, 8 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/jack2/jack2-1.9.21.ebuild b/media-sound/jack2/jack2-1.9.21-r1.ebuild |
| 20 |
similarity index 93% |
| 21 |
rename from media-sound/jack2/jack2-1.9.21.ebuild |
| 22 |
rename to media-sound/jack2/jack2-1.9.21-r1.ebuild |
| 23 |
index 4ed7d3847d9c..638893912fc3 100644 |
| 24 |
--- a/media-sound/jack2/jack2-1.9.21.ebuild |
| 25 |
+++ b/media-sound/jack2/jack2-1.9.21-r1.ebuild |
| 26 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/" |
| 27 |
|
| 28 |
LICENSE="GPL-2+ LGPL-2.1+" |
| 29 |
SLOT="2" |
| 30 |
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools" |
| 31 |
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd" |
| 32 |
REQUIRED_USE=" |
| 33 |
${PYTHON_REQUIRED_USE} |
| 34 |
|| ( classic dbus )" |
| 35 |
@@ -34,7 +34,8 @@ DEPEND=" |
| 36 |
libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) |
| 37 |
ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) |
| 38 |
metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] ) |
| 39 |
- opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" |
| 40 |
+ opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] ) |
| 41 |
+ systemd? ( classic? ( sys-apps/systemd:= ) )" |
| 42 |
RDEPEND=" |
| 43 |
${DEPEND} |
| 44 |
dbus? ( |
| 45 |
@@ -83,6 +84,7 @@ multilib_src_configure() { |
| 46 |
--opus=$(usex opus) |
| 47 |
--portaudio=no |
| 48 |
--samplerate=$(usex libsamplerate) |
| 49 |
+ --systemd=$(multilib_native_usex systemd $(usex classic)) |
| 50 |
--winmme=no |
| 51 |
|
| 52 |
# obsolete options, migrated to media-sound/jack-example-tools |
| 53 |
|
| 54 |
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild |
| 55 |
index 49be304b89f7..921a47e80ec9 100644 |
| 56 |
--- a/media-sound/jack2/jack2-9999.ebuild |
| 57 |
+++ b/media-sound/jack2/jack2-9999.ebuild |
| 58 |
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/" |
| 59 |
|
| 60 |
LICENSE="GPL-2+ LGPL-2.1+" |
| 61 |
SLOT="2" |
| 62 |
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools" |
| 63 |
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd" |
| 64 |
REQUIRED_USE=" |
| 65 |
${PYTHON_REQUIRED_USE} |
| 66 |
|| ( classic dbus )" |
| 67 |
@@ -34,7 +34,8 @@ DEPEND=" |
| 68 |
libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) |
| 69 |
ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) |
| 70 |
metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] ) |
| 71 |
- opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" |
| 72 |
+ opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] ) |
| 73 |
+ systemd? ( classic? ( sys-apps/systemd:= ) )" |
| 74 |
RDEPEND=" |
| 75 |
${DEPEND} |
| 76 |
dbus? ( |
| 77 |
@@ -83,6 +84,7 @@ multilib_src_configure() { |
| 78 |
--opus=$(usex opus) |
| 79 |
--portaudio=no |
| 80 |
--samplerate=$(usex libsamplerate) |
| 81 |
+ --systemd=$(multilib_native_usex systemd $(usex classic)) |
| 82 |
--winmme=no |
| 83 |
) |
Archives