oggvorbis Cleanup

(Portage version: 2.1_pre1)

7 files changed, 29 insertions, 21 deletions

diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index bc5a5782b16c..49e5618fcf80 100644
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/bossogg
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.16 2005/11/07 10:42:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.17 2005/12/26 14:55:15 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> bossogg-0.13.5.ebuild,
+  bossogg-0.13.6.ebuild, bossogg-0.13.6-r2.ebuild:
+  oggvorbis Cleanup
 
   07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> bossogg-0.13.5.ebuild,
   bossogg-0.13.6.ebuild, bossogg-0.13.6-r2.ebuild, bossogg-0.13.6-r3.ebuild:
diff --git a/media-sound/bossogg/bossogg-0.13.5.ebuild b/media-sound/bossogg/bossogg-0.13.5.ebuild
index a236f84bd661..8563bdecb69b 100644
--- a/media-sound/bossogg/bossogg-0.13.5.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.5.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/bossogg/bossogg-0.13.5.ebuild,v 1.7 2005/11/07 10:42:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.5.ebuild,v 1.8 2005/12/26 14:55:15 lu_zero Exp $
 
 inherit eutils
 
-IUSE="oggvorbis mad"
+IUSE="vorbis mad"
 
 DESCRIPTION="Bossogg Music Server"
 HOMEPAGE="http://bossogg.wishy.org"
@@ -16,7 +16,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/libao-0.8.3
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
@@ -26,7 +26,7 @@ src_compile() {
 	local myconf
 	myconf=""
 
-	use oggvorbis \
+	use vorbis \
 		|| myconf="${myconf} --disable-ogg  --disable-oggtest \
 		   --disable-vorbistest"
 	use mad || myconf="${myconf} --disable-mp3"
diff --git a/media-sound/bossogg/bossogg-0.13.6-r2.ebuild b/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
index 0ec026b2c284..3a527144846a 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-r2.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/bossogg/bossogg-0.13.6-r2.ebuild,v 1.2 2005/11/07 10:42:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r2.ebuild,v 1.3 2005/12/26 14:55:15 lu_zero Exp $
 
 inherit eutils
 
-IUSE="oggvorbis mad flac"
+IUSE="vorbis mad flac"
 
 DESCRIPTION="Bossogg Music Server"
 HOMEPAGE="http://bossogg.wishy.org"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 DEPEND=">=media-libs/libao-0.8.3
 	media-libs/libshout
 	flac? ( media-libs/flac )
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
@@ -43,7 +43,7 @@ src_unpack() {
 src_compile() {
 	libtoolize --copy --force	# per bug number 83003
 	econf --enable-shout \
-	      `use_enable oggvorbis vorbis` \
+	      `use_enable vorbis` \
 	      `use_enable flac` \
 	      `use_enable mad mp3` \
 	      `use_enable mad id3` || die "could not configure"
diff --git a/media-sound/bossogg/bossogg-0.13.6.ebuild b/media-sound/bossogg/bossogg-0.13.6.ebuild
index cc7b67df3abd..d48c113b303c 100644
--- a/media-sound/bossogg/bossogg-0.13.6.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6.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/bossogg/bossogg-0.13.6.ebuild,v 1.12 2005/11/07 10:42:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6.ebuild,v 1.13 2005/12/26 14:55:15 lu_zero Exp $
 
 inherit eutils
 
-IUSE="oggvorbis mad flac"
+IUSE="vorbis mad flac"
 
 DESCRIPTION="Bossogg Music Server"
 HOMEPAGE="http://bossogg.wishy.org"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 DEPEND=">=media-libs/libao-0.8.3
 	media-libs/libshout
 	flac? ( media-libs/flac )
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
@@ -43,7 +43,7 @@ src_unpack() {
 
 src_compile() {
 	econf --enable-shout \
-	      `use_enable oggvorbis vorbis` \
+	      `use_enable vorbis` \
 	      `use_enable flac` \
 	      `use_enable mad mp3` \
 	      `use_enable mad id3` || die "could not configure"
diff --git a/media-sound/galan/ChangeLog b/media-sound/galan/ChangeLog
index 2782afd0cf8b..ecb5409d67b3 100644
--- a/media-sound/galan/ChangeLog
+++ b/media-sound/galan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/galan
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.17 2005/06/12 12:14:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/ChangeLog,v 1.18 2005/12/26 14:58:11 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> galan-0.2.14.ebuild,
+  galan-0.3.0_beta6.ebuild:
+  oggvorbis Cleanup
 
   12 Jun 2005; Sven Wegener <swegener@gentoo.org> galan-0.2.14.ebuild:
   Removed * postfix from <, <=, >= and > dependencies.
diff --git a/media-sound/galan/galan-0.2.14.ebuild b/media-sound/galan/galan-0.2.14.ebuild
index be19866196b1..89c01d6dfbf5 100644
--- a/media-sound/galan/galan-0.2.14.ebuild
+++ b/media-sound/galan/galan-0.2.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.2.14.ebuild,v 1.12 2005/06/12 12:14:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.2.14.ebuild,v 1.13 2005/12/26 14:58:11 lu_zero Exp $
 
-IUSE="oggvorbis alsa opengl esd"
+IUSE="vorbis alsa opengl esd"
 
 inherit eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="sparc x86"
 
 DEPEND=">=x11-libs/gtk+-1.2
 	media-libs/gdk-pixbuf
-	oggvorbis? ( >=media-sound/vorbis-tools-1.0 )
+	vorbis? ( >=media-sound/vorbis-tools-1.0 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
 	opengl? ( >=x11-libs/gtkglarea-1.2 )
 	esd? ( media-sound/esound )
diff --git a/media-sound/galan/galan-0.3.0_beta6.ebuild b/media-sound/galan/galan-0.3.0_beta6.ebuild
index 0f2d66074949..0866478310d4 100644
--- a/media-sound/galan/galan-0.3.0_beta6.ebuild
+++ b/media-sound/galan/galan-0.3.0_beta6.ebuild
@@ -1,8 +1,8 @@
-# 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/galan/galan-0.3.0_beta6.ebuild,v 1.5 2004/12/29 02:53:35 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/galan/galan-0.3.0_beta6.ebuild,v 1.6 2005/12/26 14:58:11 lu_zero Exp $
 
-IUSE="oggvorbis alsa opengl esd jack"
+IUSE="vorbis alsa opengl esd jack"
 
 DESCRIPTION="gAlan - Graphical Audio Language"
 HOMEPAGE="http://galan.sourceforge.net/"
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=x11-libs/gtk+-2.0
-	oggvorbis? ( >=media-sound/vorbis-tools-1.0 )
+	vorbis? ( >=media-sound/vorbis-tools-1.0 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
 	opengl? ( >=x11-libs/gtkglarea-1.99.0 )
 	esd? ( media-sound/esound )