[proaudio] [1358] make jack-audio-connection-kit-9999 PDEPEND on jackdmp if USE= jackdmp is set, and jackdmp DEPEND on jack-audio-connection-kit-9999[ jackdmp] - this way switching from jack to jackdmp works correctly w/ o collisions

[subversion@xxxxxxxxxxxxx]

Revision: 1358
Author:   gimpel
Date:     2008-11-12 18:38:20 +0100 (Wed, 12 Nov 2008)

Log Message:
-----------
make jack-audio-connection-kit-9999 PDEPEND on jackdmp if USE=jackdmp is set, and jackdmp DEPEND on jack-audio-connection-kit-9999[jackdmp] - this way switching from jack to jackdmp works correctly w/o collisions

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
    trunk/overlays/proaudio/media-sound/jackdmp/Manifest
    trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild


Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-11-12 15:00:57 UTC (rev 1357)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-11-12 17:38:20 UTC (rev 1358)
@@ -13,6 +13,6 @@
 EBUILD jack-audio-connection-kit-0.101.1.ebuild 3918 RMD160 d3681a610e4df228d8b9b49f8603d48d7546e99e SHA1 525499a53d01a8abd341735430dd33ec5d113a8c SHA256 782cf56e5b4d64e7e630075e32a1d726b9fa54bb0d0507d0c19b744988229964
 EBUILD jack-audio-connection-kit-0.102.20.ebuild 3922 RMD160 bf4f8285bf04df57e294d9912fb89ba076629846 SHA1 a89a307dd4562bd0647feb5424c6516be0117c92 SHA256 af8ba1b48c6cac09e0e5da8b8544f45aaf76be831b457aea75d8300d711b9e17
 EBUILD jack-audio-connection-kit-0.109.2-r2.ebuild 4769 RMD160 0da7e08bf67145fc6f3b3379c463e32dc75eb04b SHA1 65f27fc56207e67716a57b566daf3d6184ba1a52 SHA256 d2cfa38406eb3ed863232c565abf6127984b59520ad1d9e00b4e0ca72aa1d972
-EBUILD jack-audio-connection-kit-9999.ebuild 5432 RMD160 052b707d0a33b92e9d5fa6900e694ebaed922901 SHA1 0bd711c9278713fe8f49cc3c4fbed0b9367ba332 SHA256 17627d0d192fdcc3d2ac8ef7c014fa6e2a8400e42f3dd095d58ac172fba28d8b
+EBUILD jack-audio-connection-kit-9999.ebuild 5442 RMD160 e6a376b359709e3c232a55762b4d781570203b23 SHA1 bd2fe96a60e2ceefb895c3365fd496d15a7362cc SHA256 88cef3c363f9a0e51c2220d96dcebd86ddeed98e9822df05dcae5dabb579d44b
 MISC ChangeLog 3423 RMD160 2c5ea72de2649a28f68b0ef8abd8c99da641b194 SHA1 5f64004855fd625db84684754d41d4e50a98df95 SHA256 0ca0032297bd559145323abcbef356baf75567f0dc1d52a75e9e289225017960
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-11-12 15:00:57 UTC (rev 1357)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-11-12 17:38:20 UTC (rev 1358)
@@ -10,11 +10,10 @@
 RESTRICT="nostrip nomirror"
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="
-    netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
-	!jackdmp? (
-	dbus? ( http://download.tuxfamily.org/proaudio/distfiles/${JACKDBUS} )
-	)"
+SRC_URI="!jackdmp? ( 
+			netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
+			dbus? ( http://download.tuxfamily.org/proaudio/distfiles/${JACKDBUS} )
+		)"
 
 ESVN_REPO_URI="http://subversion.jackaudio.org/jack/trunk/jack";
 
@@ -24,8 +23,7 @@
 IUSE="3dnow altivec alsa caps coreaudio cpudetection dbus doc debug jack-tmpfs
 mmx oss portaudio sse netjack freebob ieee1394 jackdmp"
 
-RDEPEND="jackdmp? ( >=media-sound/jackdmp-9999-r1 )
-	!jackdmp? ( 
+RDEPEND="!jackdmp? ( 
 	>=media-libs/libsndfile-1.0.0
 	sys-libs/ncurses
 	caps? ( sys-libs/libcap )
@@ -43,6 +41,7 @@
 	doc? ( app-doc/doxygen )
 	netjack? ( dev-util/scons )
 	)"
+PDEPEND="jackdmp? ( >=media-sound/jackdmp-9999-r1 )"
 
 pkg_setup() {
 	if use jackdmp; then

Modified: trunk/overlays/proaudio/media-sound/jackdmp/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jackdmp/Manifest	2008-11-12 15:00:57 UTC (rev 1357)
+++ trunk/overlays/proaudio/media-sound/jackdmp/Manifest	2008-11-12 17:38:20 UTC (rev 1358)
@@ -1,3 +1,3 @@
-EBUILD jackdmp-9999-r1.ebuild 1115 RMD160 e576a0ab72affe1293a6abba9955875ae5a6934d SHA1 f1f3747eeb55ec99c4b64ffd324943d5ed560f42 SHA256 735c735754955985b8d9b0692bba781f700b86f31af1dc59a13151cf342d0ce7
+EBUILD jackdmp-9999-r1.ebuild 1144 RMD160 e28ae2199bfddd8cbe6b2cc4a590d216677b0725 SHA1 8560aff38102d7883a4223157689445d508b2f1d SHA256 ee1a8774708f9528255f4d99fd67e1f6364a5c6ca5f833b9b1e9dd2916dff246
 MISC ChangeLog 530 RMD160 cd6e900309b1c942e45056e4d8813f00a7a43ca1 SHA1 5f086b875249267dbdb7ab556a6fa953221c52f0 SHA256 786fcb469a441fb495cf451b01a6434664fbac135d75a34f65211492f64b14ba
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild	2008-11-12 15:00:57 UTC (rev 1357)
+++ trunk/overlays/proaudio/media-sound/jackdmp/jackdmp-9999-r1.ebuild	2008-11-12 17:38:20 UTC (rev 1358)
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit subversion flag-o-matic 
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
@@ -20,10 +22,10 @@
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	doc? ( app-doc/doxygen )
-	dbus? ( sys-apps/dbus )"
-PDEPEND="=media-sound/jack-audio-connection-kit-9999"
+	dbus? ( sys-apps/dbus )
+	=media-sound/jack-audio-connection-kit-9999[jackdmp]"
 
-src_compile() {
+src_configure() {
 	local myconf="--prefix=/usr --destdir=${D}"
 	use dbus && myconf="${myconf} --dbus"
 	use doc && myconf="${myconf} --doxygen"
@@ -31,6 +33,9 @@
 	
 	einfo "Running \"/waf configure ${myconf}\" ..."
 	./waf configure ${myconf} || die "waf configure failed"
+}
+
+src_compile() {
 	./waf build || die "waf build failed"
 }