oggvorbis -> vorbis (#94254)

(Portage version: 2.0.51.19)

4 files changed, 22 insertions, 20 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index b3eb77ac6782..46251e72b69f 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.56 2005/05/22 19:38:49 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.57 2005/05/29 10:53:32 mrness Exp $
+
+  29 May 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.0.1-r2.ebuild,
+  wvstreams-4.0.2.ebuild:
+  Move to vorbis useflag (#94254).
 
   22 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
   wvstreams-4.0.2.ebuild:
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index caa2c5fa2884..54ba78f424c1 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,16 +1,16 @@
+MD5 981063aa3f5dd30b5608b06bdc0e4bb5 wvstreams-4.0.1-r2.ebuild 2223
+MD5 6685d3675fc91bafdb49880001257ad4 wvstreams-4.0.2.ebuild 2231
 MD5 9092d7fa7d4cbca11c7d69b5d5896a30 ChangeLog 8842
-MD5 05e371d144f38c0e2beae4190253e1b4 wvstreams-4.0.1-r2.ebuild 2235
 MD5 7c8d69f73480b56621770449d11a2e17 metadata.xml 235
-MD5 6685d3675fc91bafdb49880001257ad4 wvstreams-4.0.2.ebuild 2231
-MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
-MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466
 MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
+MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
+MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
 MD5 f4e61e52cab6cac5470b77a7bd3358a9 files/digest-wvstreams-4.0.1-r2 68
-MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
 MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
-MD5 9c69b24927d041fa398d060e4e5f1bb1 files/wvstreams-4.0.1-linux-serial.patch 7563
-MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
-MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
+MD5 a48902f93ab5425fc59a483df42f3d0a files/wvstreams-4.0.1-without-pam.patch 418
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2 68
+MD5 0cb9b1e5a568cd8f0e5f186a131a74a5 files/wvstreams-4.0.1-wireless-user.patch 466
+MD5 03b73077a83c635ab211f235c7a429bf files/wvstreams-4.0.1-tcl_8_4.patch 822
+MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
+MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
+MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.1-MOC-fix.patch 479
diff --git a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
index fc420af6f303..831699324066 100644
--- a/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.1-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/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.11 2005/05/22 07:36:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.1-r2.ebuild,v 1.12 2005/05/29 10:53:32 mrness Exp $
 
 inherit eutils
 
@@ -11,14 +11,13 @@ SRC_URI="http://people.nit.ca/~sfllaw/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="gtk qt oggvorbis speex fam qdbm pam slp ssl doc fftw tcltk debug"
+IUSE="gtk qt vorbis speex fam qdbm pam slp ssl doc fftw tcltk debug"
 
 RDEPEND="virtual/libc
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
 	qt? ( =x11-libs/qt-3* )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
 	>=sys-libs/db-3
@@ -60,8 +59,8 @@ src_compile() {
 	fi
 	econf ${myconf} \
 		`use_with gtk` \
-		`use_with oggvorbis ogg` \
-		`use_with oggvorbis vorbis` \
+		`use_with vorbis ogg` \
+		`use_with vorbis` \
 		`use_with speex` \
 		`use_with fam` \
 		`use_with qdbm` \
diff --git a/net-libs/wvstreams/wvstreams-4.0.2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2.ebuild
index cce9ffa8cb9c..3713b8847627 100644
--- a/net-libs/wvstreams/wvstreams-4.0.2.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.0.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/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.7 2005/05/22 19:38:49 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2.ebuild,v 1.8 2005/05/29 10:53:32 mrness Exp $
 
 inherit eutils
 
@@ -17,8 +17,7 @@ RDEPEND="virtual/libc
 	dev-libs/xplc
 	gtk? ( >=x11-libs/gtk+-2.2.0 )
 	qt? ( =x11-libs/qt-3* )
-	vorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	fam? ( virtual/fam )
 	>=sys-libs/db-3