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

Package-Manager: portage-2.1.2_rc3-r5

4 files changed, 64 insertions, 15 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/Manifest b/media-sound/audacity/Manifest
index 39521cef1203..2095128c74ff 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -21,6 +21,10 @@ AUX audacity-1.3.2-gentoo.patch 2622 RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ff
 MD5 42377fd09f1b0b5ed3886549bbb4f088 files/audacity-1.3.2-gentoo.patch 2622
 RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ffab11 files/audacity-1.3.2-gentoo.patch 2622
 SHA256 f70e26e8210d45eb0be48fbe5f683beec03bfda4620792c49ceff630d8ac8259 files/audacity-1.3.2-gentoo.patch 2622
+AUX audacity-1.3.2-libnyquistp.patch 1606 RMD160 4a85891d1f6578332e75c2b9e1fe62fd3cff1269 SHA1 0a156f5ec7fe85453e6789aa33eece49ce56fd73 SHA256 dc09a0e2ea10f93d9b561843f4b90ea5809ad2bfe4cf51177d980add96e167e3
+MD5 77f59711ba16bde8252993f438cb82fc files/audacity-1.3.2-libnyquistp.patch 1606
+RMD160 4a85891d1f6578332e75c2b9e1fe62fd3cff1269 files/audacity-1.3.2-libnyquistp.patch 1606
+SHA256 dc09a0e2ea10f93d9b561843f4b90ea5809ad2bfe4cf51177d980add96e167e3 files/audacity-1.3.2-libnyquistp.patch 1606
 AUX audacity-1.3.2-no-msse.patch 436 RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 SHA1 cca61374754e9153b4d123e1693737fd5d56f690 SHA256 ffa5c3d0514d933f613804dcc0e8eb6d3510d1f3ed7cf450306327fedcd4e561
 MD5 02554130e92dcceb574954c71fcc7be9 files/audacity-1.3.2-no-msse.patch 436
 RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 files/audacity-1.3.2-no-msse.patch 436
@@ -31,18 +35,18 @@ EBUILD audacity-1.3.0b.ebuild 1590 RMD160 9db875326c079bbe354d57e356e80042a0e177
 MD5 3112308da3a84bb03bac837256f6d824 audacity-1.3.0b.ebuild 1590
 RMD160 9db875326c079bbe354d57e356e80042a0e177c1 audacity-1.3.0b.ebuild 1590
 SHA256 834dc0652f8d18e683738a2d06093a9f73120972e6d40aee9d6ab30c759ce0b0 audacity-1.3.0b.ebuild 1590
-EBUILD audacity-1.3.2-r1.ebuild 2036 RMD160 017876c356dbd6429a73a5af7a7a8ca5002777ad SHA1 513e070e068d9bdf167b24bd69095d99c4847547 SHA256 fede59f7e273f63aab3bd7aa553df83778f6fdf316f756aeee7bfef6c58c9cba
-MD5 316498683c8f0add7af2542ee988e426 audacity-1.3.2-r1.ebuild 2036
-RMD160 017876c356dbd6429a73a5af7a7a8ca5002777ad audacity-1.3.2-r1.ebuild 2036
-SHA256 fede59f7e273f63aab3bd7aa553df83778f6fdf316f756aeee7bfef6c58c9cba audacity-1.3.2-r1.ebuild 2036
+EBUILD audacity-1.3.2-r1.ebuild 2059 RMD160 9ff1fe5b4e0bcdf208f7cb429e6a0aeac0f1603d SHA1 d72cf98d7cf315c1f60bd2b020ce9e7d26ec9500 SHA256 960fc0a715b4cd7b13947ea1ee311c8b66374a49f5feacba6e399027ec17f9c1
+MD5 cab3f47e1e1022c805144446231466d3 audacity-1.3.2-r1.ebuild 2059
+RMD160 9ff1fe5b4e0bcdf208f7cb429e6a0aeac0f1603d audacity-1.3.2-r1.ebuild 2059
+SHA256 960fc0a715b4cd7b13947ea1ee311c8b66374a49f5feacba6e399027ec17f9c1 audacity-1.3.2-r1.ebuild 2059
 EBUILD audacity-1.3.2.ebuild 1910 RMD160 82c2764251d6fc7b97ff5577c8af9368758e50e7 SHA1 295a9eb806f8aa483167f90581e8ea33f68f7f60 SHA256 ebca97ffad6c594b6a0a3a52e7c1801945c7c21fdf9ce7ccd6850fe3b08cb3c5
 MD5 1d1717d89ca8c983c1fe31921e4551a1 audacity-1.3.2.ebuild 1910
 RMD160 82c2764251d6fc7b97ff5577c8af9368758e50e7 audacity-1.3.2.ebuild 1910
 SHA256 ebca97ffad6c594b6a0a3a52e7c1801945c7c21fdf9ce7ccd6850fe3b08cb3c5 audacity-1.3.2.ebuild 1910
-MISC ChangeLog 10012 RMD160 0597238505fc1cca50395429637d2e45f9fd3a72 SHA1 3cc7e8a26f5f1d15ec075f4ac565b60f9e583c4e SHA256 fd44fe644639f1cf7f5c7e3c72466ff325486027125e71d2ae994c5506a1a5c9
-MD5 d6c3317189b788cc0aeb4a2fc581ec6b ChangeLog 10012
-RMD160 0597238505fc1cca50395429637d2e45f9fd3a72 ChangeLog 10012
-SHA256 fd44fe644639f1cf7f5c7e3c72466ff325486027125e71d2ae994c5506a1a5c9 ChangeLog 10012
+MISC ChangeLog 10261 RMD160 49bca767c0cc469f6f926677113e83782c583c58 SHA1 1a43564bb37247b60b48a35fe9d965f6ed5370f3 SHA256 82fdf9f77c5188f87bfc3c0da69339813576dc84f894cb2024196fd2d9c73fd0
+MD5 e2ee45cd992e6da18d6ef6803a728f1d ChangeLog 10261
+RMD160 49bca767c0cc469f6f926677113e83782c583c58 ChangeLog 10261
+SHA256 82fdf9f77c5188f87bfc3c0da69339813576dc84f894cb2024196fd2d9c73fd0 ChangeLog 10261
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -59,7 +63,7 @@ SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfbI7vFcC4BYPU0oRAmneAJsEFpodWdG50ie8VHoRJTqCU/wMtgCeMmST
-u6n+N2UWvAfQbOzsWW2Ynf4=
-=IXDp
+iD8DBQFFgbSZvFcC4BYPU0oRAtJHAJ0WrwikoSRJpwQQqXnO+sNjWHuaggCfZnr6
+HHfuHZPrfwf+cbJpr2oZy7Y=
+=CtJr
 -----END PGP SIGNATURE-----
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
+