From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Thu, 11 Nov 2004 09:44:57 +0000 (+0000)
Subject: Cleanup after macos guys.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=05e287a338f6f5ccb4dcbbcb647311ccd52226c7;p=gentoo.git

Cleanup after macos guys.
---

diff --git a/media-libs/libvorbis/ChangeLog b/media-libs/libvorbis/ChangeLog
index 5d5729b44542..6c6ab8c8b47b 100644
--- a/media-libs/libvorbis/ChangeLog
+++ b/media-libs/libvorbis/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2004/11/01 10:58:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/ChangeLog,v 1.46 2004/11/11 09:44:57 eradicator Exp $
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libvorbis-1.0.1-r2.ebuild, libvorbis-1.1.0.ebuild:
+  Cleanup after macos guys.
 
   01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> libvorbis-1.1.0.ebuild:
   Stable on alpha.
diff --git a/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild b/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild
index 0ab5adfafbd4..963a4f0777cc 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.13 2004/11/08 15:39:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.0.1-r2.ebuild,v 1.14 2004/11/11 09:44:57 eradicator Exp $
 
 inherit libtool flag-o-matic gcc
 
@@ -28,9 +28,7 @@ src_unpack() {
 src_compile() {
 	# Fixes some strange sed-, libtool- and ranlib-errors on
 	# Mac OS X
-	if use macos; then
-		glibtoolize
-	elif use ppc-macos; then
+	if use ppc-macos; then
 		glibtoolize
 	else
 		elibtoolize
@@ -55,17 +53,13 @@ src_compile() {
 	append-ldflags -fPIC
 
 	econf || die
-	use macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	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
-	elif use ppc-macos; then
+	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
diff --git a/media-libs/libvorbis/libvorbis-1.1.0.ebuild b/media-libs/libvorbis/libvorbis-1.1.0.ebuild
index 8b51ccb93247..b36dcb2b242a 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-2004 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.8 2004/11/08 15:39:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvorbis/libvorbis-1.1.0.ebuild,v 1.9 2004/11/11 09:44:57 eradicator Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
@@ -26,7 +26,7 @@ src_unpack() {
 
 	# Fixes some strange sed-, libtool- and ranlib-errors on
 	# Mac OS X
-	if use macos || use ppc-macos; then
+	if use ppc-macos; then
 		glibtoolize
 	else
 		elibtoolize
@@ -54,17 +54,13 @@ src_compile() {
 	append-ldflags -fPIC
 
 	econf || die
-	use macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	use ppc-macos && cd ${S} && sed -i -e 's/examples//' Makefile
 	emake || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	if use macos; then
-		dosym /usr/$(get_libdir)/libvorbisfile.3.1.0.dylib /usr/$(get_libdir)/libvorbisfile.0.dylib
-		dosym /usr/$(get_libdir)/libvorbisenc.2.0.0.dylib /usr/$(get_libdir)/libvorbisenc.0.dylib
-	elif use ppc-macos; then
+	if use ppc-macos; then
 		dosym /usr/$(get_libdir)/libvorbisfile.3.1.0.dylib /usr/$(get_libdir)/libvorbisfile.0.dylib
 		dosym /usr/$(get_libdir)/libvorbisenc.2.0.0.dylib /usr/$(get_libdir)/libvorbisenc.0.dylib
 	else
diff --git a/media-libs/sdif/Manifest b/media-libs/sdif/Manifest
index 792f531f37e8..c23070360f11 100644
--- a/media-libs/sdif/Manifest
+++ b/media-libs/sdif/Manifest
@@ -1,5 +1,15 @@
-MD5 9ca51b6b469a67958d85a8c645c10038 ChangeLog 464
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c2554d29109c35b4f420c69aa255204 ChangeLog 565
 MD5 eddf170039964fad42c3d19d7a63bf81 metadata.xml 497
-MD5 6dcc4e9766fd9db3207c3b39870badc4 sdif-3.8.6.ebuild 1323
+MD5 4f8ec94a430e766b9d1d948f37eec0bb sdif-3.8.6.ebuild 1341
 MD5 3ba87254ca763ee63eef337f101a1138 files/digest-sdif-3.8.6 126
 MD5 dc3ba82219e697318a271e47a3694c00 files/sdif-3.8.6-cflags.patch 1369
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBkzWvArHZZzCEUG0RAklnAJ9Es+F1x4hLiEC0DNdY5osJMqAlEwCeJpdj
+ZeNT4/5L2o9JG7/HKo5pxBo=
+=UQu1
+-----END PGP SIGNATURE-----