Fixed scons dependency (closes bug 131454); version bump for netjack.

Package-Manager: portage-2.1.1_pre2-r4

3 files changed, 176 insertions, 5 deletions

diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 5cc470a48532..78a212563806 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -33,14 +33,19 @@ AUX jack-audio-connection-kit-transport.patch 309 RMD160 7b7130dd922ed14988eb591
 MD5 8e9c72734364a9d7e4a6d781e13beec8 files/jack-audio-connection-kit-transport.patch 309
 RMD160 7b7130dd922ed14988eb591059d643ece39f6757 files/jack-audio-connection-kit-transport.patch 309
 SHA256 74f1d155f365deb1461d070b37ccd7836c32c521d31960a3f4e6c3f2e528bada files/jack-audio-connection-kit-transport.patch 309
-DIST jack-audio-connection-kit-0.100.7.tar.gz 2119224 RMD160 f445d8c40fa88e21500082ad2b5c60aafb925bd6 SHA256 fd8e5ce630002a08200fdb0e7ca098c4a25b9052b4ed8219845b22091db50fa8
+DIST jack-audio-connection-kit-0.100.7.tar.gz 2119224 RMD160 f445d8c40fa88e21500082ad2b5c60aafb925bd6 SHA1 55b7444058de0be3c647782f359b02a8f618b39b SHA256 fd8e5ce630002a08200fdb0e7ca098c4a25b9052b4ed8219845b22091db50fa8
 DIST jack-audio-connection-kit-0.101.1.tar.gz 724598 RMD160 54bcb565419f032715a90ff79b056003e2fe7fef SHA1 0cd4c82402c944df83bad7110128020dad4772bc SHA256 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533
 DIST jack-audio-connection-kit-0.99.0.tar.gz 722399
 DIST netjack-0.11rc2.tar.bz2 23207 RMD160 8f29b9e9923dde990e3d9b950376ea0298329ed5 SHA1 a031ae8cc55fdb0c43c9cc90150d5fd91a3da840 SHA256 c934521cfb1c85c83411e05ed453d81fc26f690527627c5a7d7a576bcc90fa3c
+DIST netjack-0.12rc1.tar.bz2 25634 RMD160 4d41929aedb80a64964641f0de1e6a806b071015 SHA1 489b91ac0ef9e2b16c5f9698396585e566ec072e SHA256 631ffe87f3631495bde730069b2529da668ab5993d6574dafbb60e50b5b9497e
 EBUILD jack-audio-connection-kit-0.100.7-r2.ebuild 3792 RMD160 4f6b9b7898d806a51a0fc72db8ae8ec7d1fdd997 SHA1 e9a777aead257fbe3efb376ca7312e1c6a78e556 SHA256 87116ad6527465e7340d61d3da8836b5c76e503e10a778dfa958471ed0908e25
 MD5 92212e7fcc2ca7e51a805b960ff489be jack-audio-connection-kit-0.100.7-r2.ebuild 3792
 RMD160 4f6b9b7898d806a51a0fc72db8ae8ec7d1fdd997 jack-audio-connection-kit-0.100.7-r2.ebuild 3792
 SHA256 87116ad6527465e7340d61d3da8836b5c76e503e10a778dfa958471ed0908e25 jack-audio-connection-kit-0.100.7-r2.ebuild 3792
+EBUILD jack-audio-connection-kit-0.101.1-r1.ebuild 3900 RMD160 847e84f2a0efda1c4fc0fd4bc39a6a2df7ec4ae9 SHA1 f9725f7f565eac4038b8ca7aa421ef228598c443 SHA256 d00cfafd2e325a0f4c5e6c4ddbd255eb98e47bbb9be587b3223365334f9e8840
+MD5 9f6c450b85e890ea9281329b91f06bf0 jack-audio-connection-kit-0.101.1-r1.ebuild 3900
+RMD160 847e84f2a0efda1c4fc0fd4bc39a6a2df7ec4ae9 jack-audio-connection-kit-0.101.1-r1.ebuild 3900
+SHA256 d00cfafd2e325a0f4c5e6c4ddbd255eb98e47bbb9be587b3223365334f9e8840 jack-audio-connection-kit-0.101.1-r1.ebuild 3900
 EBUILD jack-audio-connection-kit-0.101.1.ebuild 3749 RMD160 603d2c827eba02b259b50ea1e253855c1fba64ac SHA1 b08521087107d7e736f5b58f18dbabb5dbf6241e SHA256 bba12d00fbde04822cd78ab7bdfab1edba5e28f1d69435089e414274217ef704
 MD5 1f94b393cd55baed424deaa3d2edef3f jack-audio-connection-kit-0.101.1.ebuild 3749
 RMD160 603d2c827eba02b259b50ea1e253855c1fba64ac jack-audio-connection-kit-0.101.1.ebuild 3749
@@ -71,6 +76,9 @@ SHA256 27e060bebeef7d7def2381ccdd992e768fad059f349dee1a1528637d187e5853 files/di
 MD5 db90b5d0aaf0ccb4ca368663f175185b files/digest-jack-audio-connection-kit-0.101.1 548
 RMD160 dd7019233e6c30c29752c1793d8c3328738d08ea files/digest-jack-audio-connection-kit-0.101.1 548
 SHA256 3f0711badc55165770ec947e38d180d0cbaed09f813067e0a5a504e0d1cf2bce files/digest-jack-audio-connection-kit-0.101.1 548
+MD5 30000081e16205caa955f5985c5608a6 files/digest-jack-audio-connection-kit-0.101.1-r1 548
+RMD160 3c71125a686b8a1ff2bcfbf31c92cf4fb7dcf282 files/digest-jack-audio-connection-kit-0.101.1-r1 548
+SHA256 d2578952da3c148173e19902d72835c0df6ee99802dc60dc753e9a4253bb519d files/digest-jack-audio-connection-kit-0.101.1-r1 548
 MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84
 RMD160 50b3c2bd1e9091937b776dbac651947ae1aa50c4 files/digest-jack-audio-connection-kit-0.99.0-r1 84
 SHA256 488972326ad883aaff81ae045429f986515c0db45bc90c91a22f2e279d940eef files/digest-jack-audio-connection-kit-0.99.0-r1 84
@@ -81,9 +89,9 @@ MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99
 RMD160 50b3c2bd1e9091937b776dbac651947ae1aa50c4 files/digest-jack-audio-connection-kit-0.99.0-r3 84
 SHA256 488972326ad883aaff81ae045429f986515c0db45bc90c91a22f2e279d940eef files/digest-jack-audio-connection-kit-0.99.0-r3 84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEjHpYT+MN7JbqCpMRAhAoAKCAuMpDFID/oaUSUok8CN5if/9NAwCgi0tv
-P6yOvDwP17fl95NSd8YB4Y8=
-=ePsq
+iD8DBQFEr9iOvpz1081QvMkRAjw6AJ94mz6gDPcWjfeK1mB0ciPHt1Zg7QCfbiCR
+6+hyBXnDgeQiCtdMSxP30N0=
+=ZqaI
 -----END PGP SIGNATURE-----
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.101.1-r1 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.101.1-r1
new file mode 100644
index 000000000000..fa4f3dc91e2e
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.101.1-r1
@@ -0,0 +1,6 @@
+MD5 bb25f7c1da5d488b70edcf39ff5a39b2 jack-audio-connection-kit-0.101.1.tar.gz 724598
+RMD160 54bcb565419f032715a90ff79b056003e2fe7fef jack-audio-connection-kit-0.101.1.tar.gz 724598
+SHA256 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533 jack-audio-connection-kit-0.101.1.tar.gz 724598
+MD5 0f09c9f641609c71ca24a3b9b337a017 netjack-0.12rc1.tar.bz2 25634
+RMD160 4d41929aedb80a64964641f0de1e6a806b071015 netjack-0.12rc1.tar.bz2 25634
+SHA256 631ffe87f3631495bde730069b2529da668ab5993d6574dafbb60e50b5b9497e netjack-0.12rc1.tar.bz2 25634
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild
new file mode 100644
index 000000000000..d6e8f6f7a1ec
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild,v 1.1 2006/07/08 16:08:25 fvdpol Exp $
+
+inherit flag-o-matic eutils multilib
+
+NETJACK=netjack-0.12rc1
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/${NETJACK}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc-macos ~sh ~x86"
+IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack"
+
+RDEPEND="dev-util/pkgconfig
+	sndfile? ( >=media-libs/libsndfile-1.0.0 )
+	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
+	portaudio? ( =media-libs/portaudio-18* )
+	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+	!media-sound/jack-cvs"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	netjack? ( dev-util/scons )"
+
+
+pkg_setup() {
+	if ! use sndfile ; then
+		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
+	fi
+
+	if use caps; then
+		if [[ "${KV:0:3}" == "2.4" ]]; then
+			einfo "will build jackstart for 2.4 kernel"
+		else
+			einfo "using compatibility symlink for jackstart"
+		fi
+	fi
+
+	if use netjack; then
+		einfo "including support for experimental netjack, see http://netjack.sourceforge.net/"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	use netjack && unpack ${NETJACK}.tar.bz2
+	cd ${S}
+
+	# the docs option is in upstream, I'll leave the pentium2 foobage
+	# for the x86 folks...... kito@gentoo.org
+
+	# Add doc option and fix --march=pentium2 in caps test
+	#epatch ${FILESDIR}/${PN}-doc-option.patch
+
+	# compile and install jackstart, see #92895, #94887
+	#if use caps ; then
+	#	epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch
+	#fi
+
+	epatch ${FILESDIR}/${PN}-transport.patch
+	epatch ${FILESDIR}/${PN}-mmap_complex.patch
+}
+
+src_compile() {
+	local myconf
+
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
+
+	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
+
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	else
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
+
+	if use userland_Darwin ; then
+		append-flags -fno-common
+		use altivec && append-flags -force_cpusubtype_ALL \
+			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
+	fi
+
+	use sndfile && \
+		export SNDFILE_CFLAGS="-I/usr/include" \
+		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable doc html-docs) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable sse) $(use_enable sse dynsimd) \
+		--with-pic \
+		${myconf} || die "configure failed"
+	emake || die "compilation failed"
+
+	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
+		einfo "Building jackstart for 2.4 kernel"
+		cd ${S}/jackd
+		emake jackstart || die "jackstart build failed."
+	fi
+
+	if use netjack; then
+		cd ${WORKDIR}/${NETJACK}
+		scons jack_source_dir=${S}
+	fi
+
+}
+
+src_install() {
+	make DESTDIR=${D} datadir=/usr/share/doc install || die
+
+	if use caps; then
+		if [[ "${KV:0:3}" == "2.4" ]]; then
+			cd ${S}/jackd
+			dobin jackstart
+		else
+			dosym /usr/bin/jackd /usr/bin/jackstart
+		fi
+	fi
+
+	if ! use jack-tmpfs; then
+		keepdir /var/run/jack
+		chmod 4777 ${D}/var/run/jack
+	fi
+
+	if use doc; then
+		mv ${D}/usr/share/doc/${PF}/reference/html \
+		   ${D}/usr/share/doc/${PF}/
+
+		insinto /usr/share/doc/${PF}
+		doins -r ${S}/example-clients
+	else
+		rm -rf ${D}/usr/share/doc
+	fi
+
+	rm -rf ${D}/usr/share/doc/${PF}/reference
+
+	if use netjack; then
+		cd ${WORKDIR}/${NETJACK}
+		dobin alsa_in
+		dobin alsa_out
+		dobin jacknet_client
+		insinto /usr/lib/jack
+		doins jack_net.so
+	fi
+}