oggvorbis Cleanup

(Portage version: 2.1_pre1)

6 files changed, 25 insertions, 17 deletions

diff --git a/media-sound/grip/ChangeLog b/media-sound/grip/ChangeLog
index 150dc0eb903f..1f992421fc9c 100644
--- a/media-sound/grip/ChangeLog
+++ b/media-sound/grip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/grip
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/ChangeLog,v 1.61 2005/11/07 10:33:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/ChangeLog,v 1.62 2005/12/26 15:05:10 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> grip-3.3.0.ebuild,
+  grip-3.3.1.ebuild:
+  oggvorbis Cleanup
 
   07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> grip-3.3.0.ebuild,
   grip-3.3.1.ebuild:
diff --git a/media-sound/grip/grip-3.3.0.ebuild b/media-sound/grip/grip-3.3.0.ebuild
index 13d97fb236ed..fb15ac3362f5 100644
--- a/media-sound/grip/grip-3.3.0.ebuild
+++ b/media-sound/grip/grip-3.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.0.ebuild,v 1.9 2005/11/07 10:33:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.0.ebuild,v 1.10 2005/12/26 15:05:10 lu_zero Exp $
 
 inherit gnuconfig flag-o-matic eutils toolchain-funcs
 
-IUSE="nls oggvorbis"
+IUSE="nls vorbis"
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper."
 HOMEPAGE="http://www.nostatic.org/grip"
@@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.2
 	>=gnome-base/orbit-2
 	gnome-base/libghttp
 	net-misc/curl
-	oggvorbis? ( media-sound/vorbis-tools )"
+	vorbis? ( media-sound/vorbis-tools )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
diff --git a/media-sound/grip/grip-3.3.1.ebuild b/media-sound/grip/grip-3.3.1.ebuild
index fdbd79b76b64..10cd54dca9ed 100644
--- a/media-sound/grip/grip-3.3.1.ebuild
+++ b/media-sound/grip/grip-3.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1.ebuild,v 1.2 2005/11/07 10:33:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.1.ebuild,v 1.3 2005/12/26 15:05:10 lu_zero Exp $
 
 inherit gnuconfig flag-o-matic eutils toolchain-funcs
 
-IUSE="nls oggvorbis"
+IUSE="nls vorbis"
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper."
 HOMEPAGE="http://www.nostatic.org/grip"
@@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.2
 	>=gnome-base/orbit-2
 	gnome-base/libghttp
 	net-misc/curl
-	oggvorbis? ( media-sound/vorbis-tools )"
+	vorbis? ( media-sound/vorbis-tools )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index bfaa1596c986..0d330eeae711 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3blaster
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.20 2005/04/08 17:27:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.21 2005/12/26 15:09:42 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> mp3blaster-3.1.3.ebuild,
+  mp3blaster-3.2.0.ebuild:
+  oggvorbis Cleanup
 
   08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   mp3blaster-3.2.0.ebuild:
diff --git a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
index 4be28082e01a..f78dce499451 100644
--- a/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild
@@ -1,6 +1,6 @@
-# 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-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.12 2004/10/30 10:56:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.3.ebuild,v 1.13 2005/12/26 15:09:42 lu_zero Exp $
 
 inherit toolchain-funcs
 
@@ -11,11 +11,11 @@ SRC_URI="http://www.stack.nl/~brama/mp3blaster/src/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="x86 ppc ~alpha ~sparc amd64"
 LICENSE="GPL-2"
-IUSE="oggvorbis mysql"
+IUSE="vorbis mysql"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	mysql? ( >=dev-db/mysql-3.23.36 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
 src_unpack() {
@@ -37,7 +37,7 @@ src_compile() {
 	#use nas || myconf="${myconf} --disable-nas"
 	myconf="${myconf} --disable-nas"
 	use mysql && myconf="${myconf} --with-mysql"
-	use oggvorbis || myconf="${myconf} --without-oggvorbis"
+	use vorbis || myconf="${myconf} --without-vorbis"
 
 	econf ${myconf} || die
 	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
index 163cb90b3744..74eec1048225 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.0.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-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.10 2005/04/08 17:27:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.0.ebuild,v 1.11 2005/12/26 15:09:42 lu_zero Exp $
 
 inherit toolchain-funcs
 
@@ -11,12 +11,12 @@ SRC_URI="http://www.stack.nl/~brama/mp3blaster/src/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="x86 ppc alpha sparc amd64 ~ppc64"
 LICENSE="GPL-2"
-IUSE="oggvorbis mysql lirc"
+IUSE="vorbis mysql lirc"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	mysql? ( >=dev-db/mysql-3.23.36 )
 	lirc? ( app-misc/lirc )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
 src_unpack() {
@@ -38,7 +38,7 @@ src_compile() {
 	myconf="${myconf} --without-nas \
 	        `use_with lirc` \
 	        `use_with mysql` \
-	        `use_with oggvorbis`"
+	        `use_with vorbis`"
 
 	econf ${myconf} || die
 	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" || die