oggvorbis Cleanup

(Portage version: 2.1_pre1)

5 files changed, 21 insertions, 14 deletions

diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index dd5e7cf6da56..df5b68cd6e7f 100644
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/edna
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.24 2005/09/14 07:21:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.25 2005/12/26 14:27:48 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> edna-0.5-r4.ebuild,
+  edna-0.5-r5.ebuild:
+  oggvorbis Cleanup
 
   14 Sep 2005; Aron Griffis <agriffis@gentoo.org> edna-0.5-r4.ebuild:
   Mark 0.5-r4 stable on alpha
diff --git a/media-sound/edna/edna-0.5-r4.ebuild b/media-sound/edna/edna-0.5-r4.ebuild
index 12ab15d81f10..499fd8a46289 100644
--- a/media-sound/edna/edna-0.5-r4.ebuild
+++ b/media-sound/edna/edna-0.5-r4.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/edna/edna-0.5-r4.ebuild,v 1.12 2005/09/14 07:21:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.13 2005/12/26 14:27:48 lu_zero Exp $
 
 inherit eutils
 
-IUSE="oggvorbis"
+IUSE="vorbis"
 
 DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
 HOMEPAGE="http://edna.sourceforge.net/"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/python
-	oggvorbis? ( dev-python/pyogg
+	vorbis? ( dev-python/pyogg
 		dev-python/pyvorbis )"
 
 src_install() {
@@ -46,7 +46,7 @@ pkg_postinst() {
 	einfo "directories are allowed).  Test edna from a shell prompt"
 	einfo "until you have it configured properly, then add edna to"
 	einfo "the default runlevel when you're ready.  Add the USE flag"
-	einfo "oggvorbis if you want edna to serve ogg files."
+	einfo "vorbis if you want edna to serve ogg files."
 	einfo
 	einfo "See edna.conf and the html docs for more info, and set"
 	einfo "PYTHONPATH=/usr/lib/edna to run from a shell prompt."
diff --git a/media-sound/edna/edna-0.5-r5.ebuild b/media-sound/edna/edna-0.5-r5.ebuild
index 92c95753b41f..406cad83dd1c 100644
--- a/media-sound/edna/edna-0.5-r5.ebuild
+++ b/media-sound/edna/edna-0.5-r5.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/edna/edna-0.5-r5.ebuild,v 1.3 2005/09/09 22:06:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r5.ebuild,v 1.4 2005/12/26 14:27:48 lu_zero Exp $
 
 inherit eutils
 
-IUSE="oggvorbis"
+IUSE="vorbis"
 
 DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
 HOMEPAGE="http://edna.sourceforge.net/"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-lang/python
-	oggvorbis? ( dev-python/pyogg
+	vorbis? ( dev-python/pyogg
 		dev-python/pyvorbis )"
 
 src_unpack() {
@@ -54,7 +54,7 @@ pkg_postinst() {
 	einfo "directories are allowed).  Test edna from a shell prompt"
 	einfo "until you have it configured properly, then add edna to"
 	einfo "the default runlevel when you're ready.  Add the USE flag"
-	einfo "oggvorbis if you want edna to serve ogg files."
+	einfo "vorbis if you want edna to serve ogg files."
 	einfo
 	einfo "See edna.conf and the html docs for more info, and set"
 	einfo "PYTHONPATH=/usr/lib/edna to run from a shell prompt."
diff --git a/media-sound/gogo/ChangeLog b/media-sound/gogo/ChangeLog
index 6c9e710dc647..2ce642af34e7 100644
--- a/media-sound/gogo/ChangeLog
+++ b/media-sound/gogo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gogo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/ChangeLog,v 1.14 2005/09/04 11:04:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/ChangeLog,v 1.15 2005/12/26 14:26:23 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> gogo-3.10-r1.ebuild:
+  oggvorbis Cleanup
 
   04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gogo-3.10-r1.ebuild:
   Don't install COPYING and INSTALL files.
diff --git a/media-sound/gogo/gogo-3.10-r1.ebuild b/media-sound/gogo/gogo-3.10-r1.ebuild
index 5dad4fc43486..f4bffed7f767 100644
--- a/media-sound/gogo/gogo-3.10-r1.ebuild
+++ b/media-sound/gogo/gogo-3.10-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/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.16 2005/09/04 11:04:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.17 2005/12/26 14:26:23 lu_zero Exp $
 
 inherit eutils gnuconfig
 IUSE="debug"
@@ -17,12 +17,12 @@ KEYWORDS="x86 -ppc -sparc"
 DEPEND="dev-lang/nasm"
 #	>=sys-libs/ncurses-5.H2
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
-#	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
+#	vorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
 # Oggvorbis support breaks with -rc3
 #RDEPEND="virtual/libc"
 #	>=sys-libs/ncurses-5.2
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
-#	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
+#	vorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
 
 S=${WORKDIR}/petit${MY_PV}
 
@@ -34,7 +34,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-#	if use oggvorbis ; then
+#	if use vorbis ; then
 #		myconf="--with-vorbis"
 		myconf="--without-vorbis"
 #	else