| 1 |
commit: 23b43634f4e6670b3fa15e0393cc3992b4a2e27b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 4 18:40:15 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 4 18:44:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b43634 |
| 7 |
|
| 8 |
media-sound/jack2: Fix JACK1 blocker to actually work |
| 9 |
|
| 10 |
JACK2 and JACK1 obviously collide when installed, that is at *runtime*. |
| 11 |
Adding a pure *build-time* blocker makes no sense, and does not allow |
| 12 |
Portage to ignore the file collisions. |
| 13 |
|
| 14 |
media-sound/jack2/jack2-1.9.10.ebuild | 6 +++--- |
| 15 |
media-sound/jack2/jack2-1.9.11_rc1.ebuild | 6 +++--- |
| 16 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.10.ebuild |
| 19 |
index 0b0f6eeb9dc..e14f43d964f 100644 |
| 20 |
--- a/media-sound/jack2/jack2-1.9.10.ebuild |
| 21 |
+++ b/media-sound/jack2/jack2-1.9.10.ebuild |
| 22 |
@@ -40,13 +40,13 @@ CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}] |
| 23 |
sys-apps/dbus[${MULTILIB_USEDEP}] |
| 24 |
) |
| 25 |
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" |
| 26 |
-DEPEND="!media-sound/jack-audio-connection-kit:0 |
| 27 |
- ${CDEPEND} |
| 28 |
+DEPEND="${CDEPEND} |
| 29 |
virtual/pkgconfig |
| 30 |
doc? ( app-doc/doxygen )" |
| 31 |
RDEPEND="${CDEPEND} |
| 32 |
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
| 33 |
- pam? ( sys-auth/realtime-base )" |
| 34 |
+ pam? ( sys-auth/realtime-base ) |
| 35 |
+ !media-sound/jack-audio-connection-kit:0" |
| 36 |
|
| 37 |
[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}" |
| 38 |
|
| 39 |
|
| 40 |
diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild |
| 41 |
index 639590a6d07..4f0738fc56c 100644 |
| 42 |
--- a/media-sound/jack2/jack2-1.9.11_rc1.ebuild |
| 43 |
+++ b/media-sound/jack2/jack2-1.9.11_rc1.ebuild |
| 44 |
@@ -39,13 +39,13 @@ CDEPEND="media-libs/libsamplerate |
| 45 |
sys-apps/dbus[${MULTILIB_USEDEP}] |
| 46 |
) |
| 47 |
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" |
| 48 |
-DEPEND="!media-sound/jack-audio-connection-kit:0 |
| 49 |
- ${CDEPEND} |
| 50 |
+DEPEND="${CDEPEND} |
| 51 |
virtual/pkgconfig |
| 52 |
doc? ( app-doc/doxygen )" |
| 53 |
RDEPEND="${CDEPEND} |
| 54 |
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
| 55 |
- pam? ( sys-auth/realtime-base )" |
| 56 |
+ pam? ( sys-auth/realtime-base ) |
| 57 |
+ !media-sound/jack-audio-connection-kit:0" |
| 58 |
|
| 59 |
DOCS=( ChangeLog README README_NETJACK2 TODO ) |
Archives