4 files changed, 28 insertions, 14 deletions
diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 79c4517ed311..bf4eedd4bcbc 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/yammi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.24 2005/05/15 10:32:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.25 2005/05/28 18:47:01 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> yammi-1.0-r1.ebuild,
+  yammi-1.2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   15 May 2005; Gregorio Guidi <greg_g@gentoo.org> yammi-1.2.ebuild:
   Stable on x86.
diff --git a/media-sound/yammi/Manifest b/media-sound/yammi/Manifest
index e12d304403c0..b0ff100cc2ac 100644
--- a/media-sound/yammi/Manifest
+++ b/media-sound/yammi/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1fe1d7e8aec8e2626fded1e0416e98f2 yammi-1.0-r1.ebuild 2154
+MD5 7b8ee8129937a0aa16ce1d7471bfaa47 yammi-1.2.ebuild 1727
+MD5 33b64d1a71bcba50bb6e7775dfcdea90 ChangeLog 4188
 MD5 1637953277a812ec316da84a5d6b3f41 metadata.xml 175
-MD5 be4d403928d9c18557248b1ae5382c23 ChangeLog 4015
-MD5 9f174af6c92a8040d8156393d78098e0 yammi-1.2.ebuild 1737
-MD5 922e479626bb6ea3e14835d7eb54cf87 yammi-1.0-r1.ebuild 2169
-MD5 dddb69fe8545cfaaf5c307b5bb80df75 files/yammi-1.0-traverse.patch 593
-MD5 3b3a8303b5885223b0416428f9d07009 files/digest-yammi-1.2 62
 MD5 3f815698af1d6b4efd7b6e08498cbef3 files/yammi-1.0-qt.patch 2173
+MD5 3b3a8303b5885223b0416428f9d07009 files/digest-yammi-1.2 62
+MD5 dddb69fe8545cfaaf5c307b5bb80df75 files/yammi-1.0-traverse.patch 593
 MD5 9c22722989a753ad61b3b764925f252a files/digest-yammi-1.0-r1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmLzD06ebR+OMO78RApFYAJkBeE0SWmTTJ2AQZhW5Xj2yyFEclgCeJ1cU
+k8r6f+MrhjzPrsGtYAQ6x/Q=
+=RS/j
+-----END PGP SIGNATURE-----
diff --git a/media-sound/yammi/yammi-1.0-r1.ebuild b/media-sound/yammi/yammi-1.0-r1.ebuild
index 7e00ae3e66c5..dd27a229457e 100644
--- a/media-sound/yammi/yammi-1.0-r1.ebuild
+++ b/media-sound/yammi/yammi-1.0-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/yammi/yammi-1.0-r1.ebuild,v 1.5 2005/01/29 17:06:03 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0-r1.ebuild,v 1.6 2005/05/28 18:47:01 luckyduck Exp $
 
 inherit flag-o-matic eutils kde-functions
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc ~ppc"
-IUSE="cdr xmms oggvorbis kde"
+IUSE="cdr xmms ogg kde"
 
 DEPEND=">=x11-libs/qt-3.1.0-r1
 	>=media-libs/id3lib-3.8.2
@@ -21,7 +21,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	>=media-sound/sox-12.17.3-r1
 	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
 	xmms? ( >=media-sound/xmms-1.2.7-r18 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
+	ogg? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
 	kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
 
 src_unpack() {
@@ -50,7 +50,7 @@ src_compile() {
 	then
 		myconf="--disable-ogglibs ${myconf}"
 	else
-		use oggvorbis || myconf="--disable-oogvorbis ${myconf}"
+		use ogg || myconf="--disable-oggvorbis ${myconf}"
 	fi
 
 	econf ${myconf} || die "./configure failed"
diff --git a/media-sound/yammi/yammi-1.2.ebuild b/media-sound/yammi/yammi-1.2.ebuild
index 60a019dfe6b1..3c1f568680c7 100644
--- a/media-sound/yammi/yammi-1.2.ebuild
+++ b/media-sound/yammi/yammi-1.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-sound/yammi/yammi-1.2.ebuild,v 1.3 2005/05/15 10:32:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.ebuild,v 1.4 2005/05/28 18:47:01 luckyduck Exp $
 
 inherit kde
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~sparc ~ppc"
-IUSE="cdr encode kde oggvorbis xmms"
+KEYWORDS="x86 amd64 ~sparc ~ppc"
+IUSE="cdr encode kde ogg xmms"
 
 DEPEND=">=media-libs/taglib-1.3
 	xmms? ( media-sound/xmms )"
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}
 	kde? ( || ( kde-base/noatun kde-base/kdemultimedia ) )
 	media-sound/sox
 	virtual/mpg123
-	oggvorbis? ( media-sound/vorbis-tools )
+	ogg? ( media-sound/vorbis-tools )
 	encode? ( media-sound/cdparanoia
 		  media-sound/lame )"