Bug #306155 workaround: Update MySQL dep to prevent MySQL 5.1 from being considered as a dep solution, due to the lack of a functional shared-embedded patch at this time.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

5 files changed, 20 insertions, 14 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 7e7553256a0f..713bd5ef164d 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.360 2010/02/20 19:44:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.361 2010/02/22 18:37:24 robbat2 Exp $
+
+  22 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> amarok-2.2.0.ebuild,
+  amarok-2.2.2.ebuild, amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
+  Bug #306155 workaround: Update MySQL dep to prevent MySQL 5.1 from being
+  considered as a dep solution, due to the lack of a functional
+  shared-embedded patch at this time.
 
   20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   amarok-2.2.2-r1.ebuild:
diff --git a/media-sound/amarok/amarok-2.2.0.ebuild b/media-sound/amarok/amarok-2.2.0.ebuild
index 0a82457e1f12..cff32641630c 100644
--- a/media-sound/amarok/amarok-2.2.0.ebuild
+++ b/media-sound/amarok/amarok-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.0.ebuild,v 1.4 2009/11/14 15:20:30 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild,v 1.5 2010/02/22 18:37:24 robbat2 Exp $
 
 EAPI="2"
 
@@ -32,8 +32,8 @@ IUSE="cdda daap debug ipod lastfm mp3tunes mtp +semantic-desktop"
 DEPEND="
 	>=app-misc/strigi-0.5.7
 	|| (
-		>=dev-db/mysql-5.0.76-r1[embedded,-minimal]
-		>=dev-db/mysql-community-5.0.77-r1[embedded,-minimal]
+		( >=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
 	>=media-libs/taglib-extras-1.0.1
diff --git a/media-sound/amarok/amarok-2.2.2-r1.ebuild b/media-sound/amarok/amarok-2.2.2-r1.ebuild
index 7de4fdcd3d6c..fa927868a605 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.2 2010/02/20 19:44:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.3 2010/02/22 18:37:24 robbat2 Exp $
 
 EAPI="2"
 
@@ -33,8 +33,8 @@ 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-community-5.0.77-r1[embedded?,-minimal]
+		( >=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
diff --git a/media-sound/amarok/amarok-2.2.2.90.ebuild b/media-sound/amarok/amarok-2.2.2.90.ebuild
index 42408a8524c3..73ed83e12a37 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.2 2010/02/20 18:29:04 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.3 2010/02/22 18:37:24 robbat2 Exp $
 
 EAPI="2"
 
@@ -33,8 +33,8 @@ 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-community-5.0.77-r1[embedded?,-minimal]
+		( >=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
diff --git a/media-sound/amarok/amarok-2.2.2.ebuild b/media-sound/amarok/amarok-2.2.2.ebuild
index 615d5c777b73..bae542307e74 100644
--- a/media-sound/amarok/amarok-2.2.2.ebuild
+++ b/media-sound/amarok/amarok-2.2.2.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.ebuild,v 1.1 2010/01/08 15:53:27 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild,v 1.2 2010/02/22 18:37:24 robbat2 Exp $
 
 EAPI="2"
 
@@ -33,8 +33,8 @@ DEPEND="
 	app-crypt/qca:2
 	>=app-misc/strigi-0.5.7
 	|| (
-		>=dev-db/mysql-5.0.76-r1[embedded?,-minimal]
-		>=dev-db/mysql-community-5.0.77-r1[embedded?,-minimal]
+		( >=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-extras-1.0.1
 	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]