From 00b347d56462379f43ac5f640c8dba6c4953ae7c Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Tue, 23 Feb 2010 22:58:04 +0000 Subject: [PATCH] Reviewed mysql deps and added a few postinst warnings. Package-Manager: portage-2.2_rc62/cvs/Linux x86_64 --- media-sound/amarok/ChangeLog | 6 +++++- media-sound/amarok/Manifest | 6 +++--- media-sound/amarok/amarok-2.2.2-r1.ebuild | 19 ++++++++++++++++--- media-sound/amarok/amarok-2.2.2.90.ebuild | 19 ++++++++++++++++--- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index f6ee63bf1500..2ff1e6529629 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,10 @@ # 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.363 2010/02/23 17:02:29 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.364 2010/02/23 22:58:04 jmbsvicetto Exp $ + + 23 Feb 2010; Jorge Manuel B. S. Vicetto + amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild: + Reviewed mysql deps and added a few postinst warnings. 23 Feb 2010; Jorge Manuel B. S. Vicetto 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 4bd5ecdf728b..2e9b9e8e30e4 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -5,8 +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 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-r1.ebuild 3135 RMD160 72272c930576dbefd98e20bbfc4b9619e772515c SHA1 708556c364301edb78370679821006ef13b0a6e4 SHA256 8656c2a54b4bd80013cdd99b1bb0c44646c781ac5a833b2cfae60db15a222fa2 +EBUILD amarok-2.2.2.90.ebuild 3192 RMD160 0f76965dfddc74fde9f4ad8df24461cb61ffb46f SHA1 1a3c1315a6de2dcb010827e01fd4c652bfb4d702 SHA256 957c4d06d9e66e9322dcdc9d5a4d71248a6c1bbb7bbf8ef5919a759d8ce00beb EBUILD amarok-2.2.2.ebuild 2850 RMD160 9b7b2f61e0d5b01f4ba3259d8303d72a72f95c6c SHA1 58e7e13f771a08ce334ec451348d267c95807e72 SHA256 b328deb759121d97a91efbf89e8ebed65f6c76cf4ff274554a761a2e2788e07a -MISC ChangeLog 59862 RMD160 cfc0bb9b74bdca2873127e4d167f66d454667450 SHA1 99176697c3ee0ff39b46b7f6671441787dd53415 SHA256 49565714e89b6eede51a154f182d2b362b98e273c4e106b9d8d95c5c55363abe +MISC ChangeLog 60037 RMD160 e175bda3146b166d9b222e77ecde68150a07f799 SHA1 eb05a6196d56950efcab795ae1b3fe9edbd34de8 SHA256 96265f98774a00af27d037c56c8a71a78b8a51f8e641c6e2e0ef828ce507c395 MISC metadata.xml 1283 RMD160 f188f32c38a3e5425d86c59b8c1af8f27833d6b2 SHA1 34f8738cfbf39c87b3ef2ed35f43711b3302c15c SHA256 72c533c0a2afe35a34f0064cdac226e714a1d4bfdddd5cbb6a2ecc75541c16c8 diff --git a/media-sound/amarok/amarok-2.2.2-r1.ebuild b/media-sound/amarok/amarok-2.2.2-r1.ebuild index 649bb9901918..6af0bee206d8 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.5 2010/02/23 17:02:29 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.6 2010/02/23 22:58:04 jmbsvicetto Exp $ EAPI="2" @@ -32,6 +32,7 @@ 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 >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] @@ -43,8 +44,7 @@ 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] ) + embedded? ( =media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-0.3.0 ) mp3tunes? ( @@ -97,4 +97,17 @@ pkg_postinst() { elog "You may be interested in installing www-servers/mongrel as well." echo fi + + if !use embedded; then + echo + elog "You've disabled the amarok support for embedded mysql DBs." + elog "You'll have to configure amarok to use an external db server." + echo + + if has_version "dev-db/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 + fi + fi } diff --git a/media-sound/amarok/amarok-2.2.2.90.ebuild b/media-sound/amarok/amarok-2.2.2.90.ebuild index b9d6ba86b337..4f41602c73d6 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.5 2010/02/23 17:02:29 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.6 2010/02/23 22:58:04 jmbsvicetto Exp $ EAPI="2" @@ -32,14 +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 >=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] ) + embedded? ( =kde-base/libkcddb-${KDE_MINIMAL} >=kde-base/libkcompactdisc-${KDE_MINIMAL} @@ -99,4 +99,17 @@ pkg_postinst() { elog "You may be interested in installing www-servers/mongrel as well." echo fi + + if !use embedded; then + echo + elog "You've disabled the amarok support for embedded mysql DBs." + elog "You'll have to configure amarok to use an external db server." + echo + + if has_version "dev-db/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 + fi + fi } -- 2.26.2