fixed dep. bump to stable x86

23 files changed, 58 insertions, 196 deletions

diff --git a/media-sound/bpmdj/ChangeLog b/media-sound/bpmdj/ChangeLog
index 042e8ba18ac8..951c0905d6d2 100644
--- a/media-sound/bpmdj/ChangeLog
+++ b/media-sound/bpmdj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/bpmdj
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.7 2003/09/29 02:21:13 jje Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.8 2004/03/19 23:32:16 eradicator Exp $
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-1.5.ebuild,
+  bpmdj-1.6.ebuild, bpmdj-1.7.ebuild, bpmdj-1.8.ebuild, bpmdj-1.9.ebuild,
+  bpmdj-2.0.1.ebuild:
+  fixed dep.  bump to stable x86
 
 *bpmdj-2.0.1 (29 Sep 2003)
 
diff --git a/media-sound/bpmdj/bpmdj-1.5.ebuild b/media-sound/bpmdj/bpmdj-1.5.ebuild
deleted file mode 100644
index 492c0cba20b7..000000000000
--- a/media-sound/bpmdj/bpmdj-1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.5.ebuild,v 1.5 2004/03/01 05:37:12 eradicator Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
-HOMEPAGE="http://bpmdj.strokemusic.org"
-
-SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.5/bpmdj-1.5.source.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-DEPEND="x11-libs/qt*
-	virtual/tetex"
-RDEPEND="mpg123"
-
-src_compile() {
-	cp defines.gentoo defines
-	cp ${FILESDIR}/makefile makefile
-	make VARTEXFONTS=${T}/fonts || die
-}
-
-src_install () {
-	make DESTDIR=${D} deb-install || die
-	mv ${D}/usr/share/doc/{${PN},${PF}}
-}
diff --git a/media-sound/bpmdj/bpmdj-1.6.ebuild b/media-sound/bpmdj/bpmdj-1.6.ebuild
index 8883d0f70bb0..e013de21a2d7 100644
--- a/media-sound/bpmdj/bpmdj-1.6.ebuild
+++ b/media-sound/bpmdj/bpmdj-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.6.ebuild,v 1.4 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.6.ebuild,v 1.5 2004/03/19 23:32:16 eradicator Exp $
 
 S=${WORKDIR}/${P}
 
@@ -10,12 +10,12 @@ HOMEPAGE="http://bpmdj.strokemusic.org"
 SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.6/bpmdj-1.6.source.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="x86 ppc"
 
 DEPEND="x11-libs/qt*
 	virtual/tetex"
 
-RDEPEND="mpg123"
+RDEPEND="virtual/mpg123"
 
 src_compile() {
 	cp defines.gentoo defines
diff --git a/media-sound/bpmdj/bpmdj-1.7.ebuild b/media-sound/bpmdj/bpmdj-1.7.ebuild
deleted file mode 100644
index 5596888ae598..000000000000
--- a/media-sound/bpmdj/bpmdj-1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.7.ebuild,v 1.3 2004/03/01 05:37:12 eradicator Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
-HOMEPAGE="http://bpmdj.strokemusic.org"
-
-SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.7/bpmdj-1.7.source.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND="x11-libs/qt*
-	virtual/tetex"
-RDEPEND="mpg123"
-
-inherit eutils
-
-src_compile() {
-	epatch ${FILESDIR}/fabsl-1.7.patch || die
-	cp defines.gentoo defines || die
-	make VARTEXFONTS=${T}/fonts || die
-}
-
-src_install () {
-	make DESTDIR=${D} deb-install || die
-	mv ${D}/usr/share/doc/{${PN},${PF}}
-}
diff --git a/media-sound/bpmdj/bpmdj-1.8.ebuild b/media-sound/bpmdj/bpmdj-1.8.ebuild
deleted file mode 100644
index d9c1b1f58b85..000000000000
--- a/media-sound/bpmdj/bpmdj-1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.8.ebuild,v 1.4 2004/03/01 05:37:12 eradicator Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
-HOMEPAGE="http://bpmdj.strokemusic.org"
-
-SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.8/bpmdj-1.8.source.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND="x11-libs/qt*
-	virtual/tetex"
-RDEPEND="mpg123"
-
-inherit eutils
-
-src_compile() {
-	epatch ${FILESDIR}/fabsl-1.8.patch || die
-	make VARTEXFONTS=${T}/fonts || die
-}
-
-src_install () {
-	make DESTDIR=${D} deb-install || die
-	mv ${D}/usr/share/doc/{${PN},${PF}}
-}
diff --git a/media-sound/bpmdj/bpmdj-1.9.ebuild b/media-sound/bpmdj/bpmdj-1.9.ebuild
index 85b8990ae463..2d14945e1f81 100644
--- a/media-sound/bpmdj/bpmdj-1.9.ebuild
+++ b/media-sound/bpmdj/bpmdj-1.9.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.9.ebuild,v 1.4 2004/03/01 05:37:12 eradicator Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.9.ebuild,v 1.5 2004/03/19 23:32:16 eradicator Exp $
 
 DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
 HOMEPAGE="http://bpmdj.strokemusic.org"
@@ -10,11 +8,11 @@ HOMEPAGE="http://bpmdj.strokemusic.org"
 SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.9/bpmdj-1.9.source.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="x11-libs/qt*
 	virtual/tetex"
-RDEPEND="mpg123"
+RDEPEND="virtual/mpg123"
 
 inherit eutils
 
diff --git a/media-sound/bpmdj/bpmdj-2.0.1.ebuild b/media-sound/bpmdj/bpmdj-2.0.1.ebuild
index 3564cef8df2f..b6ac5d968bb9 100644
--- a/media-sound/bpmdj/bpmdj-2.0.1.ebuild
+++ b/media-sound/bpmdj/bpmdj-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.0.1.ebuild,v 1.2 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.0.1.ebuild,v 1.3 2004/03/19 23:32:16 eradicator Exp $
 
 inherit eutils
 S=${WORKDIR}/bpmdj-2.0
@@ -11,12 +11,12 @@ SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/2.0/bpmdj-2.0.source.tgz
 	ftp://progpc26.vub.ac.be/pub/bpmdj/2.0/patch-2.0-to-2.0.1.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="x11-libs/qt*
 	virtual/tetex"
 
-RDEPEND="mpg123"
+RDEPEND="virtual/mpg123"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/bpmdj/files/digest-bpmdj-1.5 b/media-sound/bpmdj/files/digest-bpmdj-1.5
deleted file mode 100644
index cdd2f3ca732b..000000000000
--- a/media-sound/bpmdj/files/digest-bpmdj-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 488e70cab8a8dbfcc83a3ed20e15ba91 bpmdj-1.5.source.tgz 482823
diff --git a/media-sound/bpmdj/files/digest-bpmdj-1.7 b/media-sound/bpmdj/files/digest-bpmdj-1.7
deleted file mode 100644
index ef2f057a8c5a..000000000000
--- a/media-sound/bpmdj/files/digest-bpmdj-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1802aa463ab03298da9967af31da145 bpmdj-1.7.source.tgz 1705756
diff --git a/media-sound/bpmdj/files/digest-bpmdj-1.8 b/media-sound/bpmdj/files/digest-bpmdj-1.8
deleted file mode 100644
index 8b8a8a83b7cd..000000000000
--- a/media-sound/bpmdj/files/digest-bpmdj-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f4d09723c42b37f005df2f9135f1de9 bpmdj-1.8.source.tgz 697466
diff --git a/media-sound/quark/ChangeLog b/media-sound/quark/ChangeLog
index c96744247172..3b665d61d060 100644
--- a/media-sound/quark/ChangeLog
+++ b/media-sound/quark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/quark
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.3 2004/03/01 05:37:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/ChangeLog,v 1.4 2004/03/19 23:35:00 eradicator Exp $
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> quark-3.21.ebuild:
+  fixed dep.  bump to stable x86
 
 *quark-3.21 (09 Oct 2003)
 
diff --git a/media-sound/quark/quark-3.21.ebuild b/media-sound/quark/quark-3.21.ebuild
index dd290c395561..20a2c7e34098 100644
--- a/media-sound/quark/quark-3.21.ebuild
+++ b/media-sound/quark/quark-3.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.21.ebuild,v 1.2 2004/03/01 05:37:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quark/quark-3.21.ebuild,v 1.3 2004/03/19 23:35:00 eradicator Exp $
 
 inherit gnome2
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://quark.nerdnest.org/"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
 
 LICENSE="GPL-2"
 
-DEPEND=">=xine-lib-1_beta10
-		>=gtk+-2.2.1
-		>=gconf-2.2.0
-		>=gnome-vfs-2.0.4-r2"
+DEPEND=">=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.2.1
+	>=gnome-base/gconf-2.2.0
+	>=gnome-base/gnome-vfs-2.0.4-r2"
 
 pkg_postinst () {
 	einfo Quark is an anti-gui music player.
diff --git a/media-sound/rcenter/ChangeLog b/media-sound/rcenter/ChangeLog
index 2b43527f1aac..7469240f9756 100644
--- a/media-sound/rcenter/ChangeLog
+++ b/media-sound/rcenter/ChangeLog
@@ -1,8 +1,10 @@
 # ChangeLog for media-sound/rcenter 
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/ChangeLog,v 1.3 2004/03/18 22:41:07 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/ChangeLog,v 1.4 2004/03/19 23:34:39 eradicator Exp $
 
-# Written By Bowyakka (aka Greg Bowyer)
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> rcenter-0.6.1.ebuild,
+  rcenter-0.6.2.ebuild:
+  fixed dep.  bump to stable x86
 
 *rcenter-0.6.2 (10 Aug 2003)
 
diff --git a/media-sound/rcenter/rcenter-0.6.1.ebuild b/media-sound/rcenter/rcenter-0.6.1.ebuild
index d586cbf0fc9d..0a6c361ea978 100644
--- a/media-sound/rcenter/rcenter-0.6.1.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/rcenter-0.6.1.ebuild,v 1.4 2004/03/01 05:37:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/rcenter-0.6.1.ebuild,v 1.5 2004/03/19 23:34:39 eradicator Exp $
 
 DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
 HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php"
@@ -9,10 +9,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND=""
-# ONLY the emu10k1 drivers are tested . May work with alsa
-RDEPEND="emu10k1"
-S=${WORKDIR}/${P}
+DEPEND="virtual/glibc"
 
 src_compile() {
 	emake || die
diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild b/media-sound/rcenter/rcenter-0.6.2.ebuild
index 6c29b889afc9..b802800d326b 100644
--- a/media-sound/rcenter/rcenter-0.6.2.ebuild
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/rcenter-0.6.2.ebuild,v 1.3 2004/03/01 05:37:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rcenter/rcenter-0.6.2.ebuild,v 1.4 2004/03/19 23:34:39 eradicator Exp $
 
 DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
 HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php"
 SRC_URI="http://rooster.stanford.edu/~ben/projects/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=""
-# ONLY the emu10k1 drivers are tested . May work with alsa
-RDEPEND="emu10k1"
-S=${WORKDIR}/${P}
+KEYWORDS="x86"
+DEPEND="virtual/glibc"
 
 src_compile() {
 	emake || die
diff --git a/media-sound/seq24/ChangeLog b/media-sound/seq24/ChangeLog
index b85ac390cffe..b98292aebbef 100644
--- a/media-sound/seq24/ChangeLog
+++ b/media-sound/seq24/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/seq24
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/ChangeLog,v 1.4 2004/03/10 11:59:00 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/ChangeLog,v 1.5 2004/03/19 23:38:41 eradicator Exp $
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> seq24-0.4.2.ebuild,
+  seq24-0.4.3.ebuild, seq24-0.4.4.ebuild:
+  fixed dep.  bump to stable x86
 
 *seq24-0.4.4 (10 Mar 2004)
 
diff --git a/media-sound/seq24/files/digest-seq24-0.4.2 b/media-sound/seq24/files/digest-seq24-0.4.2
deleted file mode 100644
index 90189c71e53d..000000000000
--- a/media-sound/seq24/files/digest-seq24-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edd24e0e4cd14157403897e683b251a3 seq24-0.4.2.tar.gz 134313
diff --git a/media-sound/seq24/seq24-0.4.2.ebuild b/media-sound/seq24/seq24-0.4.2.ebuild
deleted file mode 100644
index 6184a816adfa..000000000000
--- a/media-sound/seq24/seq24-0.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.4.2.ebuild,v 1.4 2004/03/01 05:37:16 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="Small alsa sequencer"
-HOMEPAGE="http://www.filter24.org/seq24/"
-SRC_URI="http://www.filter24.org/seq24/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/alsa-lib-0.9.0
-	=gtkmm-1.2*"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die "build failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-}
-
diff --git a/media-sound/seq24/seq24-0.4.3.ebuild b/media-sound/seq24/seq24-0.4.3.ebuild
index 843486ea70fc..b045428b7635 100644
--- a/media-sound/seq24/seq24-0.4.3.ebuild
+++ b/media-sound/seq24/seq24-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.4.3.ebuild,v 1.4 2004/03/10 11:59:00 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.4.3.ebuild,v 1.5 2004/03/19 23:38:41 eradicator Exp $
 
 IUSE=""
 
@@ -13,16 +13,4 @@ SLOT="0"
 KEYWORDS="x86"
 
 DEPEND=">=media-libs/alsa-lib-0.9.0
-	=gtkmm-1.2*"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die "build failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-}
-
+	=dev-cpp/gtkmm-1.2*"
diff --git a/media-sound/seq24/seq24-0.4.4.ebuild b/media-sound/seq24/seq24-0.4.4.ebuild
index 85403848fc80..208353251a21 100644
--- a/media-sound/seq24/seq24-0.4.4.ebuild
+++ b/media-sound/seq24/seq24-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.4.4.ebuild,v 1.1 2004/03/10 11:59:00 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/seq24/seq24-0.4.4.ebuild,v 1.2 2004/03/19 23:38:41 eradicator Exp $
 
 IUSE=""
 
@@ -10,19 +10,7 @@ SRC_URI="http://www.filter24.org/seq24/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND=">=media-libs/alsa-lib-0.9.0
-	=gtkmm-1.2*"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die "build failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-}
-
+	=dev-cpp/gtkmm-1.2*"
diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 8120035955b7..e8e826165d6b 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/yammi
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.9 2004/02/23 23:55:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.10 2004/03/19 23:39:14 eradicator Exp $
+
+  19 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-0.8.2.ebuild,
+  yammi-1.0.ebuild:
+  fixed dep.  bump to stable x86
 
   23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> yammi-0.8.2.ebuild,
   yammi-1.0.ebuild:
diff --git a/media-sound/yammi/yammi-0.8.2.ebuild b/media-sound/yammi/yammi-0.8.2.ebuild
index 76320d2f3320..938c3ba89a94 100644
--- a/media-sound/yammi/yammi-0.8.2.ebuild
+++ b/media-sound/yammi/yammi-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.9 2004/02/23 23:55:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.10 2004/03/19 23:39:14 eradicator Exp $
 
 inherit flag-o-matic
 
@@ -20,11 +20,9 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	>=media-sound/lame-3.93.1
 	virtual/mpg123
 	>=media-sound/sox-12.17.3-r1
-	cdr? ( >=app-cdr/cdlabelgen-2.4.0
-	>=app-cdr/mp3burn-0.1 )
+	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
-	>=vorbis-tools-1.0-r1 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
 	kde? ( >=kde-base/kdebase-3.0.4 )"
 
 src_unpack() {
diff --git a/media-sound/yammi/yammi-1.0.ebuild b/media-sound/yammi/yammi-1.0.ebuild
index dd11c386ac6a..12b07fd6aea3 100644
--- a/media-sound/yammi/yammi-1.0.ebuild
+++ b/media-sound/yammi/yammi-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.2 2004/02/23 23:55:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.3 2004/03/19 23:39:14 eradicator Exp $
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="cdr xmms oggvorbis kde"
 
 DEPEND=">=x11-libs/qt-3.1.0-r1
@@ -20,11 +20,9 @@ DEPEND=">=x11-libs/qt-3.1.0-r1
 	>=media-sound/lame-3.93.1
 	virtual/mpg123
 	>=media-sound/sox-12.17.3-r1
-	cdr? ( >=app-cdr/cdlabelgen-2.4.0
-	>=app-cdr/mp3burn-0.1 )
+	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
-	>=vorbis-tools-1.0-r1 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
 	kde? ( >=kde-base/kdebase-3.0.4 )"
 
 src_unpack() {