Moved pablio to separate ebuild. Made build system use correct toolchain and CFLAGS. Also, the soname is now versioned (18).

(Portage version: 2.0.51.22-r2)

8 files changed, 117 insertions, 87 deletions

diff --git a/media-libs/portaudio/ChangeLog b/media-libs/portaudio/ChangeLog
index 58df6b7769cf..419171a08e41 100644
--- a/media-libs/portaudio/ChangeLog
+++ b/media-libs/portaudio/ChangeLog
@@ -1,6 +1,15 @@
 # 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.23 2005/07/22 00:16:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/ChangeLog,v 1.24 2005/07/22 10:07:05 eradicator Exp $
+
+*portaudio-18.1-r3 (22 Jul 2005)
+
+  22 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/portaudio-18.1-Makefile.linux, files/portaudio-Makefile.macos,
+  -files/portaudio-use-fpic.patch, -portaudio-18.1-r2.ebuild,
+  +portaudio-18.1-r3.ebuild:
+  Moved pablio to separate ebuild. Made build system use correct toolchain and
+  CFLAGS. Also, the soname is now versioned (18).
 
   22 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   portaudio-18.1.ebuild, portaudio-18.1-r2.ebuild:
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 67b50bd814cd..df4ef8639f06 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2f59227af0fb9548b293b51d272c8407 ChangeLog 2624
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 23cf2626362f255453ed7b5e49959d81 portaudio-18.1-r3.ebuild 978
 MD5 9456f607b2d25722392088d088be48a0 portaudio-18.1.ebuild 1012
 MD5 a4d62cd0b756b3c49e6cbcf585311925 portaudio-18.1-r2.ebuild 1834
 MD5 24037d452fff400001cf4a3a4dec3585 files/digest-portaudio-18.1 64
 MD5 24037d452fff400001cf4a3a4dec3585 files/digest-portaudio-18.1-r2 64
 MD5 8461b4a89f5c56d005f6818a8bf410f3 files/portaudio-18.1-use-fpic.patch 3420
-MD5 ee10715cfed25ac4af5bb05bdcf816e3 files/portaudio-Makefile.macos 1050
-MD5 18d9bba97a0da6eb457678c0ea20aa4b files/portaudio-use-fpic.patch 323
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC4LsKArHZZzCEUG0RAqOGAJ4ugm33884x8s9/YMEU4j6+wNSrjgCdF5/G
-DYonEeIMFOC9m9abYP/k2GI=
-=vWnX
------END PGP SIGNATURE-----
+MD5 cd67103269f0834eda38b44bd15c1b52 files/portaudio-Makefile.macos 947
+MD5 24037d452fff400001cf4a3a4dec3585 files/digest-portaudio-18.1-r3 64
+MD5 ecceb8a92dfcc69a94329ecb38a41096 files/portaudio-18.1-Makefile.linux 1989
diff --git a/media-libs/portaudio/files/digest-portaudio-18.1-r2 b/media-libs/portaudio/files/digest-portaudio-18.1-r3
index 75343fea7e3d..75343fea7e3d 100644
--- a/media-libs/portaudio/files/digest-portaudio-18.1-r2
+++ b/media-libs/portaudio/files/digest-portaudio-18.1-r3
diff --git a/media-libs/portaudio/files/portaudio-18.1-Makefile.linux b/media-libs/portaudio/files/portaudio-18.1-Makefile.linux
new file mode 100644
index 000000000000..f62bb8f61b16
--- /dev/null
+++ b/media-libs/portaudio/files/portaudio-18.1-Makefile.linux
@@ -0,0 +1,60 @@
+# Make PortAudio for Linux
+# Updated 2001/08/25 Bill Eldridge bill@rfa.org
+# Updated 2001/10/16, philburk@softsynth.com, s/unix_oss/unix_oss/
+# Updated 2002/04/30 Bill Eldridge bill@rfa.org
+#     Made the libinstall and tests compile a bit cleaner
+# Updated 2005/07/22 Jeremy Huddleston eradicator@gentoo.org
+
+# A pretty bare makefile, that figures out all the test files
+# and compiles them against the library in the pa_unix_oss directory.
+
+# Do "make all" and then when happy, "make libinstall"
+# (if not happy, "make clean")
+
+# The ldconfig stuff in libinstall is the wrong way to do it - 
+# someone tell me the right way, please
+
+LIBS =  -lm -lpthread
+
+CFLAGS = -O2
+
+LIBFILES:= ./pa_common/pa_lib.c ./pa_unix_oss/pa_unix_oss.c ./pa_unix_oss/pa_unix.c
+
+VERSION=18
+
+CC=gcc
+LD=ld
+AR=ar
+RANLIB=ranlib
+LN=ln
+CP=cp
+MKDIR=mkdir
+
+prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+all: libportaudio.so libportaudio.a
+
+%.lo : %.c
+	$(CC) -fPIC $(CFLAGS) -c -I./pa_common $? -o $@
+
+.c.o:
+	$(CC) $(CFLAGS) -c -I./pa_common $? -o $@
+
+libportaudio.so.$(VERSION): $(LIBFILES:.c=.lo)
+	$(LD) -shared -soname $@ -o $@ $?
+
+libportaudio.so: libportaudio.so.$(VERSION)
+	$(LN) -s $? $@
+
+libportaudio.a: $(LIBFILES:.c=.o)
+	$(AR) ruv $@ $?
+	$(RANLIB) $@
+
+install: libportaudio.so libportaudio.a
+	$(MKDIR) -p $(DESTDIR)$(includedir)/portaudio
+	$(MKDIR) -p $(DESTDIR)$(libdir)
+	$(CP) -dpf libportaudio.so.$(VERSION) libportaudio.so libportaudio.a $(DESTDIR)$(libdir)
+	$(CP) -dpf pa_common/portaudio.h $(DESTDIR)$(includedir)/portaudio
+	$(LN) -s portaudio/portaudio.h $(DESTDIR)$(includedir)//portaudio.h
diff --git a/media-libs/portaudio/files/portaudio-Makefile.macos b/media-libs/portaudio/files/portaudio-Makefile.macos
index dadb55c6be44..1b3fdf0bff3e 100644
--- a/media-libs/portaudio/files/portaudio-Makefile.macos
+++ b/media-libs/portaudio/files/portaudio-Makefile.macos
@@ -1,24 +1,24 @@
 LIBS =  -lm
 
-CDEFINES = -I../pa_common -I../pablio
+CDEFINES = -I../pa_common
 CFLAGS = 
 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 ./pablio/pablio.c ./pa_mac_core/pa_mac_core.c
+LIBFILES:= ./pa_common/pa_lib.c ./pa_common/pa_convert.c ./pa_mac_core/pa_mac_core.c
 
 all: sharedlib libinstall testo testq
 
 .c.o:
-		-gcc -c -I./pablio -I./pa_common $< -o $*.o
+		-gcc -c -I./pa_common $< -o $*.o
 
 .o:
 		-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 -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
+		gcc  -framework CoreAudio -framework AudioToolbox -framework AudioUnit -dynamiclib -o ./pa_mac_core/libportaudio.dylib -install_name /usr/lib/libportaudio.dylib ./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)
diff --git a/media-libs/portaudio/files/portaudio-use-fpic.patch b/media-libs/portaudio/files/portaudio-use-fpic.patch
deleted file mode 100644
index d154d986bc5f..000000000000
--- a/media-libs/portaudio/files/portaudio-use-fpic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.linux.old	2004-03-27 08:09:19.677601864 -0500
-+++ Makefile.linux	2004-03-27 08:10:23.237939224 -0500
-@@ -29,7 +29,7 @@
- all: sharedlib libinstall testo testq

- 

- .c.o:

--	-gcc -c -I./pa_common $< -o $*.o

-+	-gcc -fPIC -c -I./pa_common $< -o $*.o

- 

- .o:

- 	-gcc $*.o -o $* -Lpa_unix_oss $(LIBS) -lportaudio

diff --git a/media-libs/portaudio/portaudio-18.1-r2.ebuild b/media-libs/portaudio/portaudio-18.1-r2.ebuild
deleted file mode 100644
index 191226eaea9e..000000000000
--- a/media-libs/portaudio/portaudio-18.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-r2.ebuild,v 1.3 2005/07/22 09:23:00 eradicator Exp $
-
-inherit eutils
-
-MY_P=${PN}_v${PV/./_}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An open-source cross platform audio API."
-HOMEPAGE="http://www.portaudio.com"
-SRC_URI="http://www.portaudio.com/archives/${MY_P}.zip"
-
-SLOT="18"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc-macos ~sparc ~x86"
-
-IUSE="userland_Darwin"
-
-RDEPEND="virtual/libc"
-DEPEND="app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-use-fpic.patch
-	use userland_Darwin && cp ${FILESDIR}/${PN}-Makefile.macos ${S}/Makefile || \
-	cp ${S}/Makefile.linux ${S}/Makefile
-}
-
-src_compile() {
-	cd ${S}
-	make sharedlib || 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 -c ${CFLAGS} -fPIC -Ipa_common pablio/ringbuffer.c -o pablio/ringbuffer.o
-		gcc -c ${CFLAGS} -fPIC -Ipa_common pablio/ringbuffer.c -o pablio/ringbuffer.o || die
-		echo gcc -shared -o pablio/libpablio.so pablio/pablio.o pablio/ringbuffer.o
-		gcc -shared -o pablio/libpablio.so pablio/pablio.o pablio/ringbuffer.o -Lpa_common -lportaudio || die
-	fi
-}
-
-src_install() {
-	if use userland_Darwin ; then
-		dolib pa_mac_core/libportaudio.dylib
-		insinto /usr/include/portaudio
-		doins pa_common/portaudio.h
-		dosym portaudio/portaudio.h /usr/include/portaudio.h
-	else
-		dolib pa_unix_oss/libportaudio.so pablio/libpablio.so
-		insinto /usr/include/portaudio
-		doins pa_common/portaudio.h pablio/pablio.h pablio/ringbuffer.h
-		dosym portaudio/portaudio.h /usr/include/portaudio.h
-	fi
-
-	dodoc docs/*
-}
diff --git a/media-libs/portaudio/portaudio-18.1-r3.ebuild b/media-libs/portaudio/portaudio-18.1-r3.ebuild
new file mode 100644
index 000000000000..6fac6afc4477
--- /dev/null
+++ b/media-libs/portaudio/portaudio-18.1-r3.ebuild
@@ -0,0 +1,39 @@
+# 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-r3.ebuild,v 1.1 2005/07/22 10:07:05 eradicator Exp $
+
+IUSE="userland_Darwin"
+
+inherit toolchain-funcs
+
+MY_P=${PN}_v${PV/./_}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An open-source cross platform audio API."
+HOMEPAGE="http://www.portaudio.com"
+SRC_URI="http://www.portaudio.com/archives/${MY_P}.zip"
+
+SLOT="18"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/libc"
+DEPEND="app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+
+	if use userland_Darwin ; then
+		 cp ${FILESDIR}/${P}-Makefile.macos ${S}/Makefile
+	else
+		 cp ${FILESDIR}/${P}-Makefile.linux ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LD="$(tc-getLD)" CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR="${D}" libdir="/usr/$(get_libdir)" install || die
+	dodoc docs/*
+}