Rename ogg useflag into vorbis useflag. Bug #101877.

Package-Manager: portage-2.1_pre5-r4

3 files changed, 24 insertions, 22 deletions

diff --git a/media-sound/prokyon3/ChangeLog b/media-sound/prokyon3/ChangeLog
index 4ed29289e68d..2dd35d81de1c 100644
--- a/media-sound/prokyon3/ChangeLog
+++ b/media-sound/prokyon3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/prokyon3
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.14 2005/11/16 14:48:38 greg_g Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.15 2006/03/08 20:29:56 flameeyes Exp $
+
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> prokyon3-0.9.2.ebuild,
+  prokyon3-0.9.4.ebuild:
+  Rename ogg useflag into vorbis useflag. Bug #101877.
 
 *prokyon3-0.9.4 (16 Nov 2005)
 
diff --git a/media-sound/prokyon3/prokyon3-0.9.2.ebuild b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
index a0155bdc7974..881a53d24ced 100644
--- a/media-sound/prokyon3/prokyon3-0.9.2.ebuild
+++ b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.12 2005/11/16 14:49:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.13 2006/03/08 20:29:56 flameeyes Exp $
 
 inherit eutils
 
@@ -11,15 +11,14 @@ SRC_URI="mirror://sourceforge/prokyon3/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="ogg"
+IUSE="vorbis"
 
 RESTRICT="primaryuri"
 
 DEPEND="=x11-libs/qt-3*
 	dev-db/mysql
 	>=media-libs/id3lib-3.8.2
-	ogg? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
 
 pkg_setup() {
 	if has_version x11-libs/qt && ! built_with_use x11-libs/qt mysql ; then
@@ -40,7 +39,7 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_with ogg) \
+		$(use_with vorbis ogg) \
 		|| die "configure failed"
 
 	emake || die "make failed"
diff --git a/media-sound/prokyon3/prokyon3-0.9.4.ebuild b/media-sound/prokyon3/prokyon3-0.9.4.ebuild
index 02ec54ca9b0a..4a1b3e2721c8 100644
--- a/media-sound/prokyon3/prokyon3-0.9.4.ebuild
+++ b/media-sound/prokyon3/prokyon3-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.4.ebuild,v 1.2 2006/01/09 22:22:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.4.ebuild,v 1.3 2006/03/08 20:29:56 flameeyes Exp $
 
 inherit qt3 eutils
 
@@ -16,10 +16,9 @@ IUSE="flac mp3 musicbrainz vorbis"
 DEPEND="=x11-libs/qt-3*
 	media-libs/taglib
 	musicbrainz? ( media-libs/musicbrainz
-	               mp3? ( media-libs/libmad )
-	               vorbis? ( media-libs/libogg
-	                         media-libs/libvorbis )
-	               flac? ( media-libs/flac ) )"
+		mp3? ( media-libs/libmad )
+		vorbis? ( media-libs/libvorbis )
+		flac? ( media-libs/flac ) )"
 
 pkg_setup() {
 	if ! built_with_use x11-libs/qt mysql; then
@@ -34,19 +33,19 @@ src_compile() {
 	# requires dev-libs/xmlwrapp.
 
 	local myconf="--with-taglib
-	              --without-id3
-	              --without-mysql-embedded
-	              --without-musicextras"
+			--without-id3
+			--without-mysql-embedded
+			--without-musicextras"
 
 	if use musicbrainz; then
 		myconf="${myconf}
-	                --with-musicbrainz
-		        $(use_with mp3 mad)
-		        $(use_with vorbis ogg)
-		        $(use_with flac)"
+			--with-musicbrainz
+			$(use_with mp3 mad)
+			$(use_with vorbis ogg)
+			$(use_with flac)"
 	else
 		myconf="${myconf}
-	                --without-musicbrainz"
+			--without-musicbrainz"
 	fi
 
 	econf ${myconf}	|| die "configure failed"