Fixed mysql deps and dropped support for mysql-community - fixes bug 306155.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 12 insertions, 11 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 8c2305af447d..f6ee63bf1500 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.362 2010/02/23 04:04:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.363 2010/02/23 17:02:29 jmbsvicetto Exp $
+
+  23 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
+  Fixed mysql deps and dropped support for mysql-community - fixes bug
+  306155.
 
   23 Feb 2010; Joseph Jezak <josejx@gentoo.org> amarok-2.2.2-r1.ebuild,
   amarok-2.2.2.90.ebuild:
diff --git a/media-sound/amarok/amarok-2.2.2-r1.ebuild b/media-sound/amarok/amarok-2.2.2-r1.ebuild
index c8d6ea83c750..649bb9901918 100644
--- a/media-sound/amarok/amarok-2.2.2-r1.ebuild
+++ b/media-sound/amarok/amarok-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.4 2010/02/23 04:04:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.5 2010/02/23 17:02:29 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -32,10 +32,6 @@ IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp semantic-desktop"
 DEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7[dbus,qt4]
-	|| (
-		( >=dev-db/mysql-5.0.76-r1[embedded,-minimal] <dev-db/mysql-5.1 )
-		( >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] <dev-db/mysql-community-5.1 )
-	)
 	>=media-libs/taglib-1.6.1[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
 	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
@@ -47,6 +43,8 @@ DEPEND="
 		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
 		>=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
 	)
+	embedded? ( <=dev-db/mysql-5.1[embedded,-minimal] )
+	!embedded? ( dev-db/mysql[-embedded,-minimal] )
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 	lastfm? ( >=media-libs/liblastfm-0.3.0 )
 	mp3tunes? (
diff --git a/media-sound/amarok/amarok-2.2.2.90.ebuild b/media-sound/amarok/amarok-2.2.2.90.ebuild
index 1f255997086f..b9d6ba86b337 100644
--- a/media-sound/amarok/amarok-2.2.2.90.ebuild
+++ b/media-sound/amarok/amarok-2.2.2.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.4 2010/02/23 04:04:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.5 2010/02/23 17:02:29 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -32,16 +32,14 @@ IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp semantic-desktop"
 DEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7[dbus,qt4]
-	|| (
-		( >=dev-db/mysql-5.0.76-r1[embedded,-minimal] <dev-db/mysql-5.1 )
-		( >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] <dev-db/mysql-community-5.1 )
-	)
 	>=media-libs/taglib-1.6.1[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
 	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
 	sys-libs/zlib
 	x11-libs/qt-script
 	>=x11-libs/qtscriptgenerator-0.1.0
+	embedded? (	<=dev-db/mysql-5.1[embedded,-minimal] )
+	!embedded? ( dev-db/mysql[-embedded,-minimal] )
 	cdda? (
 		>=kde-base/libkcddb-${KDE_MINIMAL}
 		>=kde-base/libkcompactdisc-${KDE_MINIMAL}