From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 4 Sep 2017 18:40:15 +0000 (+0200)
Subject: media-sound/jack2: Fix JACK1 blocker to actually work
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=23b43634f4e6670b3fa15e0393cc3992b4a2e27b;p=gentoo.git

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.
---

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 )