Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/
Date: Tue, 15 Nov 2011 04:22:43
Message-Id: 296e5cab83feea3555633b2e58987cde881eaee0.jmbsvicetto@gentoo
commit:     296e5cab83feea3555633b2e58987cde881eaee0
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 04:21:22 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 04:21:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=296e5cab

[media-sound/amarok] Added amarok-2.5 Beta 1.

(Portage version: 2.2.0_alpha73/git/Linux x86_64, unsigned Manifest commit)

---
 .../{amarok-9999.ebuild => amarok-2.4.90.ebuild}   |   12 +++---------
 media-sound/amarok/amarok-9999.ebuild              |   12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.4.90.ebuild
similarity index 95%
copy from media-sound/amarok/amarok-9999.ebuild
copy to media-sound/amarok/amarok-2.4.90.ebuild
index ae7012a..1f6ee9e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-2.4.90.ebuild
@@ -33,11 +33,11 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	player? (
 		app-crypt/qca:2
-		app-misc/strigi
+		>=app-misc/strigi-0.5.7
 		$(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

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index ae7012a..1f6ee9e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -33,11 +33,11 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	player? (
 		app-crypt/qca:2
-		app-misc/strigi
+		>=app-misc/strigi-0.5.7
 		$(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