From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-401041-garchives=archives.gentoo.org@lists.gentoo.org>) id 1RQAXj-0006Yr-E6 for garchives@archives.gentoo.org; Tue, 15 Nov 2011 04:22:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D07D21C07B; Tue, 15 Nov 2011 04:22:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E003421C07B for <gentoo-commits@lists.gentoo.org>; Tue, 15 Nov 2011 04:22:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA13F1B401A for <gentoo-commits@lists.gentoo.org>; Tue, 15 Nov 2011 04:22:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4F63080042 for <gentoo-commits@lists.gentoo.org>; Tue, 15 Nov 2011 04:22:33 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org> Message-ID: <296e5cab83feea3555633b2e58987cde881eaee0.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/ X-VCS-Repository: proj/kde X-VCS-Files: media-sound/amarok/amarok-2.4.90.ebuild media-sound/amarok/amarok-9999.ebuild X-VCS-Directories: media-sound/amarok/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 296e5cab83feea3555633b2e58987cde881eaee0 Date: Tue, 15 Nov 2011 04:22:33 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4135e608-e7f4-4c23-9513-6d5716c99251 X-Archives-Hash: ad3f174c36d4f36ddbe4006da911d4ad commit: 296e5cab83feea3555633b2e58987cde881eaee0 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> ge= ntoo <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=3Dproj/kde.git;a=3Dc= ommit;h=3D296e5cab [media-sound/amarok] Added amarok-2.5 Beta 1. (Portage version: 2.2.0_alpha73/git/Linux x86_64, unsigned Manifest commi= t) --- .../{amarok-9999.ebuild =3D> 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/a= marok-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=3D" >=3Dmedia-libs/taglib-extras-1.0.1 player? ( app-crypt/qca:2 - app-misc/strigi + >=3Dapp-misc/strigi-0.5.7 $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') $(add_kdebase_dep kdebase-kioslaves) sys-libs/zlib - >=3Dvirtual/mysql-5.1 + >=3Dvirtual/mysql-5.1[embedded?] x11-libs/qt-script >=3Dx11-libs/qtscriptgenerator-0.1.0 cdda? ( @@ -45,12 +45,6 @@ COMMONDEPEND=3D" $(add_kdebase_dep libkcompactdisc) $(add_kdebase_dep kdemultimedia-kioslaves) ) - embedded? ( - || ( - >=3Ddev-db/mysql-5.1.50-r3[embedded] - >=3Ddev-db/mariadb-5.1.50[embedded] - ) - ) ipod? ( >=3Dmedia-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=3Dmedia-libs/liblastfm-0.3.0 ) mp3tunes? ( @@ -145,7 +139,7 @@ pkg_postinst() { elog "to configure the external db and migrate your data from the emb= edded database." echo =20 - 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 inclu= de 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/a= marok-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=3D" >=3Dmedia-libs/taglib-extras-1.0.1 player? ( app-crypt/qca:2 - app-misc/strigi + >=3Dapp-misc/strigi-0.5.7 $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') $(add_kdebase_dep kdebase-kioslaves) sys-libs/zlib - >=3Dvirtual/mysql-5.1 + >=3Dvirtual/mysql-5.1[embedded?] x11-libs/qt-script >=3Dx11-libs/qtscriptgenerator-0.1.0 cdda? ( @@ -45,12 +45,6 @@ COMMONDEPEND=3D" $(add_kdebase_dep libkcompactdisc) $(add_kdebase_dep kdemultimedia-kioslaves) ) - embedded? ( - || ( - >=3Ddev-db/mysql-5.1.50-r3[embedded] - >=3Ddev-db/mariadb-5.1.50[embedded] - ) - ) ipod? ( >=3Dmedia-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=3Dmedia-libs/liblastfm-0.3.0 ) mp3tunes? ( @@ -145,7 +139,7 @@ pkg_postinst() { elog "to configure the external db and migrate your data from the emb= edded database." echo =20 - 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 inclu= de the server." elog "You won't be able to use the local mysql installation to store= your amarok collection." echo