~ppc-macos keyword. added support for blocking i/o bug 99732

Package-Manager: portage-2.0.51.22-r2

4 files changed, 24 insertions, 29 deletions

diff --git a/media-libs/portaudio/ChangeLog b/media-libs/portaudio/ChangeLog
index 535ba8901d87..68166c1de3f4 100644
--- a/media-libs/portaudio/ChangeLog
+++ b/media-libs/portaudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/portaudio
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/ChangeLog,v 1.20 2005/07/20 22:47:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/ChangeLog,v 1.21 2005/07/21 04:13:47 kito Exp $
+
+  21 Jul 2005; Kito <kito@gentoo.org> files/portaudio-Makefile.macos,
+  portaudio-18.1-r1.ebuild:
+  ~ppc-macos keyword. added support for blocking i/o
 
 *portaudio-18.1-r1 (20 Jul 2005)
 
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index aa1ebb141d05..f6152112dd87 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 04077ca57c880f8cdad51f309a4d35fa ChangeLog 2161
+MD5 ac2672228c2fd84ea2aa24abd7433440 ChangeLog 2307
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 28555fa0e69ed8a77bb2e612534fadfb portaudio-18.1-r1.ebuild 1481
 MD5 3acc2c12b931f8f2859d856e405d4d5f portaudio-18.1.ebuild 1006
-MD5 df63aa257659d062d90c70c0011bf6d9 portaudio-18.1-r1.ebuild 1423
 MD5 24037d452fff400001cf4a3a4dec3585 files/digest-portaudio-18.1 64
+MD5 24037d452fff400001cf4a3a4dec3585 files/digest-portaudio-18.1-r1 64
 MD5 8461b4a89f5c56d005f6818a8bf410f3 files/portaudio-18.1-use-fpic.patch 3420
-MD5 4099a0cd35fe029240c0349570c61731 files/portaudio-Makefile.macos 971
+MD5 ee10715cfed25ac4af5bb05bdcf816e3 files/portaudio-Makefile.macos 1050
 MD5 18d9bba97a0da6eb457678c0ea20aa4b files/portaudio-use-fpic.patch 323
-MD5 24037d452fff400001cf4a3a4dec3585 files/digest-portaudio-18.1-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3tTDArHZZzCEUG0RAtPvAJ4qb0Upa1UdGkTEH67lLb1mdlKnDgCfWPYZ
-988/sCA2k6J1EqnfE7QmrEA=
-=eN52
------END PGP SIGNATURE-----
diff --git a/media-libs/portaudio/files/portaudio-Makefile.macos b/media-libs/portaudio/files/portaudio-Makefile.macos
index 5b415e6b5382..dadb55c6be44 100644
--- a/media-libs/portaudio/files/portaudio-Makefile.macos
+++ b/media-libs/portaudio/files/portaudio-Makefile.macos
@@ -7,7 +7,7 @@ LIBINST = /usr/lib
 TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
 TESTO:= $(wildcard pa_tests/pa*.o pa_tests/debug*.o)
 
-LIBFILES:= ./pa_common/pa_lib.c ./pa_common/pa_convert.c ./pablio/ringbuffer.c ./pa_mac_core/pa_mac_core.c
+LIBFILES:= ./pa_common/pa_lib.c ./pa_common/pa_convert.c ./pablio/ringbuffer.c ./pablio/pablio.c ./pa_mac_core/pa_mac_core.c
 
 all: sharedlib libinstall testo testq
 
@@ -18,7 +18,7 @@ all: sharedlib libinstall testo testq
 		-gcc $*.o -o $* -Lpa_mac_core $(LIBS) -lportaudio
 
 sharedlib:      $(LIBFILES:.c=.o)
-		gcc  -framework CoreAudio -framework AudioToolbox -framework AudioUnit -dynamiclib -o ./pa_mac_core/libportaudio.dylib ./pablio/ringbuffer.o ./pa_common/pa_lib.o ./pa_common/pa_convert.o ./pa_mac_core/pa_mac_core.o
+		gcc  -framework CoreAudio -framework AudioToolbox -framework AudioUnit -dynamiclib -o ./pa_mac_core/libportaudio.dylib -install_name /usr/lib/libportaudio.dylib ./pablio/pablio.o ./pablio/ringbuffer.o ./pa_common/pa_lib.o ./pa_common/pa_convert.o ./pa_mac_core/pa_mac_core.o
 
 libinstall:     ./pa_mac_core/libportaudio.dylib
 		@cp -f ./pa_mac_core/libportaudio.dylib $(LIBINST)
@@ -31,4 +31,4 @@ clean:
 		-@rm -f $(TESTS:.c=.o)
 		-@rm -f $(TESTS:.c=)
 		-@rm -f $(LIBFILES:.c=.o)
-		-@rm -f ./pa_mac_core/libportaudio.dylib
\ No newline at end of file
+		-@rm -f ./pa_mac_core/libportaudio.dylib
diff --git a/media-libs/portaudio/portaudio-18.1-r1.ebuild b/media-libs/portaudio/portaudio-18.1-r1.ebuild
index 303f22146186..1e94e812ce33 100644
--- a/media-libs/portaudio/portaudio-18.1-r1.ebuild
+++ b/media-libs/portaudio/portaudio-18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-18.1-r1.ebuild,v 1.1 2005/07/20 22:47:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-18.1-r1.ebuild,v 1.2 2005/07/21 04:13:47 kito Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.portaudio.com/archives/${MY_P}.zip"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc-macos ~sparc ~x86"
 
 IUSE=""
 
@@ -24,7 +24,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-use-fpic.patch
-	use ppc-macos && cp ${FILESDIR}/${PN}-Makefile.macos ${S}/Makefile || \
+	use userland_Darwin  && cp ${FILESDIR}/${PN}-Makefile.macos ${S}/Makefile || \
 	cp ${S}/Makefile.linux ${S}/Makefile
 }
 
@@ -32,18 +32,19 @@ src_compile() {
 	cd ${S}
 	make sharedlib || die
 
-	echo gcc -c ${CFLAGS} -fPIC -Ipa_common pablio/pablio.c -o pablio/pablio.o
-	gcc -c ${CFLAGS} -fPIC -Ipa_common pablio/pablio.c -o pablio/pablio.o || die
-	echo gcc -shared -o pablio/libpablio.so pablio/pablio.o
-	gcc -shared -o pablio/libpablio.so pablio/pablio.o -Lpa_common -lportaudio || die
+	if ! use userland_Darwin ; then
+		echo gcc -c ${CFLAGS} -fPIC -Ipa_common pablio/pablio.c -o pablio/pablio.o
+		gcc -c ${CFLAGS} -fPIC -Ipa_common pablio/pablio.c -o pablio/pablio.o || die
+		echo gcc -shared -o pablio/libpablio.so pablio/pablio.o
+		gcc -shared -o pablio/libpablio.so pablio/pablio.o -Lpa_common -lportaudio || die
+	fi
 }
 
 src_install() {
-	if ! use ppc-macos
-	then
-		dolib pa_unix_oss/libportaudio.so pablio/libpablio.so
-	else
+	if use userland_Darwin ; then
 		dolib pa_mac_core/libportaudio.dylib
+	else
+		dolib pa_unix_oss/libportaudio.so pablio/libpablio.so
 	fi
 
 	insinto /usr/include/portaudio