Added to ~macos and made it compile there.

3 files changed, 31 insertions, 14 deletions

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 599b8da64fad..4897e5ae267e 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvorbis
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.37 2004/06/24 23:15:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.38 2004/09/12 10:32:54 hansmi Exp $
+
+  12 Sep 2004; Michael Hanselmann <hansmi@gentoo.org>
+  libvorbis-1.0.1-r2.ebuild:
+  Corrected the ebuild to compile on Mac OS X. Thanks to Vincent Strubel who
+  submitted the patch in Bug #58006. Added to ~macos.
 
   20 Jun 2004; Tom Gall <tgall@gentoo.org> libvorbis-1.0.1-r2.ebuild:
   stable on ppc64, bug #54142
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 2499251532e6..0cfb1921f31b 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,16 +1,16 @@
 MD5 39a03627e7b9e258a17bf677159ad323 libvorbis-1.0-r3.ebuild 1752
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 1006092c0d016397289f5f4a8b9b1a3a ChangeLog 5583
+MD5 b4a9576811d4479d454dedbc9d93e763 libvorbis-1.0-r4.ebuild 2139
+MD5 1c706017916161136a3f764d48df9125 libvorbis-1.0.1-r2.ebuild 2114
 MD5 f1a0593c6fca92da1a04d7b940b5c42b libvorbis-1.0.1-r1.ebuild 1749
-MD5 7460c3d20229bd297b4477425f1b66f4 libvorbis-1.0.1.ebuild 1664
 MD5 9c841282d43915e9423e9fefb2cb9a7c libvorbis-1.0-r2.ebuild 1696
-MD5 b4a9576811d4479d454dedbc9d93e763 libvorbis-1.0-r4.ebuild 2139
-MD5 c159c5d906c90e0628dc68a30b5c383a libvorbis-1.0.1-r2.ebuild 1757
-MD5 c4cd1be7016551c7f364bf4adbad13f2 ChangeLog 5370
-MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
-MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1 68
+MD5 7460c3d20229bd297b4477425f1b66f4 libvorbis-1.0.1.ebuild 1664
+MD5 174ab9630810bce8aac9eac4f4f20247 files/libvorbis-simd.patch 28887
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r2 65
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r3 65
+MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1-r2 68
 MD5 0a0d3872bdf2c6da4e3fe5471fd3eb16 files/digest-libvorbis-1.0-r4 65
 MD5 069e26021a32d3d105c544229e071e5f files/libvorbis-m4.patch 919
 MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1-r1 68
-MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1-r2 68
-MD5 174ab9630810bce8aac9eac4f4f20247 files/libvorbis-simd.patch 28887
+MD5 fa4a831d30804a9840476e2e65c42241 files/digest-libvorbis-1.0.1 68
diff --git a/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild b/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild
index 3dd683e0c728..1c1b3cb50542 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-2004 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.8 2004/06/24 23:15:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild,v 1.9 2004/09/12 10:32:54 hansmi Exp $
 
 inherit libtool flag-o-matic gcc
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.vorbis.com/files/${PV}/unix/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 amd64 mips sparc hppa alpha ia64 ppc ppc64"
+KEYWORDS="x86 amd64 mips sparc hppa alpha ia64 ppc ppc64 ~macos"
 
 IUSE=""
 
@@ -27,7 +27,13 @@ src_unpack() {
 }
 
 src_compile() {
-	elibtoolize
+	# Fixes some strange sed-, libtool- and ranlib-errors on
+	# Mac OS X
+	if use macos; then
+		glibtoolize
+	else
+		elibtoolize
+	fi
 
 	# Cannot compile with sse2 support it would seem #36104
 	use x86 && [ $(gcc-major-version) -eq 3 ] && append-flags -mno-sse2
@@ -48,13 +54,19 @@ src_compile() {
 	append-ldflags -fPIC
 
 	econf || die
+	use macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	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
+	if use 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
 
 	rm -rf ${D}/usr/share/doc
 	dodoc AUTHORS COPYING README todo.txt