Fix to allow parallel build and use CC variable rather than cc, thanks to Prakash Punnoor <prakashp@arcor.de>, bug #155495

(Portage version: 2.1.2_rc3-r5)

3 files changed, 49 insertions, 4 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 73df05db73ed..23c8ff6b0b5c 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.53 2006/12/11 19:32:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.54 2006/12/14 20:31:14 aballier Exp $
+
+  14 Dec 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/audacity-1.3.2-libnyquistp.patch, audacity-1.3.2-r1.ebuild:
+  Fix to allow parallel build and use CC variable rather than cc, thanks to
+  Prakash Punnoor <prakashp@arcor.de>, bug #155495
 
   11 Dec 2006; Alexis Ballier <aballier@gentoo.org>
   +files/audacity-1.3.2+flac-1.1.3.patch, audacity-1.3.2.ebuild,
diff --git a/media-sound/audacity/audacity-1.3.2-r1.ebuild b/media-sound/audacity/audacity-1.3.2-r1.ebuild
index 857e965a52c7..022016c65c91 100644
--- a/media-sound/audacity/audacity-1.3.2-r1.ebuild
+++ b/media-sound/audacity/audacity-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2-r1.ebuild,v 1.2 2006/12/11 19:32:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.2-r1.ebuild,v 1.3 2006/12/14 20:31:14 aballier Exp $
 
 inherit eutils autotools
 
@@ -40,6 +40,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-disable-optimization.patch
 	fi
 	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
+	epatch "${FILESDIR}/${P}-libnyquistp.patch"
 
 	eautoreconf || die
 	pushd "${S}"/lib-src/soundtouch
@@ -68,8 +69,7 @@ src_compile() {
 		$(use_with flac flac system) \
 		${myconf} || die
 
-	# parallel borks
-	emake -j1 || die
+	emake || die
 }
 
 src_install() {
diff --git a/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch b/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch
new file mode 100644
index 000000000000..b2f4e4affd2e
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch
@@ -0,0 +1,40 @@
+diff -urd /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in
+--- /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in	2006-10-29 01:05:50.000000000 +0200
++++ audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in	2006-11-17 19:14:04.430148792 +0100
+@@ -338,16 +338,16 @@
+ 	$(CC) -c tran/pluck.c -o tran/pluck.o $(CFLAGS)
+ 
+ tran/abs.o: tran/abs.c tran/abs.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+-	cc -c tran/abs.c -o tran/abs.o $(CFLAGS)
++	$(CC) -c tran/abs.c -o tran/abs.o $(CFLAGS)
+ 
+ tran/sqrt.o: tran/sqrt.c tran/sqrt.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+-	cc -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
++	$(CC) -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
+ 
+ tran/alpasscv.o: tran/alpasscv.c tran/alpasscv.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+-	cc -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
++	$(CC) -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
+ 
+ tran/alpassvc.o: tran/alpassvc.c tran/alpassvc.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+-	cc -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
++	$(CC) -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
+ 
+ nyqsrc/sndfnint.o: nyqsrc/sndfnint.c 
+ 	$(CC) -c nyqsrc/sndfnint.c -o nyqsrc/sndfnint.o $(CFLAGS)
+@@ -493,6 +493,14 @@
+ nyqsrc/seqfnintptrs.h: $(CMTHDRS) misc/intgen
+ 	$(INTGEN) nyqsrc/seqfnint $(CMTHDRS)
+ 
++nyqsrc/sndfnintdefs.h : nyqsrc/sndfnintptrs.h
++
++nyqsrc/seqfnintdefs.h : nyqsrc/seqfnintptrs.h
++
++nyqsrc/sndfnint.c : nyqsrc/sndfnintptrs.h
++
++nyqsrc/seqfnint.c : nyqsrc/seqfnintptrs.h
++
+ clean:
+ 	rm -f libnyquist.a
+ 	cd misc; $(MAKE) clean
+