oggvorbis Cleanup

(Portage version: 2.1_pre1)

8 files changed, 31 insertions, 22 deletions

diff --git a/app-cdr/nero/ChangeLog b/app-cdr/nero/ChangeLog
index 037b22a1293c..b131991189c9 100644
--- a/app-cdr/nero/ChangeLog
+++ b/app-cdr/nero/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/nero
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.12 2005/11/27 16:30:44 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/ChangeLog,v 1.13 2005/12/26 15:39:53 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> nero-2.0.0.3b.ebuild,
+  nero-2.0.0.3b-r2.ebuild:
+  oggvorbis Cleanup
 
 *nero-2.0.0.3b-r2 (27 Nov 2005)
 
diff --git a/app-cdr/nero/nero-2.0.0.3b-r2.ebuild b/app-cdr/nero/nero-2.0.0.3b-r2.ebuild
index d3b6d73e8ae3..1a2068f0c4e1 100644
--- a/app-cdr/nero/nero-2.0.0.3b-r2.ebuild
+++ b/app-cdr/nero/nero-2.0.0.3b-r2.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/nero/nero-2.0.0.3b-r2.ebuild,v 1.1 2005/11/27 16:30:44 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-2.0.0.3b-r2.ebuild,v 1.2 2005/12/26 15:39:53 lu_zero Exp $
 
 inherit eutils rpm multilib
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp2.us.nero.com/${NERO_RPM}
 LICENSE="Nero"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="mp3 oggvorbis shorten"
+IUSE="mp3 vorbis shorten"
 DEPEND=""
 RDEPEND="virtual/libc
 	virtual/x11
diff --git a/app-cdr/nero/nero-2.0.0.3b.ebuild b/app-cdr/nero/nero-2.0.0.3b.ebuild
index ef9debc2c328..19492e938b2a 100644
--- a/app-cdr/nero/nero-2.0.0.3b.ebuild
+++ b/app-cdr/nero/nero-2.0.0.3b.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/nero/nero-2.0.0.3b.ebuild,v 1.2 2005/09/22 21:17:50 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nero/nero-2.0.0.3b.ebuild,v 1.3 2005/12/26 15:39:53 lu_zero Exp $
 
 inherit eutils rpm
 
@@ -14,13 +14,13 @@ SRC_URI="ftp://ftp2.us.nero.com/${NERO_RPM}
 LICENSE="Nero"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="mp3 oggvorbis shorten"
+IUSE="mp3 vorbis shorten"
 DEPEND=""
 RDEPEND="virtual/libc
 	virtual/x11
 	=x11-libs/gtk+-1.2*
 	mp3? ( media-sound/mpg123 )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	shorten? ( media-sound/shorten )
 	amd64? ( >=app-emulation/emul-linux-x86-gtklibs-2.0 )"
 
diff --git a/app-cdr/webcdwriter/ChangeLog b/app-cdr/webcdwriter/ChangeLog
index 512059a3d993..66c109bd70b9 100644
--- a/app-cdr/webcdwriter/ChangeLog
+++ b/app-cdr/webcdwriter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/webcdwriter
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.7 2005/11/12 18:30:30 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.8 2005/12/26 15:38:47 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org>
+  webcdwriter-2.6.8-r1.ebuild, webcdwriter-2.7.1.ebuild,
+  webcdwriter-2.7.2.ebuild, webcdwriter-2.7.3.ebuild:
+  oggvorbis Cleanup
 
 *webcdwriter-2.7.3 (12 Nov 2005)
 
diff --git a/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild b/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild
index f906f4cbd534..f9a4313e429d 100644
--- a/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild
+++ b/app-cdr/webcdwriter/webcdwriter-2.6.8-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/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild,v 1.1 2005/08/07 00:29:52 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild,v 1.2 2005/12/26 15:38:47 lu_zero Exp $
 
 inherit eutils java-pkg
 
@@ -12,14 +12,14 @@ SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="java pam mp3 sox oggvorbis"
+IUSE="java pam mp3 sox vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
 	app-cdr/cdrtools
 	mp3? ( media-sound/mpg123 )
 	sox? ( media-sound/sox )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	java? ( >=virtual/jre-1.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}"
diff --git a/app-cdr/webcdwriter/webcdwriter-2.7.1.ebuild b/app-cdr/webcdwriter/webcdwriter-2.7.1.ebuild
index 52eedd46f221..472453cdcf76 100644
--- a/app-cdr/webcdwriter/webcdwriter-2.7.1.ebuild
+++ b/app-cdr/webcdwriter/webcdwriter-2.7.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/webcdwriter/webcdwriter-2.7.1.ebuild,v 1.1 2005/08/16 10:19:58 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.7.1.ebuild,v 1.2 2005/12/26 15:38:47 lu_zero Exp $
 
 inherit eutils java-pkg
 
@@ -12,14 +12,14 @@ SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="java pam mp3 sox oggvorbis"
+IUSE="java pam mp3 sox vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
 	app-cdr/cdrtools
 	mp3? ( media-sound/mpg123 )
 	sox? ( media-sound/sox )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	java? ( >=virtual/jre-1.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}"
@@ -60,7 +60,7 @@ src_install() {
 	else
 		MP3="off"
 	fi
-	if use oggvorbis
+	if use vorbis
 	then
 		OGG="on"
 	else
diff --git a/app-cdr/webcdwriter/webcdwriter-2.7.2.ebuild b/app-cdr/webcdwriter/webcdwriter-2.7.2.ebuild
index 3f5c965cfe63..635eff8fee2a 100644
--- a/app-cdr/webcdwriter/webcdwriter-2.7.2.ebuild
+++ b/app-cdr/webcdwriter/webcdwriter-2.7.2.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/webcdwriter/webcdwriter-2.7.2.ebuild,v 1.1 2005/09/01 04:26:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.7.2.ebuild,v 1.2 2005/12/26 15:38:47 lu_zero Exp $
 
 inherit eutils java-pkg
 
@@ -12,14 +12,14 @@ SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="java pam mp3 sox oggvorbis"
+IUSE="java pam mp3 sox vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
 	app-cdr/cdrtools
 	mp3? ( media-sound/mpg123 )
 	sox? ( media-sound/sox )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	java? ( >=virtual/jre-1.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}"
@@ -60,7 +60,7 @@ src_install() {
 	else
 		MP3="off"
 	fi
-	if use oggvorbis
+	if use vorbis
 	then
 		OGG="on"
 	else
diff --git a/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild b/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild
index c7bead191cb9..38b38fabe21f 100644
--- a/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild
+++ b/app-cdr/webcdwriter/webcdwriter-2.7.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/webcdwriter/webcdwriter-2.7.3.ebuild,v 1.1 2005/11/12 18:30:30 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild,v 1.2 2005/12/26 15:38:47 lu_zero Exp $
 
 inherit eutils java-pkg
 
@@ -12,14 +12,14 @@ SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="java pam mp3 sox oggvorbis"
+IUSE="java pam mp3 sox vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
 	app-cdr/cdrtools
 	mp3? ( media-sound/mpg123 )
 	sox? ( media-sound/sox )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	java? ( >=virtual/jre-1.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}"
@@ -60,7 +60,7 @@ src_install() {
 	else
 		MP3="off"
 	fi
-	if use oggvorbis
+	if use vorbis
 	then
 		OGG="on"
 	else