diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-09-04 20:40:15 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-09-04 20:44:51 +0200 |
| commit | 23b43634f4e6670b3fa15e0393cc3992b4a2e27b (patch) | |
| tree | 6b610627ab46703315d1dc1512bad8d6e894b8e2 /media-sound | |
| parent | sci-chemistry/votca-ctp: add ref (diff) | |
| download | gentoo-23b43634f4e6670b3fa15e0393cc3992b4a2e27b.tar.gz gentoo-23b43634f4e6670b3fa15e0393cc3992b4a2e27b.tar.bz2 gentoo-23b43634f4e6670b3fa15e0393cc3992b4a2e27b.zip | |
media-sound/jack2: Fix JACK1 blocker to actually work
JACK2 and JACK1 obviously collide when installed, that is at *runtime*.
Adding a pure *build-time* blocker makes no sense, and does not allow
Portage to ignore the file collisions.
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/jack2/jack2-1.9.10.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/jack2/jack2-1.9.11_rc1.ebuild | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.10.ebuild index 0b0f6eeb9dc6..e14f43d964f7 100644 --- a/media-sound/jack2/jack2-1.9.10.ebuild +++ b/media-sound/jack2/jack2-1.9.10.ebuild @@ -40,13 +40,13 @@ CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}] sys-apps/dbus[${MULTILIB_USEDEP}] ) opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" -DEPEND="!media-sound/jack-audio-connection-kit:0 - ${CDEPEND} +DEPEND="${CDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen )" RDEPEND="${CDEPEND} dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - pam? ( sys-auth/realtime-base )" + pam? ( sys-auth/realtime-base ) + !media-sound/jack-audio-connection-kit:0" [[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}" diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild index 639590a6d079..4f0738fc56c4 100644 --- a/media-sound/jack2/jack2-1.9.11_rc1.ebuild +++ b/media-sound/jack2/jack2-1.9.11_rc1.ebuild @@ -39,13 +39,13 @@ CDEPEND="media-libs/libsamplerate sys-apps/dbus[${MULTILIB_USEDEP}] ) opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" -DEPEND="!media-sound/jack-audio-connection-kit:0 - ${CDEPEND} +DEPEND="${CDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen )" RDEPEND="${CDEPEND} dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - pam? ( sys-auth/realtime-base )" + pam? ( sys-auth/realtime-base ) + !media-sound/jack-audio-connection-kit:0" DOCS=( ChangeLog README README_NETJACK2 TODO ) |