Dropped ~ppc-macos, see you in prefix.

Package-Manager: portage-2.1.1

21 files changed, 66 insertions, 75 deletions

diff --git a/media-libs/libid3tag/ChangeLog b/media-libs/libid3tag/ChangeLog
index 7ee60edf24d7..52e6c04f65f7 100644
--- a/media-libs/libid3tag/ChangeLog
+++ b/media-libs/libid3tag/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libid3tag
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/ChangeLog,v 1.30 2006/09/10 17:07:27 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/ChangeLog,v 1.31 2006/10/04 17:34:19 grobian Exp $
+
+  04 Oct 2006; Fabian Groffen <grobian@gentoo.org> libid3tag-0.15.1b.ebuild:
+  Dropped ~ppc-macos, see you in prefix.
 
   10 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
   libid3tag-0.15.1b.ebuild:
diff --git a/media-libs/libid3tag/files/digest-libid3tag-0.15.0b b/media-libs/libid3tag/files/digest-libid3tag-0.15.0b
index dd92ca9b9ce5..70b79622ba3a 100644
--- a/media-libs/libid3tag/files/digest-libid3tag-0.15.0b
+++ b/media-libs/libid3tag/files/digest-libid3tag-0.15.0b
@@ -1 +1,3 @@
 MD5 a625307d2cda4f3c609b79c1e3a93d87 libid3tag-0.15.0b.tar.gz 240656
+RMD160 6091e6772076f04017635d1f219b586ee56e6b3f libid3tag-0.15.0b.tar.gz 240656
+SHA256 794092368890321ffbb9cb1b260808d732658af093bd0a3e01c9b54c4bd657e5 libid3tag-0.15.0b.tar.gz 240656
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b.ebuild
index 2b1d41828248..08c4801b0d7f 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.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/libid3tag/libid3tag-0.15.1b.ebuild,v 1.23 2006/09/10 17:07:27 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b.ebuild,v 1.24 2006/10/04 17:34:19 grobian Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND=">=sys-libs/zlib-1.1.3"
diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index 47220ffef4d4..7c9782e1e7f8 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmad
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.38 2006/09/24 17:10:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.39 2006/10/04 17:37:27 grobian Exp $
+
+  04 Oct 2006; Fabian Groffen <grobian@gentoo.org> libmad-0.15.1b.ebuild,
+  libmad-0.15.1b-r1.ebuild:
+  Dropped ~ppc-macos, see you in prefix.
 
   24 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   libmad-0.15.1b-r1.ebuild:
diff --git a/media-libs/libmad/libmad-0.15.1b-r1.ebuild b/media-libs/libmad/libmad-0.15.1b-r1.ebuild
index 286ba20e2ce5..292d66b38f1e 100644
--- a/media-libs/libmad/libmad-0.15.1b-r1.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-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-libs/libmad/libmad-0.15.1b-r1.ebuild,v 1.3 2006/09/24 17:10:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r1.ebuild,v 1.4 2006/10/04 17:37:27 grobian Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug"
 
 DEPEND=""
diff --git a/media-libs/libmad/libmad-0.15.1b.ebuild b/media-libs/libmad/libmad-0.15.1b.ebuild
index 60ffb54f60bb..698db978435a 100644
--- a/media-libs/libmad/libmad-0.15.1b.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b.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/libmad/libmad-0.15.1b.ebuild,v 1.25 2006/07/17 02:52:58 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b.ebuild,v 1.26 2006/10/04 17:37:27 grobian Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="debug"
 
 DEPEND=""
diff --git a/media-libs/libogg/ChangeLog b/media-libs/libogg/ChangeLog
index 125588918b09..0069f4a04313 100644
--- a/media-libs/libogg/ChangeLog
+++ b/media-libs/libogg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libogg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/ChangeLog,v 1.43 2006/06/16 21:47:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/ChangeLog,v 1.44 2006/10/04 17:42:48 grobian Exp $
+
+  04 Oct 2006; Fabian Groffen <grobian@gentoo.org> libogg-1.1.ebuild,
+  libogg-1.1.1.ebuild, libogg-1.1.2.ebuild, libogg-1.1.3.ebuild:
+  Dropped ~ppc-macos, see you in prefix.
 
   16 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> libogg-1.1.ebuild,
   libogg-1.1.1.ebuild:
diff --git a/media-libs/libogg/files/digest-libogg-1.0 b/media-libs/libogg/files/digest-libogg-1.0
index 2c5230c9bc0f..0330f8dd3bc9 100644
--- a/media-libs/libogg/files/digest-libogg-1.0
+++ b/media-libs/libogg/files/digest-libogg-1.0
@@ -1 +1,3 @@
 MD5 382a7089f42e6f82e7d658c1cb8ee236 libogg-1.0.tar.gz 222625
+RMD160 f4d85234407632e8140c208326f8d4b7526ffec7 libogg-1.0.tar.gz 222625
+SHA256 920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c libogg-1.0.tar.gz 222625
diff --git a/media-libs/libogg/files/digest-libogg-1.1.2 b/media-libs/libogg/files/digest-libogg-1.1.2
index c73de9eff62c..893f1eb7f195 100644
--- a/media-libs/libogg/files/digest-libogg-1.1.2
+++ b/media-libs/libogg/files/digest-libogg-1.1.2
@@ -1 +1,3 @@
 MD5 4d82996517bf33bb912c97e9d0b635c4 libogg-1.1.2.tar.gz 419959
+RMD160 d0f3240ef1a69ae9b8e6ce4e18ade97de16d115d libogg-1.1.2.tar.gz 419959
+SHA256 7934f3bf689c6ea0870bc73fcf40b00d5050044b03e558819a1ed333dc3cfadf libogg-1.1.2.tar.gz 419959
diff --git a/media-libs/libogg/libogg-1.1.1.ebuild b/media-libs/libogg/libogg-1.1.1.ebuild
index 077592af8aa6..7644df2d7dce 100644
--- a/media-libs/libogg/libogg-1.1.1.ebuild
+++ b/media-libs/libogg/libogg-1.1.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/libogg/libogg-1.1.1.ebuild,v 1.8 2006/06/16 21:47:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.1.1.ebuild,v 1.9 2006/10/04 17:42:48 grobian Exp $
 
 DESCRIPTION="the Ogg media file format library"
 HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
@@ -8,7 +8,7 @@ SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_install () {
diff --git a/media-libs/libogg/libogg-1.1.2.ebuild b/media-libs/libogg/libogg-1.1.2.ebuild
index bed446abceff..3a793b35b327 100644
--- a/media-libs/libogg/libogg-1.1.2.ebuild
+++ b/media-libs/libogg/libogg-1.1.2.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/libogg/libogg-1.1.2.ebuild,v 1.14 2006/03/06 16:13:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.1.2.ebuild,v 1.15 2006/10/04 17:42:48 grobian Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/media-libs/libogg/libogg-1.1.3.ebuild b/media-libs/libogg/libogg-1.1.3.ebuild
index fdf20b8c1f58..2514f5307183 100644
--- a/media-libs/libogg/libogg-1.1.3.ebuild
+++ b/media-libs/libogg/libogg-1.1.3.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/libogg/libogg-1.1.3.ebuild,v 1.4 2006/04/05 18:58:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.1.3.ebuild,v 1.5 2006/10/04 17:42:48 grobian Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 src_unpack() {
diff --git a/media-libs/libogg/libogg-1.1.ebuild b/media-libs/libogg/libogg-1.1.ebuild
index 1a098f9692de..591e6d7ba644 100644
--- a/media-libs/libogg/libogg-1.1.ebuild
+++ b/media-libs/libogg/libogg-1.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/libogg/libogg-1.1.ebuild,v 1.23 2006/06/16 21:47:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.1.ebuild,v 1.24 2006/10/04 17:42:48 grobian Exp $
 
 DESCRIPTION="the Ogg media file format library"
 HOMEPAGE="http://www.xiph.org/ogg/vorbis/index.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.vorbis.com/files/1.0.1/unix/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_install () {
diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 6c7e575ebe99..daa40c0c000e 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.63 2006/04/05 18:59:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.64 2006/10/04 17:40:32 grobian Exp $
+
+  04 Oct 2006; Fabian Groffen <grobian@gentoo.org>
+  libvorbis-1.0.1-r2.ebuild, libvorbis-1.1.0.ebuild, libvorbis-1.1.1.ebuild,
+  libvorbis-1.1.2.ebuild:
+  Dropped ~ppc-macos, see you in prefix.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libvorbis-1.1.2.ebuild:
   Actually remove the manual libraries symlinking; don't append -fPIC as
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r2 b/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r2
index e4c8aa7dd85d..7cbdad53a028 100644
--- a/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r2
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.0.1-r2
@@ -1 +1,3 @@
 MD5 4d6726fd02ce02f6e24824e594b0949a libvorbis-1.0.1.tar.gz 1218076
+RMD160 2015bfb9631076862e577e1cab0a8ca20f88780e libvorbis-1.0.1.tar.gz 1218076
+SHA256 20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7 libvorbis-1.0.1.tar.gz 1218076
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.1.0 b/media-libs/libvorbis/files/digest-libvorbis-1.1.0
index 7aa43c89580c..7d66d1321fe1 100644
--- a/media-libs/libvorbis/files/digest-libvorbis-1.1.0
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.1.0
@@ -1,2 +1,4 @@
 MD5 bb764aeabde613d1a424a29b1f15e7e6 libvorbis-1.1.0.tar.gz 1312404
+RMD160 8819812ee657af556ff9f8f8e7aad35f069c9126 libvorbis-1.1.0.tar.gz 1312404
+SHA256 928c94d373ad9a4a04a38cfe0a849ddcc7a87ad06c8e8012931c37faefa19c00 libvorbis-1.1.0.tar.gz 1312404
 MD5 86f60bb55a9ec4bdbc007619eef94d36 libvorbis-aotuv-b3.patch 92730
diff --git a/media-libs/libvorbis/files/digest-libvorbis-1.1.1 b/media-libs/libvorbis/files/digest-libvorbis-1.1.1
index fb13bd4bb2ff..7062661fcf94 100644
--- a/media-libs/libvorbis/files/digest-libvorbis-1.1.1
+++ b/media-libs/libvorbis/files/digest-libvorbis-1.1.1
@@ -1 +1,3 @@
 MD5 b77270c24840af4de54bea5ad1c0b252 libvorbis-1.1.1.tar.gz 1307726
+RMD160 3454f3f2d5641ba17dd99de0923d7b00ffe891ee libvorbis-1.1.1.tar.gz 1307726
+SHA256 fca2c35d8f1d10e93b80171cae26da1dd03b99fe854a1698d3c47d3b28a40b0f libvorbis-1.1.1.tar.gz 1307726
diff --git a/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild b/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild
index 652c2c277763..861be7dd0cc7 100644
--- a/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild,v 1.17 2005/07/16 18:48:38 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild,v 1.18 2006/10/04 17:40:32 grobian Exp $
 
 inherit libtool flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.vorbis.com/files/${PV}/unix/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libogg-1.0"
@@ -26,13 +26,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# Fixes some strange sed-, libtool- and ranlib-errors on
-	# Mac OS X
-	if use ppc-macos; then
-		glibtoolize
-	else
-		elibtoolize
-	fi
+	elibtoolize
 
 	# Cannot compile with sse2 support it would seem #36104
 	use x86 && [ $(gcc-major-version) -eq 3 ] && append-flags -mno-sse2
@@ -60,19 +54,13 @@ src_compile() {
 	append-ldflags -fPIC
 
 	econf || die
-	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	if use ppc-macos; then
-		dosym /usr/lib/libvorbisfile.3.1.0.dylib /usr/lib/libvorbisfile.0.dylib
-		dosym /usr/lib/libvorbisenc.2.0.0.dylib /usr/lib/libvorbisenc.0.dylib
-	else
-		dosym /usr/lib/libvorbisfile.so.3.1.0 /usr/lib/libvorbisfile.so.0
-		dosym /usr/lib/libvorbisenc.so.2.0.0 /usr/lib/libvorbisenc.so.0
-	fi
+	dosym /usr/lib/libvorbisfile.so.3.1.0 /usr/lib/libvorbisfile.so.0
+	dosym /usr/lib/libvorbisenc.so.2.0.0 /usr/lib/libvorbisenc.so.0
 
 	rm -rf ${D}/usr/share/doc
 	dodoc AUTHORS README todo.txt
diff --git a/media-libs/libvorbis/libvorbis-1.1.0.ebuild b/media-libs/libvorbis/libvorbis-1.1.0.ebuild
index 128773117285..fa8b2665ef89 100644
--- a/media-libs/libvorbis/libvorbis-1.1.0.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.0.ebuild,v 1.20 2005/10/16 18:56:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.0.ebuild,v 1.21 2006/10/04 17:40:32 grobian Exp $
 
 inherit libtool flag-o-matic eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="aotuv"
 
 RDEPEND=">=media-libs/libogg-1.0"
@@ -30,13 +30,7 @@ src_unpack() {
 	# seems it does not handle -mno-ieee-fp very well.
 	sed -i -e "s:-mno-ieee-fp::g" configure
 
-	# Fixes some strange sed-, libtool- and ranlib-errors on
-	# Mac OS X
-	if use ppc-macos; then
-		glibtoolize
-	else
-		elibtoolize
-	fi
+	elibtoolize
 
 	epunt_cxx #74493
 }
@@ -69,19 +63,13 @@ src_compile() {
 	append-ldflags -fPIC
 
 	econf || die
-	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	if use ppc-macos; then
-		dosym libvorbisfile.3.1.0.dylib /usr/$(get_libdir)/libvorbisfile.0.dylib
-		dosym libvorbisenc.2.0.0.dylib /usr/$(get_libdir)/libvorbisenc.0.dylib
-	else
-		dosym libvorbisfile.so.3.1.0 /usr/$(get_libdir)/libvorbisfile.so.0
-		dosym libvorbisenc.so.2.0.0 /usr/$(get_libdir)/libvorbisenc.so.0
-	fi
+	dosym libvorbisfile.so.3.1.0 /usr/$(get_libdir)/libvorbisfile.so.0
+	dosym libvorbisenc.so.2.0.0 /usr/$(get_libdir)/libvorbisenc.so.0
 
 	rm -rf ${D}/usr/share/doc
 	dodoc AUTHORS README todo.txt
diff --git a/media-libs/libvorbis/libvorbis-1.1.1.ebuild b/media-libs/libvorbis/libvorbis-1.1.1.ebuild
index b95a7c5a9fa2..0f8750c26396 100644
--- a/media-libs/libvorbis/libvorbis-1.1.1.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.1.ebuild,v 1.3 2005/10/16 18:56:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.1.ebuild,v 1.4 2006/10/04 17:40:32 grobian Exp $
 
 inherit libtool flag-o-matic eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libogg-1.0"
@@ -27,13 +27,7 @@ src_unpack() {
 	# seems it does not handle -mno-ieee-fp very well.
 	sed -i -e "s:-mno-ieee-fp::g" configure
 
-	# Fixes some strange sed-, libtool- and ranlib-errors on
-	# Mac OS X
-	if use ppc-macos; then
-		glibtoolize
-	else
-		elibtoolize
-	fi
+	elibtoolize
 
 	epunt_cxx #74493
 }
@@ -66,19 +60,13 @@ src_compile() {
 	append-ldflags -fPIC
 
 	econf || die
-	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	if use ppc-macos; then
-		dosym libvorbisfile.3.1.0.dylib /usr/$(get_libdir)/libvorbisfile.3.dylib
-		dosym libvorbisenc.2.0.1.dylib /usr/$(get_libdir)/libvorbisenc.2.dylib
-	else
-		dosym libvorbisfile.so.3.1.0 /usr/$(get_libdir)/libvorbisfile.so.3
-		dosym libvorbisenc.so.2.0.1 /usr/$(get_libdir)/libvorbisenc.so.2
-	fi
+	dosym libvorbisfile.so.3.1.0 /usr/$(get_libdir)/libvorbisfile.so.3
+	dosym libvorbisenc.so.2.0.1 /usr/$(get_libdir)/libvorbisenc.so.2
 
 	rm -rf ${D}/usr/share/doc
 	dodoc AUTHORS README todo.txt
diff --git a/media-libs/libvorbis/libvorbis-1.1.2.ebuild b/media-libs/libvorbis/libvorbis-1.1.2.ebuild
index 8f4a4105657f..196e06ea3297 100644
--- a/media-libs/libvorbis/libvorbis-1.1.2.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.1.2.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/libvorbis/libvorbis-1.1.2.ebuild,v 1.4 2006/04/05 18:59:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.2.ebuild,v 1.5 2006/10/04 17:40:32 grobian Exp $
 
 inherit libtool flag-o-matic eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="aotuv"
 
 RDEPEND=">=media-libs/libogg-1.0"
@@ -59,7 +59,6 @@ src_compile() {
 	use hppa && replace-flags -march=2.0 -march=1.0
 
 	econf || die
-	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }