[media-sound/amarok] Replace the mysql dependency - bug 388059.

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

3 files changed, 25 insertions, 27 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index dec0eabb8e6f..07109abfadc6 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.410 2011/08/23 21:55:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.411 2011/10/24 14:55:19 jmbsvicetto Exp $
+
+  24 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.3.ebuild:
+  [media-sound/amarok] Replace the mysql dependency - bug 388059.
 
   23 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> amarok-2.4.0.ebuild,
   amarok-2.4.1.ebuild, amarok-2.4.3.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index bedb22a42f2e..93e03610f3cc 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf6945a19fe57472d2 SHA1 4f5c730f989c1f5aab57af72a9540223698bd7e1 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab
 AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
@@ -12,23 +12,23 @@ DIST amarok-2.4.3.tar.bz2 17468203 RMD160 02026c400025e944c69f31b29013c8054a2575
 EBUILD amarok-2.3.2-r1.ebuild 4427 RMD160 3ab4b38f359a865586962bf4e740c52bb832fb9d SHA1 8b90eeea7d04d838b51865c3dde7edb6a021d040 SHA256 78dbacbc22a749251080c8c996c54a408e1040f3e49f9ccfc0ad5f9cab28a7fb
 EBUILD amarok-2.4.0.ebuild 4027 RMD160 dd54636bb8651bed3a5fa5a5e844c09c422470ad SHA1 dfc0ad88e444e0bf54e075fde81c8204437d6793 SHA256 3a0defb4e17e6fcca4487e5d77277e0c327090020c1cfe54ae8c40701d70420c
 EBUILD amarok-2.4.1.ebuild 4411 RMD160 5d22b8de9efd93bc25736f238827506c42ca5e47 SHA1 8e5113ba5166025cc7233abde51c54160be1527f SHA256 70a994985aa45ccc405aed97c831ebcb56bb0d9affbd2812e42207faa9a4bc1c
-EBUILD amarok-2.4.3.ebuild 4072 RMD160 2ba2fe4c913e522a26506a820747534e777c189a SHA1 7917acf73f65e548785efdf77c06ddd9cb06629f SHA256 6812ef985de8c276262a072f77a5952f420b19c6dd7f5c488eb289cde21f9a6a
-MISC ChangeLog 70403 RMD160 20f8659e37737b6dabbed6b9671351d6a3f43b29 SHA1 91cd787ae19a5dac04a8a17bcfa7014a2b11bd52 SHA256 5a94496460f75327ff176a363dc88aba81138dbbff059ea8d7f623ff910687dd
+EBUILD amarok-2.4.3.ebuild 3978 RMD160 368859ee1e488fe072f5a9583d7487f63aa01a1d SHA1 fe0384d78f0b45024e007781234fba61d82d7870 SHA256 9050a7a0d7212d772f88458a6ca201c7f2d9dc563ebddd7e14e102841369158d
+MISC ChangeLog 70562 RMD160 28ac325e5841a9febed393b565f343dde6cb709c SHA1 41663d0aff9be8a9cd7da8c30468bdf5677dc2ff SHA256 aaadacf5ebfc0a95f33ba9cb8eb87db11ca6093f1618ba217a1a3196774d0e49
 MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOVCHSAAoJENwGBM22xffetHkP/ibPra/fxJbo2Q9GdJ3h1LUs
-nitQpKuXK4jjZujifvD1bG6GxB2/OX+AP8Do0yf6byNcXzucXUszD+njoXRDV6kV
-Ex7kjQijzTopw/rPusjonH/HLwTtGzfpLg00RQyWz1e6ONwSVQIotlbypPdjf1BO
-eBuq5ImkAow8RgPktDjYR9RG9Xb1rh9rky7mDOePbjA1TnC2rZH22NOdNXnqdeb0
-radku0MTwy5OTdIsV7dCU7Kte9JPMvrg99nNRWhJOVhwAjhKt33seIcNsluiCyBE
-saKLFDTmmiODMG1vJujjKRqfEU9p3YXsq0NwPLSmmAzZ8t9oaoM8mwJpaNE2lhnP
-AMafc/8yfVXDJ0ZehWsJqpnc0veFFwH/0ukcjq3GRUX94IYhxBIS+P1LiqZguxr0
-01YRsSvML1ME4Gj6wb56VLuJAzY1sZhfsPW34lI7metYuP/XVtV4yRSkhHlYdFwQ
-lZKBYv4UZ1Cl+J18C6N3fnqvcshgxr3RKqrwxgFDBrU0rWU2uJ5PZIPsDYnXHM+P
-q5pCENaKOwomwwh7L6Don8+vwARAV9Dr8jT0+YTWnYuC79IDpgnHE2u4e+kbsPuQ
-OlDmjaA/F38U87sgf0P0i2eRJcCkZLbRSovpvlR1bN5YsmKRsVIvfnf4r/nrvOos
-/6RJmTE8XSAUU2z1gK/V
-=hyg2
+iQIcBAEBAgAGBQJOpXw5AAoJEC8ZTXQF1qEPJ3UP/2iKwm4TvbqK/VWul82XA6Lb
+kSJRHfoUFJh8RJTEEfqjUnd8TPElhEfqnnNqW+neMEVT7JWlNBatkDroiGRmUR64
+gnV9Ao9zWk3/RTGA6/0JXisSBOpBlFRBgLuVpW7GRZz9m6Wog8ZsFHPeIkyRIDAn
+E72TwL/3A37Z5lXGY3wwS6OMsByfh13obxZk7lNlPQpVGpqUT1jOhYVs6HzjkXv4
+Wie9H7FKhkQT3PVIc8harQNdhJjb0N0dTQdIckYixhewHZ2OgZV+inQniUcr4UY9
+WFSQ2MOnkBbILzOwken20wrizXq0a3NN50tsM52Q07JlRtestuB1jeenIXT0UyBt
+/K0CXYLQ2fOWCgM+Js+9fJSEp/8t2ndTfYchW+QNFqJOIePlVpNhRdIB/obidgYA
+8MIWccGn28OdaUUP2zVCQ8e7IennYtdzcj4N2XG1efLCVWWSSNUYbFGmIf+3iXXi
+poJ0IXEgLeBWU1DEqivxlHxbHez9KEzFgg9+Q4+pq7/E/jKFYddGVSI6VK9luhrz
+ZkgxIFI+eme/bZv9//xIRH9BSNfrs95Ge2cQ/95UrM+EHaJlqK6o3ZP0svtkHNP5
+spbyRZltiwU1hzRy6qfOVYqypQ+DbDDWstb0inuXPQ3pvc4JnxRMwiJlXgjfntdP
+jfQvns7l83OApsfIEi2F
+=1dkZ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.4.3.ebuild b/media-sound/amarok/amarok-2.4.3.ebuild
index ad31d8d33bfd..49705b63ad32 100644
--- a/media-sound/amarok/amarok-2.4.3.ebuild
+++ b/media-sound/amarok/amarok-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3.ebuild,v 1.2 2011/08/23 21:55:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3.ebuild,v 1.3 2011/10/24 14:55:19 jmbsvicetto Exp $
 
 EAPI=4
 
@@ -37,7 +37,7 @@ COMMONDEPEND="
 		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 		$(add_kdebase_dep kdebase-kioslaves)
 		sys-libs/zlib
-		>=virtual/mysql-5.1
+		>=virtual/mysql-5.1[embedded?]
 		x11-libs/qt-script
 		>=x11-libs/qtscriptgenerator-0.1.0
 		cdda? (
@@ -45,12 +45,6 @@ COMMONDEPEND="
 			$(add_kdebase_dep libkcompactdisc)
 			$(add_kdebase_dep kdemultimedia-kioslaves)
 		)
-		embedded? (
-			|| (
-				>=dev-db/mysql-5.1.50-r3[embedded]
-				>=dev-db/mariadb-5.1.50[embedded]
-			)
-		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 		lastfm? ( >=media-libs/liblastfm-0.3.0 )
 		mp3tunes? (
@@ -145,7 +139,7 @@ pkg_postinst() {
 			elog "to configure the external db and migrate your data from the embedded database."
 			echo
 
-			if has_version "dev-db/mysql[minimal]"; then
+			if has_version "virtual/mysql[minimal]"; then
 				elog "You built mysql with the minimal use flag, so it doesn't include the server."
 				elog "You won't be able to use the local mysql installation to store your amarok collection."
 				echo