oggvorbis Cleanup

(Portage version: 2.1_pre1)

4 files changed, 18 insertions, 12 deletions

diff --git a/media-libs/osalp/ChangeLog b/media-libs/osalp/ChangeLog
index e62968915137..12328f223fc8 100644
--- a/media-libs/osalp/ChangeLog
+++ b/media-libs/osalp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/osalp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/osalp/ChangeLog,v 1.3 2004/06/24 23:18:37 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/osalp/ChangeLog,v 1.4 2005/12/26 12:39:33 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> osalp-0.7.3.ebuild:
+  oggvorbis Cleanup
 
 *osalp-0.7.3 (20 Aug 2002)
 
diff --git a/media-libs/osalp/osalp-0.7.3.ebuild b/media-libs/osalp/osalp-0.7.3.ebuild
index 027f5011d65e..18dd56078525 100644
--- a/media-libs/osalp/osalp-0.7.3.ebuild
+++ b/media-libs/osalp/osalp-0.7.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/osalp/osalp-0.7.3.ebuild,v 1.7 2004/07/14 20:22:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/osalp/osalp-0.7.3.ebuild,v 1.8 2005/12/26 12:39:33 lu_zero Exp $
 
-IUSE="encode oggvorbis"
+IUSE="encode vorbis"
 
 DESCRIPTION="Open Source Audio Library Project"
 HOMEPAGE="http://osalp.sourceforge.net/"
 LICENSE="GPL-2"
 
 DEPEND="encode? ( >=media-sound/lame-1.89 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
 
 SLOT="0"
 KEYWORDS="x86"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/osalp/${P}.tar.gz"
 src_compile() {
 	local myconf
 	use encode && myconf="--enable-lame"
-	use oggvorbis && myconf="${myconf} --enable-ogg"
+	use vorbis && myconf="${myconf} --enable-ogg"
 	./configure \
 		${myconf} \
 		--host=${CHOST} \
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 6e1ae9760a32..40f97e20380d 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.31 2005/11/11 00:46:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.32 2005/12/26 12:43:18 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> sdl-mixer-1.2.5-r1.ebuild:
+  oggvorbis Cleanup
 
   11 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
   sdl-mixer-1.2.6-r1.ebuild:
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
index 1f2989069dce..643edf53e6df 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild,v 1.19 2005/11/04 16:22:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5-r1.ebuild,v 1.20 2005/12/26 12:43:18 lu_zero Exp $
 
 inherit eutils gnuconfig
 
@@ -13,12 +13,12 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="mp3 mikmod oggvorbis"
+IUSE="mp3 mikmod vorbis"
 
 #	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 RDEPEND=">=media-libs/libsdl-1.2.5
 	mp3? ( >=media-libs/smpeg-0.4.4-r1 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -41,7 +41,7 @@ src_compile() {
 	econf \
 		$(use_enable mikmod mod) \
 		$(use_enable mp3 music-mp3) \
-		$(use_enable oggvorbis music-ogg) \
+		$(use_enable vorbis music-ogg) \
 		|| die
 	emake || die "emake failed"
 }