Remove ppc-macos conditionals, remove unused macos patch

Package-Manager: portage-2.1.3.19

3 files changed, 6 insertions, 60 deletions

diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 6840ada36e60..2b26dda3d861 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX portaudio-18.1-Makefile.linux 1585 RMD160 15e6980fe7e749aa4faaf42c9110813bb3103842 SHA1 bed0ce41b3b8dbf798f8295f948c7a1b3d524951 SHA256 c17322d3600484695213deb5d11108413f2e453f5265f87875ad6a2f1b70f291
 MD5 4219b3627542b1f316cbaa75b3ae9d4d files/portaudio-18.1-Makefile.linux 1585
 RMD160 15e6980fe7e749aa4faaf42c9110813bb3103842 files/portaudio-18.1-Makefile.linux 1585
@@ -21,10 +18,6 @@ AUX portaudio-18.1-use-fpic.patch 3420 RMD160 a808a293c85820d14348ef6fa2a7f6cc32
 MD5 8461b4a89f5c56d005f6818a8bf410f3 files/portaudio-18.1-use-fpic.patch 3420
 RMD160 a808a293c85820d14348ef6fa2a7f6cc32660d4f files/portaudio-18.1-use-fpic.patch 3420
 SHA256 4011b1202bafc32b4c077c115074c89ec444897a2be65fb684ec50391898e13b files/portaudio-18.1-use-fpic.patch 3420
-AUX portaudio-Makefile.macos 947 RMD160 ad6b7d646f867c22e1e7e35eccaa5adf1ce7067b SHA1 b004e5dbe06feaf7de71655c255e9f83ab9f57b2 SHA256 36c735b3c155019d84ea3848f0ec3f8e009aab1ac8e027af9323af249f12d47b
-MD5 cd67103269f0834eda38b44bd15c1b52 files/portaudio-Makefile.macos 947
-RMD160 ad6b7d646f867c22e1e7e35eccaa5adf1ce7067b files/portaudio-Makefile.macos 947
-SHA256 36c735b3c155019d84ea3848f0ec3f8e009aab1ac8e027af9323af249f12d47b files/portaudio-Makefile.macos 947
 DIST pa_stable_v19_061121.tar.gz 1090897 RMD160 f7b6a83ad6b120b9c3b7736b86231e88d709ee7f SHA1 798fc900251e2df423ba9e60b832ca76f85c3ad0 SHA256 98d5ef0b0db66cfc04d70505cf60847ec6dc0814a6ebcb4be80873beaa22c48b
 DIST pa_stable_v19_070707.tar.gz 1101365 RMD160 9f33443cc520fe1fc0a7089f46792370c43740e1 SHA1 353cf394ed1f2d8096ec902546820a4c0ad2852f SHA256 c67d948b7dba77fc1c71b16bae86ef89483009bbc7d9decaa4987c4aac13489f
 DIST pa_stable_v19_20071207.tar.gz 1113282 RMD160 5185bd85bd4bc75dddb3fa56f172a346bdeea0c7 SHA1 3841453bb7be672a15b6b632ade6f225eb0a4efc SHA256 06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b
@@ -45,10 +38,10 @@ EBUILD portaudio-18.1-r6.ebuild 1251 RMD160 4da87a93ecf94e852eac5701797816bdb0da
 MD5 8069e69f485eddae5a62a86eece280f7 portaudio-18.1-r6.ebuild 1251
 RMD160 4da87a93ecf94e852eac5701797816bdb0da90f5 portaudio-18.1-r6.ebuild 1251
 SHA256 9f0dd2b41ec8e1d6d9416622f71f683cafe957cf0e5025f3a8c748346512f29a portaudio-18.1-r6.ebuild 1251
-EBUILD portaudio-18.1.ebuild 986 RMD160 62bab2de3e09c9085b5329249c4baf1c317ab796 SHA1 23a5c5cfb9c914b7b57d77d244c67594d56b6dd4 SHA256 908877614443b401bcdfa5c48b0cbd451270b73741a18daed809b303510027b9
-MD5 2e6d86d3956069fd3abb8cc5967e5a4b portaudio-18.1.ebuild 986
-RMD160 62bab2de3e09c9085b5329249c4baf1c317ab796 portaudio-18.1.ebuild 986
-SHA256 908877614443b401bcdfa5c48b0cbd451270b73741a18daed809b303510027b9 portaudio-18.1.ebuild 986
+EBUILD portaudio-18.1.ebuild 837 RMD160 6c5f035b23014951526999c0c1042ee80f4cd2b4 SHA1 edd1caf25a47767870b60196a19f3f2f632e30db SHA256 7047bfc4fe82289792aee6a35b218362f3ec812618871d6856fa3dae5d874c75
+MD5 d05cbdfbaa0fc4f52ca501e3d2a2f8e2 portaudio-18.1.ebuild 837
+RMD160 6c5f035b23014951526999c0c1042ee80f4cd2b4 portaudio-18.1.ebuild 837
+SHA256 7047bfc4fe82289792aee6a35b218362f3ec812618871d6856fa3dae5d874c75 portaudio-18.1.ebuild 837
 EBUILD portaudio-19_pre061121.ebuild 965 RMD160 847e72ad4aa78ec73f553bf334466789cdd33ddf SHA1 dd20dbcc444f65a880a551bba7fa493cb964ec70 SHA256 fea045a517231decdfbf6c7b7a5efe8ef4398779fc2b7d16d17f872df2fc75bf
 MD5 f08e2bf3ae922fff1873a38065a6b120 portaudio-19_pre061121.ebuild 965
 RMD160 847e72ad4aa78ec73f553bf334466789cdd33ddf portaudio-19_pre061121.ebuild 965
@@ -93,10 +86,3 @@ SHA256 987929f827af1d91de469606a890aeacbfd370e51cfd0f1d0deb3939b5e3c2c4 files/di
 MD5 493cc3e1d6cbca92cfbf73d6f2aea4ce files/digest-portaudio-19_pre20071207 271
 RMD160 ab390309046dde39a1dfc03b9a415b7c4addd682 files/digest-portaudio-19_pre20071207 271
 SHA256 b1a8ea14c58ac2d15fd2b90b8a8c9244500de4f979a9a084fc07a246100335a6 files/digest-portaudio-19_pre20071207 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHiQRqvFcC4BYPU0oRAmCYAJ42Hn2jbJ4ji9FS0Tp19TpQuiewuwCfTFsK
-gdHsmDm3gBjMTMbeIWtAC6U=
-=eidq
------END PGP SIGNATURE-----
diff --git a/media-libs/portaudio/files/portaudio-Makefile.macos b/media-libs/portaudio/files/portaudio-Makefile.macos
deleted file mode 100644
index 1b3fdf0bff3e..000000000000
--- a/media-libs/portaudio/files/portaudio-Makefile.macos
+++ /dev/null
@@ -1,34 +0,0 @@
-LIBS =  -lm
-
-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 ./pa_mac_core/pa_mac_core.c
-
-all: sharedlib libinstall testo testq
-
-.c.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 ./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)
-
-testo:  $(TESTS:.c=.o)
-
-testq:  $(TESTO:.o=)
-
-clean:
-		-@rm -f $(TESTS:.c=.o)
-		-@rm -f $(TESTS:.c=)
-		-@rm -f $(LIBFILES:.c=.o)
-		-@rm -f ./pa_mac_core/libportaudio.dylib
diff --git a/media-libs/portaudio/portaudio-18.1.ebuild b/media-libs/portaudio/portaudio-18.1.ebuild
index a600f8de8bf5..66eb6f39adbe 100644
--- a/media-libs/portaudio/portaudio-18.1.ebuild
+++ b/media-libs/portaudio/portaudio-18.1.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-libs/portaudio/portaudio-18.1.ebuild,v 1.17 2007/02/28 22:15:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-18.1.ebuild,v 1.18 2008/01/29 21:38:25 grobian Exp $
 
 inherit eutils
 
@@ -23,7 +23,6 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-use-fpic.patch
-	use ppc-macos && cp ${FILESDIR}/${PN}-Makefile.macos ${S}/Makefile || \
 	cp ${S}/Makefile.linux ${S}/Makefile
 }
 
@@ -33,12 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	if ! use ppc-macos
-	then
-		dolib pa_unix_oss/libportaudio.so
-	else
-		dolib pa_mac_core/libportaudio.dylib
-	fi
+	dolib pa_unix_oss/libportaudio.so
 
 	insinto /usr/include
 	doins pa_common/portaudio.h