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

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

4 files changed, 15 insertions, 24 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/Manifest b/media-sound/amarok/Manifest
index 95ef4c46163c..4bd5ecdf728b 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1
 AUX amarok-2.2.2-nodebug.patch 16478 RMD160 8f8eedbd5a29f10da6243cc4ac586f59ca493a7d SHA1 c2316800d0632b473b14d683415f51a36879922a SHA256 022a655eff5cd918fc61999001a3251de7e406cbffb40127295820eb4e398a29
 AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d
@@ -8,15 +5,8 @@ DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fc
 DIST amarok-2.2.2.90.tar.bz2 9166245 RMD160 0b595183c17b58fe2f9da6afcca44bf32d574366 SHA1 fd0f2f42aae199b63a8fb0818033b4c3c027b866 SHA256 4c1c3da3d7b59847a47c41e46bd4b1425c98e4efd7c325f1818381f37ac65fb9
 DIST amarok-2.2.2.tar.bz2 8788107 RMD160 0782c4b032d318179bd8bb91353f8e33772d2912 SHA1 2075299b856477cf55cba8ba983ea25a93dc139b SHA256 768d308572897a3100f0d87999f1bb1c68b2e2fa3b0961fd0b918bcfd33ae64d
 EBUILD amarok-2.2.0.ebuild 2812 RMD160 9b384218b43191ffca1cb8d77b6f19385c286e59 SHA1 661e2c00d0b64619d0e4794ffef232bb01521a9e SHA256 cc4c7ad674a5ff052d43e9f0bc873a0a2927f15943af41ef3f1d6eb27238c1c0
-EBUILD amarok-2.2.2-r1.ebuild 2793 RMD160 ece1ee06a3cbf65277f5b75d4271fb62549e7474 SHA1 451788f8d2826084a5a9fe805f7ba0599860570b SHA256 a50e3802993fe9eb6078b4e726a46855d21e0e0449ddd020fb5018a0d47736ce
-EBUILD amarok-2.2.2.90.ebuild 2850 RMD160 8ab0c3dd3af9fe26ae50d9766c476f8b787c4b03 SHA1 6b743452e7dbaf366ecdf3b4093fd58462f1813b SHA256 f779b5642789ddc8617469ea987cfdf0a48a5af594f2855045de94a7ae6e6ec9
+EBUILD amarok-2.2.2-r1.ebuild 2735 RMD160 243fa7ffe13630b8cc6ba6d2122f5d746ded876f SHA1 c6543897a575fb4be380473c125d8ba1857cdacb SHA256 271acc36f50c1975832478000c2d2e5cd4ae47b85288d05484cf6581b7bd7427
+EBUILD amarok-2.2.2.90.ebuild 2792 RMD160 5cb5b64c6b75dddec70783640103c4e648421f68 SHA1 ed4504003f9f6f6678b017b8e0c7e5e38bc09ab0 SHA256 892ec42bc62799bf58900ee7a202c8e4d443d92abf19a1b3ff6302cd6baa91d2
 EBUILD amarok-2.2.2.ebuild 2850 RMD160 9b7b2f61e0d5b01f4ba3259d8303d72a72f95c6c SHA1 58e7e13f771a08ce334ec451348d267c95807e72 SHA256 b328deb759121d97a91efbf89e8ebed65f6c76cf4ff274554a761a2e2788e07a
-MISC ChangeLog 59658 RMD160 68f263d44c22948acdc819b7afd08a89d0e4ccdf SHA1 38b3a843d5891e5cf3ff5b47579a0568cb9fbac5 SHA256 7ae9cf06c741607a1071d005df18f481845ad96ba5e807eaac5e54e1b2ef792d
+MISC ChangeLog 59862 RMD160 cfc0bb9b74bdca2873127e4d167f66d454667450 SHA1 99176697c3ee0ff39b46b7f6671441787dd53415 SHA256 49565714e89b6eede51a154f182d2b362b98e273c4e106b9d8d95c5c55363abe
 MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuDU5EACgkQcsIHjyDViGQ7xgCeN6N+bTVmQ9SFKqN+tCbmdwCV
-2O0AoJqTJVvvbVQwJq6nEIl7GR7F6lvc
-=xR1o
------END PGP SIGNATURE-----
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}