Version bump and ebuild cleanup:

 - add a patch to avoid adding extra CFLAGS;
 - don't build documentation at all if doc USE flag is disabled but doxygen is found;
 - update netjack version to 0.12 final (and fetch tarball only if the USE flag is enabled);
 - fix netjack installation on multilib systems;
 - don't force PIC, leave it to libtool;
 - don't prestrip jack when enabling capabilities;
 - make libsndfile a mandatory dependency (it was automagic before);
 - move pkgconfig to build-time dependency.
(Portage version: 2.1.3_rc6)

4 files changed, 221 insertions, 1 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 9b872f8f8dde..c0353572f73d 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.86 2007/06/29 12:37:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.87 2007/06/29 14:09:57 flameeyes Exp $
+
+*jack-audio-connection-kit-0.103.0 (29 Jun 2007)
+
+  29 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/jack-audio-connection-kit-0.103.0-riceitdown.patch,
+  +jack-audio-connection-kit-0.103.0.ebuild:
+  Version bump and ebuild cleanup:
+  
+  - add a patch to avoid adding extra CFLAGS;
+  
+  - don't build documentation at all if doc USE flag is disabled but doxygen
+  is found;
+  
+  - update netjack version to 0.12 final (and fetch tarball only if the USE
+  flag is enabled);
+  
+  - fix netjack installation on multilib systems;
+  
+  - don't force PIC, leave it to libtool;
+  
+  - don't prestrip jack when enabling capabilities;
+  
+  - make libsndfile a mandatory dependency (it was automagic before);
+  
+  - move pkgconfig to build-time dependency.
 
   29 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
   jack-audio-connection-kit-0.101.1-r1.ebuild,
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.103.0 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.103.0
new file mode 100644
index 000000000000..812978ec720d
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.103.0
@@ -0,0 +1,6 @@
+MD5 03a0f63b997ce7b83a1eeaa6b80f4388 jack-audio-connection-kit-0.103.0.tar.gz 763244
+RMD160 72e47ada90b3d2c391c2e712316a975ae2a13ece jack-audio-connection-kit-0.103.0.tar.gz 763244
+SHA256 a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f jack-audio-connection-kit-0.103.0.tar.gz 763244
+MD5 3ef1da066532362c25bdb8490e1e261e netjack-0.12.tar.bz2 28044
+RMD160 13d13f2a66c891da243f9a286833554f680937ff netjack-0.12.tar.bz2 28044
+SHA256 c443bcb6ec2b477c52cab2fca75aef80fe2c2c91499e45ffdbb1c28ffaa7ee60 netjack-0.12.tar.bz2 28044
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch
new file mode 100644
index 000000000000..35d6de51d532
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch
@@ -0,0 +1,41 @@
+Index: jack-audio-connection-kit-0.103.0/configure.ac
+===================================================================
+--- jack-audio-connection-kit-0.103.0.orig/configure.ac
++++ jack-audio-connection-kit-0.103.0/configure.ac
+@@ -210,8 +210,6 @@ AM_CONDITIONAL(USE_POSIX_SHM, $USE_POSIX
+ 
+ JACK_CORE_CFLAGS="-I\$(top_srcdir)/config -I\$(top_srcdir) \
+ -I\$(top_srcdir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -g"
+-JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -march=pentium2 -mcpu=pentium4 -O3 \
+--ffast-math -funroll-loops -fprefetch-loop-arrays"
+ JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
+ 
+ dnl
+@@ -253,7 +251,7 @@ if test "$target_cpu" = "powerpc"; then
+ 
+     dnl -mcpu=7450 does not reliably work with gcc 3.*
+     
+-    JACK_OPT_CFLAGS="-D_REENTRANT -O2 -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
++    JACK_OPT_CFLAGS="-D_REENTRANT -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
+ 
+ elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
+ 
+@@ -339,17 +337,7 @@ elif echo $target_cpu | egrep '(i.86|x86
+     fi
+ 
+     AC_DEFINE(x86, 1, "Nope it's intel")
+-    COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
+-    
+-    if test "$target_cpu" = "i586"; then
+-	JACK_OPT_CFLAGS="-march=i586 "
+-    elif test "$target_cpu" = "i686"; then
+-	JACK_OPT_CFLAGS="-march=i686"
+-    elif test "$target_cpu" = "x86_64"; then
+-	JACK_OPT_CFLAGS="-march=k8"
+-    else
+-	:
+-    fi
++    COMMON_X86_OPT_FLAGS="-DREENTRANT"
+     
+     JACK_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $JACK_OPT_CFLAGS $MMX_FLAGS $SSE_FLAGS"
+ 
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
new file mode 100644
index 000000000000..0d8d6b28bf11
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 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.103.0.ebuild,v 1.1 2007/06/29 14:09:57 flameeyes Exp $
+
+inherit flag-o-matic eutils multilib linux-info autotools multilib
+
+NETJACK=netjack-0.12
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sse netjack cpudetection userland_Darwin"
+
+RDEPEND=">=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}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	netjack? ( dev-util/scons )"
+
+pkg_setup() {
+	if use caps; then
+		if kernel_is 2 4 ; then
+			elog "will build jackstart for 2.4 kernel"
+		else
+			elog "using compatibility symlink for jackstart"
+		fi
+	fi
+
+	if use netjack; then
+		elog "including support for experimental netjack, see http://netjack.sourceforge.net/"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-transport.patch"
+	epatch "${FILESDIR}/${P}-riceitdown.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	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
+
+	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
+	# Also, without -O2 it will not compile as well.
+	# we test if it is present before enabling the configure flag.
+	if use cpudetection ; then
+		if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565."
+		elif (! grep sse /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565."
+		elif (! grep mmx /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565."
+		else
+			elog "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+			myconf="${myconf} --enable-dynsimd"
+
+			filter-flags -O*
+			append-flags -mmmx -msse -m3dnow -O2
+		fi
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		${myconf} || die "configure failed"
+	emake || die "compilation failed"
+
+	if use caps && kernel_is 2 4 ; then
+		elog "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}" install || die
+
+	if use caps; then
+		if kernel_is 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
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+	fi
+
+	if use netjack; then
+		cd "${WORKDIR}/${NETJACK}"
+		dobin alsa_in
+		dobin alsa_out
+		dobin jacknet_client
+		insinto /usr/$(get_libdir)/jack
+		doins jack_net.so
+	fi
+}