oggvorbis Cleanup

Package-Manager: portage-2.1_pre1

9 files changed, 34 insertions, 25 deletions

diff --git a/media-libs/libextractor/ChangeLog b/media-libs/libextractor/ChangeLog
index ecd2ee33395a..15a5338c3a37 100644
--- a/media-libs/libextractor/ChangeLog
+++ b/media-libs/libextractor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libextractor
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.22 2005/12/16 12:04:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.23 2005/12/26 12:22:25 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> libextractor-0.2.2.ebuild,
+  libextractor-0.3.3.ebuild, libextractor-0.3.5.ebuild,
+  libextractor-0.3.7.ebuild, libextractor-0.4.2.ebuild,
+  libextractor-0.5.0.ebuild:
+  oggvorbis Cleanup
 
   16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   libextractor-0.5.6a.ebuild:
diff --git a/media-libs/libextractor/libextractor-0.2.2.ebuild b/media-libs/libextractor/libextractor-0.2.2.ebuild
index f2a0a3478b15..2cb5d66c4a96 100644
--- a/media-libs/libextractor/libextractor-0.2.2.ebuild
+++ b/media-libs/libextractor/libextractor-0.2.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/media-libs/libextractor/libextractor-0.2.2.ebuild,v 1.3 2005/02/28 05:01:33 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.2.2.ebuild,v 1.4 2005/12/26 12:22:25 lu_zero Exp $
 
 inherit libtool eutils
 
@@ -11,12 +11,12 @@ SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 sparc"
-IUSE="oggvorbis static"
+IUSE="vorbis static"
 
 # does not work with rpm-4.2
 DEPEND=">=sys-devel/libtool-1.4.1
 	<app-arch/rpm-4.2
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/libextractor/libextractor-0.3.3.ebuild b/media-libs/libextractor/libextractor-0.3.3.ebuild
index b159f0addf87..6876e70ee072 100644
--- a/media-libs/libextractor/libextractor-0.3.3.ebuild
+++ b/media-libs/libextractor/libextractor-0.3.3.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-libs/libextractor/libextractor-0.3.3.ebuild,v 1.3 2005/02/28 05:01:33 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.3.3.ebuild,v 1.4 2005/12/26 12:22:25 lu_zero Exp $
 
 inherit libtool
 
-IUSE="oggvorbis static"
+IUSE="vorbis static"
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
 SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
@@ -12,7 +12,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 DEPEND=">=sys-devel/libtool-1.4.1
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_compile() {
 	elibtoolize
diff --git a/media-libs/libextractor/libextractor-0.3.5.ebuild b/media-libs/libextractor/libextractor-0.3.5.ebuild
index 1c675ff7f873..1dad529ea46f 100644
--- a/media-libs/libextractor/libextractor-0.3.5.ebuild
+++ b/media-libs/libextractor/libextractor-0.3.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-libs/libextractor/libextractor-0.3.5.ebuild,v 1.4 2005/02/28 05:01:33 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.3.5.ebuild,v 1.5 2005/12/26 12:22:25 lu_zero Exp $
 
 inherit libtool
 
-IUSE="oggvorbis static"
+IUSE="vorbis static"
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
 SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="x86 sparc ~amd64 ~ppc"
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.4.1
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_compile() {
 	elibtoolize
diff --git a/media-libs/libextractor/libextractor-0.3.7.ebuild b/media-libs/libextractor/libextractor-0.3.7.ebuild
index 7e360bf694e7..4d893f6f1c37 100644
--- a/media-libs/libextractor/libextractor-0.3.7.ebuild
+++ b/media-libs/libextractor/libextractor-0.3.7.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-libs/libextractor/libextractor-0.3.7.ebuild,v 1.2 2005/02/28 05:01:33 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.3.7.ebuild,v 1.3 2005/12/26 12:22:25 lu_zero Exp $
 
 inherit libtool
 
-IUSE="oggvorbis static"
+IUSE="vorbis static"
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
 SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.4.1
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_compile() {
 	elibtoolize
diff --git a/media-libs/libextractor/libextractor-0.4.2.ebuild b/media-libs/libextractor/libextractor-0.4.2.ebuild
index 80330cbbfb69..c792900b7e9d 100644
--- a/media-libs/libextractor/libextractor-0.4.2.ebuild
+++ b/media-libs/libextractor/libextractor-0.4.2.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-libs/libextractor/libextractor-0.4.2.ebuild,v 1.1 2005/02/28 05:01:33 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.4.2.ebuild,v 1.2 2005/12/26 12:22:25 lu_zero Exp $
 
 inherit libtool
 
-IUSE="oggvorbis static"
+IUSE="vorbis static"
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
 SRC_URI="http://gnunet.org/libextractor/download/${P}.tar.bz2"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.4.1
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_compile() {
 	elibtoolize
diff --git a/media-libs/libextractor/libextractor-0.5.0.ebuild b/media-libs/libextractor/libextractor-0.5.0.ebuild
index 043445ca91f1..c5531a85e2f5 100644
--- a/media-libs/libextractor/libextractor-0.5.0.ebuild
+++ b/media-libs/libextractor/libextractor-0.5.0.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-libs/libextractor/libextractor-0.5.0.ebuild,v 1.3 2005/05/31 23:44:44 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.0.ebuild,v 1.4 2005/12/26 12:22:25 lu_zero Exp $
 
 inherit libtool eutils
 
-IUSE="oggvorbis static"
+IUSE="vorbis static"
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
 SRC_URI="http://gnunet.org/libextractor/download/${P}.tar.bz2"
@@ -15,7 +15,7 @@ KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 RESTRICT=test
 DEPEND="virtual/libc
 	>=sys-devel/libtool-1.4.1
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 5ccfa8679900..aafc0006fd61 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.292 2005/12/24 12:07:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.293 2005/12/26 12:25:33 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> xine-lib-1_rc8-r2.ebuild:
+  oggvorbis Cleanup
 
   24 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   -xine-lib-1.1.0-r5.ebuild:
diff --git a/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild
index a3887d1b775a..c6d06265a48d 100644
--- a/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc8-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/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild,v 1.3 2005/12/17 15:18:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc8-r2.ebuild,v 1.4 2005/12/26 12:25:33 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool
 
@@ -17,11 +17,11 @@ SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts esd nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora
+IUSE="arts esd nls dvd aalib X directfb vorbis alsa gnome sdl speex theora
 ipv6 altivec pic win32codecs"
 RESTRICT="nostrip"
 
-RDEPEND="oggvorbis? ( media-libs/libvorbis )
+RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( virtual/x11 )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
@@ -143,8 +143,8 @@ src_compile() {
 		$(use_enable alsa) \
 		$(use_enable arts) \
 		$(use_enable aalib) \
-		$(use_enable oggvorbis ogg) \
-		$(use_enable oggvorbis vorbis) \
+		$(use_enable vorbis ogg) \
+		$(use_enable vorbis vorbis) \
 		$(use_enable sdl sdltest) \
 		$(use_enable ipv6) \
 		$(use_enable directfb) \