Rename ogg useflag into vorbis useflag. Bug #101877.

Package-Manager: portage-2.1_pre5-r4

11 files changed, 59 insertions, 58 deletions

diff --git a/media-sound/asunder/ChangeLog b/media-sound/asunder/ChangeLog
index 0e7bf71261cc..bc35d363c255 100644
--- a/media-sound/asunder/ChangeLog
+++ b/media-sound/asunder/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/asunder
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/ChangeLog,v 1.2 2005/07/25 12:03:49 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/ChangeLog,v 1.3 2006/03/08 20:25:03 flameeyes Exp $
+
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> asunder-0.1.0.ebuild:
+  Rename ogg useflag into vorbis useflag. Bug #101877.
 
   25 Jul 2005; David Holm <dholm@gentoo.org> asunder-0.1.0.ebuild:
   Added to ~ppc.
diff --git a/media-sound/asunder/asunder-0.1.0.ebuild b/media-sound/asunder/asunder-0.1.0.ebuild
index fec432f90be9..d0fb3de30b2d 100644
--- a/media-sound/asunder/asunder-0.1.0.ebuild
+++ b/media-sound/asunder/asunder-0.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/asunder-0.1.0.ebuild,v 1.2 2005/07/25 12:03:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/asunder/asunder-0.1.0.ebuild,v 1.3 2006/03/08 20:25:03 flameeyes Exp $
 
 MY_P=Asunder-${PV}
 S=${WORKDIR}/${MY_P}
 
-IUSE="doc mp3 ogg flac"
+IUSE="doc mp3 vorbis flac"
 
 DESCRIPTION="Asunder is a graphical CD ripper and encoder"
 SRC_URI="http://ericlathrop.com/${PN}/${MY_P}.tar.bz2"
@@ -19,7 +19,7 @@ DEPEND=">=x11-libs/gtk+-2.4
 	>=media-libs/libcddb-0.9.5
 	media-sound/cdparanoia
 	mp3? ( media-sound/lame )
-	ogg? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	flac? ( media-libs/flac )"
 RDEPEND="${DEPEND}"
 
diff --git a/media-sound/mp3splt/ChangeLog b/media-sound/mp3splt/ChangeLog
index 13d288ec84f4..e56347922ed8 100644
--- a/media-sound/mp3splt/ChangeLog
+++ b/media-sound/mp3splt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3splt
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.15 2005/09/14 07:37:43 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.16 2006/03/08 20:22:45 flameeyes Exp $
+
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> mp3splt-1.9.ebuild,
+  mp3splt-2.0.ebuild, mp3splt-2.1.ebuild:
+  Rename ogg useflag into vorbis useflag. Bug #101877.
 
   14 Sep 2005; Aron Griffis <agriffis@gentoo.org> mp3splt-2.0.ebuild:
   Mark 2.0 stable on alpha
diff --git a/media-sound/mp3splt/mp3splt-1.9.ebuild b/media-sound/mp3splt/mp3splt-1.9.ebuild
index 15f2a86b0ff1..2f25c5aa108f 100644
--- a/media-sound/mp3splt/mp3splt-1.9.ebuild
+++ b/media-sound/mp3splt/mp3splt-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-1.9.ebuild,v 1.7 2005/04/15 03:35:13 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-1.9.ebuild,v 1.8 2006/03/08 20:22:45 flameeyes Exp $
 
 IUSE=""
 
@@ -16,11 +16,6 @@ DEPEND="media-libs/libogg
 	media-libs/libvorbis
 	media-sound/madplay"
 
-src_compile() {
-	econf || die
-	emake || die "build failed"
-}
-
 src_install() {
 	einstall || die "install failed"
 }
diff --git a/media-sound/mp3splt/mp3splt-2.0.ebuild b/media-sound/mp3splt/mp3splt-2.0.ebuild
index 321e48d43cd2..07724d4283c2 100644
--- a/media-sound/mp3splt/mp3splt-2.0.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.0.ebuild,v 1.7 2005/09/14 07:37:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.0.ebuild,v 1.8 2006/03/08 20:22:45 flameeyes Exp $
 
 IUSE=""
 
@@ -16,11 +16,6 @@ DEPEND="media-libs/libogg
 	media-libs/libvorbis
 	media-sound/madplay"
 
-src_compile() {
-	econf || die
-	emake || die "build failed"
-}
-
 src_install() {
 	einstall || die "install failed"
 }
diff --git a/media-sound/mp3splt/mp3splt-2.1.ebuild b/media-sound/mp3splt/mp3splt-2.1.ebuild
index 21fe6ed2ed66..0ee7f0669fec 100644
--- a/media-sound/mp3splt/mp3splt-2.1.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.1.ebuild,v 1.4 2005/05/28 12:06:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.1.ebuild,v 1.5 2006/03/08 20:22:45 flameeyes Exp $
 
-DESCRIPTION="A command line utility to split mp3 and ogg files"
+DESCRIPTION="A command line utility to split mp3 and vorbis files"
 HOMEPAGE="http://mp3splt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mp3splt/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa -mips ~ppc ~sparc ~x86"
-IUSE="ogg"
+IUSE="vorbis"
 
-DEPEND="ogg? ( media-libs/libogg
-	media-libs/libvorbis )
+DEPEND="vorbis? ( media-libs/libvorbis )
 	media-libs/libmad"
 
 src_compile() {
 	local myconf
 
 	# --enable-ogg doesn't enable ogg...
-	use ogg || myconf="--disable-ogg"
+	use vorbis || myconf="--disable-ogg"
 	econf ${myconf} || die "econf failed"
 
 	emake || die "build failed"
diff --git a/media-sound/prokyon3/ChangeLog b/media-sound/prokyon3/ChangeLog
index 4ed29289e68d..2dd35d81de1c 100644
--- a/media-sound/prokyon3/ChangeLog
+++ b/media-sound/prokyon3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/prokyon3
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.14 2005/11/16 14:48:38 greg_g Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.15 2006/03/08 20:29:56 flameeyes Exp $
+
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> prokyon3-0.9.2.ebuild,
+  prokyon3-0.9.4.ebuild:
+  Rename ogg useflag into vorbis useflag. Bug #101877.
 
 *prokyon3-0.9.4 (16 Nov 2005)
 
diff --git a/media-sound/prokyon3/prokyon3-0.9.2.ebuild b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
index a0155bdc7974..881a53d24ced 100644
--- a/media-sound/prokyon3/prokyon3-0.9.2.ebuild
+++ b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.12 2005/11/16 14:49:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.13 2006/03/08 20:29:56 flameeyes Exp $
 
 inherit eutils
 
@@ -11,15 +11,14 @@ SRC_URI="mirror://sourceforge/prokyon3/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="ogg"
+IUSE="vorbis"
 
 RESTRICT="primaryuri"
 
 DEPEND="=x11-libs/qt-3*
 	dev-db/mysql
 	>=media-libs/id3lib-3.8.2
-	ogg? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
 
 pkg_setup() {
 	if has_version x11-libs/qt && ! built_with_use x11-libs/qt mysql ; then
@@ -40,7 +39,7 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_with ogg) \
+		$(use_with vorbis ogg) \
 		|| die "configure failed"
 
 	emake || die "make failed"
diff --git a/media-sound/prokyon3/prokyon3-0.9.4.ebuild b/media-sound/prokyon3/prokyon3-0.9.4.ebuild
index 02ec54ca9b0a..4a1b3e2721c8 100644
--- a/media-sound/prokyon3/prokyon3-0.9.4.ebuild
+++ b/media-sound/prokyon3/prokyon3-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.4.ebuild,v 1.2 2006/01/09 22:22:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.4.ebuild,v 1.3 2006/03/08 20:29:56 flameeyes Exp $
 
 inherit qt3 eutils
 
@@ -16,10 +16,9 @@ IUSE="flac mp3 musicbrainz vorbis"
 DEPEND="=x11-libs/qt-3*
 	media-libs/taglib
 	musicbrainz? ( media-libs/musicbrainz
-	               mp3? ( media-libs/libmad )
-	               vorbis? ( media-libs/libogg
-	                         media-libs/libvorbis )
-	               flac? ( media-libs/flac ) )"
+		mp3? ( media-libs/libmad )
+		vorbis? ( media-libs/libvorbis )
+		flac? ( media-libs/flac ) )"
 
 pkg_setup() {
 	if ! built_with_use x11-libs/qt mysql; then
@@ -34,19 +33,19 @@ src_compile() {
 	# requires dev-libs/xmlwrapp.
 
 	local myconf="--with-taglib
-	              --without-id3
-	              --without-mysql-embedded
-	              --without-musicextras"
+			--without-id3
+			--without-mysql-embedded
+			--without-musicextras"
 
 	if use musicbrainz; then
 		myconf="${myconf}
-	                --with-musicbrainz
-		        $(use_with mp3 mad)
-		        $(use_with vorbis ogg)
-		        $(use_with flac)"
+			--with-musicbrainz
+			$(use_with mp3 mad)
+			$(use_with vorbis ogg)
+			$(use_with flac)"
 	else
 		myconf="${myconf}
-	                --without-musicbrainz"
+			--without-musicbrainz"
 	fi
 
 	econf ${myconf}	|| die "configure failed"
diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 6442ad203a63..a02eaec80263 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/yammi
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.26 2005/06/28 21:22:23 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.27 2006/03/08 20:17:46 flameeyes Exp $
+
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> yammi-1.2.ebuild:
+  Rename ogg useflag into vorbis useflag. Bug #101877.
 
   28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> yammi-1.2.ebuild:
   Stable on sparc
diff --git a/media-sound/yammi/yammi-1.2.ebuild b/media-sound/yammi/yammi-1.2.ebuild
index e8497c515c5a..3bbb11088884 100644
--- a/media-sound/yammi/yammi-1.2.ebuild
+++ b/media-sound/yammi/yammi-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.ebuild,v 1.5 2005/06/28 21:22:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.ebuild,v 1.6 2006/03/08 20:17:46 flameeyes Exp $
 
 inherit kde
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc ~ppc"
-IUSE="cdr encode kde ogg xmms"
+IUSE="cdr encode kde vorbis xmms"
 
 DEPEND=">=media-libs/taglib-1.3
 	xmms? ( media-sound/xmms )"
@@ -20,9 +20,9 @@ RDEPEND="${DEPEND}
 	kde? ( || ( kde-base/noatun kde-base/kdemultimedia ) )
 	media-sound/sox
 	virtual/mpg123
-	ogg? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	encode? ( media-sound/cdparanoia
-		  media-sound/lame )"
+		media-sound/lame )"
 
 # sox, mpg123 and vorbis-tools are used for the 'prelisten' feature.
 # cdparanoia and lame are used by the yammiGrabAndEncode script.