Added fix to make jackstart dependent on caps flag. Thanks to Daniel Thaler <daniel@dthaler.de> for the patch. Closes bug #94887.

(Portage version: 2.0.51.22-r1)

4 files changed, 108 insertions, 9 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 4a1b829ae20a..0b15cb6a9b11 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.56 2005/06/13 03:29:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.57 2005/07/14 18:44:15 fvdpol Exp $
+
+*jack-audio-connection-kit-0.99.0-r3 (14 Jul 2005)
+
+  14 Jul 2005; Frank van de Pol <fvdpol@gentoo.org>
+  +jack-audio-connection-kit-0.99.0-r3.ebuild:
+  Added fix to make jackstart dependent on caps flag. Thanks to Daniel Thaler
+  <daniel@dthaler.de> for the patch. Closes bug #94887.
 
   13 Jun 2005; Joseph Jezak <josejx@gentoo.org>
   jack-audio-connection-kit-0.99.0-r1.ebuild:
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index f518fbcbc9a4..5bfa82d59540 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,14 +1,16 @@
-MD5 81c21a77f7752cfdf7680f0c629b62bd ChangeLog 11413
-MD5 d2217ed2dffecb4ea7852365588ec3cb jack-audio-connection-kit-0.99.0-r2.ebuild 2286
+MD5 e908ec8467eb0ced024bbb594cabebaa jack-audio-connection-kit-0.99.0-r1.ebuild 2404
+MD5 071f8bb34ccdb5f965c56a1638d1d57c jack-audio-connection-kit-0.99.0-r3.ebuild 2321
+MD5 0d56eae2a04a15dbe5e7ca024a87a097 jack-audio-connection-kit-0.80.0.ebuild 1771
 MD5 4ee3c27feb88ab9f33c934e0262fbc45 jack-audio-connection-kit-0.98.1-r1.ebuild 2116
+MD5 d2217ed2dffecb4ea7852365588ec3cb jack-audio-connection-kit-0.99.0-r2.ebuild 2286
+MD5 81c21a77f7752cfdf7680f0c629b62bd ChangeLog 11413
 MD5 bf663ce8a92c2873735ff360edf99f5a metadata.xml 220
-MD5 0d56eae2a04a15dbe5e7ca024a87a097 jack-audio-connection-kit-0.80.0.ebuild 1771
-MD5 e908ec8467eb0ced024bbb594cabebaa jack-audio-connection-kit-0.99.0-r1.ebuild 2404
-MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84
-MD5 0ad8a4c606e807460bce497d044044ef files/jack-audio-connection-kit-doc-option.patch 1103
-MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
 MD5 1081e2f37f20874fb10b5a9c183df0b4 files/digest-jack-audio-connection-kit-0.98.1-r1 84
+MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84
 MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r2 84
+MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r3 84
+MD5 cb8756e396d8d311dbcd4440fd483fc9 files/jack-audio-connection-kit-0.99.0-jackstart.patch 515
 MD5 b5dc5c728b1bdc6c5ebf5e54dc3ca246 files/jack-audio-connection-kit-0.98.1-configure.patch 1459
+MD5 0ad8a4c606e807460bce497d044044ef files/jack-audio-connection-kit-doc-option.patch 1103
 MD5 b029501b88782a0cca9e2f3d64812e63 files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch 575
-MD5 cb8756e396d8d311dbcd4440fd483fc9 files/jack-audio-connection-kit-0.99.0-jackstart.patch 515
+MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r3 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r3
new file mode 100644
index 000000000000..f88826337eed
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r3
@@ -0,0 +1 @@
+MD5 a891a699010452258d77e59842ebe4a0 jack-audio-connection-kit-0.99.0.tar.gz 722399
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild
new file mode 100644
index 000000000000..5f22220e829b
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 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.99.0-r3.ebuild,v 1.1 2005/07/14 18:44:15 fvdpol Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://jackit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
+
+RDEPEND="dev-libs/glib
+	dev-util/pkgconfig
+	>=media-libs/libsndfile-1.0.0
+	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
+	!ppc64? ( !alpha? ( !ia64? ( portaudio? ( media-libs/portaudio ) ) ) )
+	!sparc? ( alsa? ( >=media-libs/alsa-lib-0.9.1 ) )
+	!media-sound/jack-cvs"
+DEPEND="${RDEPEND}
+	!ppc-macos? ( sys-devel/autoconf )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use !ppc-macos ; then
+		# Add doc option and fix --march=pentium2 in caps test
+		epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && \
+		WANT_AUTOCONF=2.5 autoconf
+	fi
+
+	# compile and install jackstart, see #92895, #94887
+	if use caps ; then
+		epatch ${FILESDIR}/${P}-jackstart.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
+
+	if use doc; then
+		myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}"
+	else
+		myconf="--disable-html-docs"
+	fi
+
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	else
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable debug) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		${myconf} || die "configure failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	make DESTDIR=${D} datadir=${D}/usr/share install || die
+
+	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}/
+
+		mv ${S}/example-clients \
+		   ${D}/usr/share/doc/${PF}/
+	fi
+
+	rm -rf ${D}/usr/share/doc/${PF}/reference
+}