oggvorbis Cleanup

(Portage version: 2.1_pre1)

8 files changed, 32 insertions, 22 deletions

diff --git a/app-cdr/burncenter/ChangeLog b/app-cdr/burncenter/ChangeLog
index 38e605d7733c..6f1684c9ae99 100644
--- a/app-cdr/burncenter/ChangeLog
+++ b/app-cdr/burncenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/burncenter
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncenter/ChangeLog,v 1.11 2005/08/31 14:18:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncenter/ChangeLog,v 1.12 2005/12/26 15:45:52 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> burncenter-3.0.ebuild,
+  burncenter-3.1.ebuild, burncenter-3.2.1.ebuild:
+  oggvorbis Cleanup
 
   31 Aug 2005; Luis Medinas <metalgod@gentoo.org> burncenter-3.2.1.ebuild:
   Fixing Keywords from the last commit
diff --git a/app-cdr/burncenter/burncenter-3.0.ebuild b/app-cdr/burncenter/burncenter-3.0.ebuild
index 05bdedba84c2..b2204f61a662 100644
--- a/app-cdr/burncenter/burncenter-3.0.ebuild
+++ b/app-cdr/burncenter/burncenter-3.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/app-cdr/burncenter/burncenter-3.0.ebuild,v 1.12 2005/01/01 12:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncenter/burncenter-3.0.ebuild,v 1.13 2005/12/26 15:45:52 lu_zero Exp $
 
 DESCRIPTION="Easy-to-use text based interface to the UNIX CD burning tools"
 HOMEPAGE="http://alx14.free.fr/burncenter/"
@@ -9,13 +9,13 @@ SRC_URI="http://alx14.free.fr/burncenter/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE="oggvorbis"
+IUSE="vorbis"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	>=app-cdr/cdrtools-1.11
 	virtual/mpg123
-	oggvorbis? (
+	vorbis? (
 		>=media-sound/vorbis-tools-1.0_rc2
 		>=media-sound/oggtst-0.0 )"
 
diff --git a/app-cdr/burncenter/burncenter-3.1.ebuild b/app-cdr/burncenter/burncenter-3.1.ebuild
index 41843e6eb3b8..32798f6eb25b 100644
--- a/app-cdr/burncenter/burncenter-3.1.ebuild
+++ b/app-cdr/burncenter/burncenter-3.1.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/app-cdr/burncenter/burncenter-3.1.ebuild,v 1.8 2005/01/01 12:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncenter/burncenter-3.1.ebuild,v 1.9 2005/12/26 15:45:52 lu_zero Exp $
 
 DESCRIPTION="A Perl module and a collection of easy-to-use text based interfaces to the UNIX CD burning tools"
 HOMEPAGE="http://alx14.free.fr/burncenter/"
@@ -9,13 +9,13 @@ SRC_URI="http://alx14.free.fr/burncenter/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-IUSE="oggvorbis"
+IUSE="vorbis"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	>=app-cdr/cdrtools-1.11
 	virtual/mpg123
-	oggvorbis? (
+	vorbis? (
 		>=media-sound/vorbis-tools-1.0_rc2
 		>=media-sound/oggtst-0.0 )"
 
diff --git a/app-cdr/burncenter/burncenter-3.2.1.ebuild b/app-cdr/burncenter/burncenter-3.2.1.ebuild
index a1f8bae80072..76e0d7456136 100644
--- a/app-cdr/burncenter/burncenter-3.2.1.ebuild
+++ b/app-cdr/burncenter/burncenter-3.2.1.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/app-cdr/burncenter/burncenter-3.2.1.ebuild,v 1.2 2005/08/31 14:18:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/burncenter/burncenter-3.2.1.ebuild,v 1.3 2005/12/26 15:45:52 lu_zero Exp $
 
 DESCRIPTION="A Perl module and a collection of easy-to-use text based interfaces to the UNIX CD burning tools"
 HOMEPAGE="http://alx14.free.fr/burncenter/"
@@ -9,13 +9,13 @@ SRC_URI="http://alx14.free.fr/burncenter/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="oggvorbis"
+IUSE="vorbis"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	>=app-cdr/cdrtools-1.11
 	virtual/mpg123
-	oggvorbis? (
+	vorbis? (
 		>=media-sound/vorbis-tools-1.0_rc2
 		>=media-sound/oggtst-0.0 )"
 
diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index d41c8d6edc11..a58de2a560c2 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.77 2005/11/26 22:24:05 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.78 2005/12/26 15:41:44 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> cdrdao-1.1.7-r3.ebuild:
+  oggvorbis Cleanup
 
 *cdrdao-1.2.1 (26 Nov 2005)
 
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
index 4537c24f5c90..071cc8a349d8 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r3.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/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.13 2005/01/01 12:10:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r3.ebuild,v 1.14 2005/12/26 15:41:44 lu_zero Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,11 +11,11 @@ SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="gnome oggvorbis perl"
+IUSE="gnome vorbis perl"
 
 RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
 	>=dev-cpp/gnomemm-1.2.2 )
-	x86? ( perl? ( oggvorbis? ( dev-perl/libvorbis-perl ) ) )
+	x86? ( perl? ( vorbis? ( dev-perl/libvorbis-perl ) ) )
 	dev-perl/MP3-Info
 	dev-perl/Audio-Wav
 	dev-perl/Audio-Tools
@@ -31,7 +31,7 @@ src_unpack() {
 	epatch ${FILESDIR}/1.1.8-gcc34.patch
 	epatch ${FILESDIR}/${P}-r2-mp32dao-gentoo.diff
 
-	if ! use oggvorbis ; then
+	if ! use vorbis ; then
 		cd ${S}/contrib/mp32dao
 		sed -i '22s/^/#/' MediaHandler.pm
 	fi
@@ -81,7 +81,7 @@ src_install() {
 	insinto /usr/share/cdrdao/mp32dao
 	doins contrib/mp32dao/MediaHandler.pm contrib/mp32dao/mp3handler.pm \
 		contrib/mp32dao/BaseInfo.pm
-	use oggvorbis && doins contrib/mp32dao/ogghandler.pm
+	use vorbis && doins contrib/mp32dao/ogghandler.pm
 
 	# cdrdao gets definitely installed
 	# binary
diff --git a/app-cdr/cdw/ChangeLog b/app-cdr/cdw/ChangeLog
index c9a641c2d415..de048da46516 100644
--- a/app-cdr/cdw/ChangeLog
+++ b/app-cdr/cdw/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/cdw
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/ChangeLog,v 1.10 2005/07/08 16:00:52 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/ChangeLog,v 1.11 2005/12/26 15:44:43 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> cdw-0.2.3.ebuild:
+  oggvorbis Cleanup
 
   08 Jul 2005; David Holm <dholm@gentoo.org> cdw-0.2.3.ebuild:
   Added to ~ppc.
diff --git a/app-cdr/cdw/cdw-0.2.3.ebuild b/app-cdr/cdw/cdw-0.2.3.ebuild
index 0969500c7be1..63a0f2c02e35 100644
--- a/app-cdr/cdw/cdw-0.2.3.ebuild
+++ b/app-cdr/cdw/cdw-0.2.3.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/app-cdr/cdw/cdw-0.2.3.ebuild,v 1.3 2005/07/08 16:00:52 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.2.3.ebuild,v 1.4 2005/12/26 15:44:43 lu_zero Exp $
 
 inherit eutils
 
@@ -13,14 +13,14 @@ SRC_URI="mirror://sourceforge/cdw/${PN}-${PV/_/-}.tar.gz
 KEYWORDS="~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="encode gtk mysql nls oggvorbis sqlite"
+IUSE="encode gtk mysql nls vorbis sqlite"
 
 RDEPEND="virtual/cdrtools
 	gtk? ( >=x11-libs/gtk+-2
 			>=dev-libs/glib-2 )
 	sys-libs/ncurses
 	sys-libs/zlib
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	sqlite? ( dev-db/sqlite )
 	mysql? ( dev-db/mysql )
 	encode? ( media-sound/lame )"
@@ -40,9 +40,9 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	use oggvorbis \
+	use vorbis \
 		&& myconf="${myconf} --with-oggenc=/usr/bin/oggenc" \
-		|| myconf="${myconf} $(use_with oggvorbis oggenc)"
+		|| myconf="${myconf} $(use_with vorbis oggenc)"
 
 	use encode \
 		&& myconf="${myconf} --with-lame=/usr/bin/lame" \