| 1 |
commit: ac1444c05d0d2dca3368ed189535e0c5957e72fc |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 30 17:46:51 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 30 17:46:51 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=ac1444c0 |
| 7 |
|
| 8 |
[media-sound/tomahawk] Fix dependencies according upstream changes. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha114/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
media-sound/tomahawk/metadata.xml | 1 - |
| 14 |
media-sound/tomahawk/tomahawk-9999.ebuild | 29 +++++++++-------------------- |
| 15 |
2 files changed, 9 insertions(+), 21 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml |
| 18 |
index 4d93217..df344c1 100644 |
| 19 |
--- a/media-sound/tomahawk/metadata.xml |
| 20 |
+++ b/media-sound/tomahawk/metadata.xml |
| 21 |
@@ -7,7 +7,6 @@ |
| 22 |
<name>Johannes Huber</name> |
| 23 |
</maintainer> |
| 24 |
<use> |
| 25 |
- <flag name="resolver">Resolver download and installation integration</flag> |
| 26 |
<flag name="twitter">Enable twitter support</flag> |
| 27 |
</use> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild |
| 31 |
index 429bdc8..eafe0ce 100644 |
| 32 |
--- a/media-sound/tomahawk/tomahawk-9999.ebuild |
| 33 |
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild |
| 34 |
@@ -22,28 +22,28 @@ HOMEPAGE="http://tomahawk-player.org/" |
| 35 |
|
| 36 |
LICENSE="GPL-3 BSD" |
| 37 |
SLOT="0" |
| 38 |
-IUSE="debug fftw jabber libsamplerate +resolver twitter" |
| 39 |
+IUSE="debug fftw jabber libsamplerate twitter" |
| 40 |
|
| 41 |
DEPEND=" |
| 42 |
app-crypt/qca |
| 43 |
>=dev-cpp/clucene-2.3.3.4 |
| 44 |
>=dev-libs/boost-1.41 |
| 45 |
- >=dev-libs/qjson-0.7.1 |
| 46 |
- >=media-libs/libechonest-1.1.10 |
| 47 |
+ >=dev-libs/libattica-0.4.0 |
| 48 |
+ dev-libs/qjson |
| 49 |
+ dev-libs/quazip |
| 50 |
+ >=media-libs/liblastfm-1.0.1 |
| 51 |
+ media-libs/libechonest |
| 52 |
>=media-libs/phonon-4.5.0 |
| 53 |
media-libs/taglib |
| 54 |
+ x11-libs/libX11 |
| 55 |
>=x11-libs/qt-core-${QT_MINIMAL}:4 |
| 56 |
+ >=x11-libs/qt-dbus-${QT_MINIMAL}:4 |
| 57 |
>=x11-libs/qt-gui-${QT_MINIMAL}:4 |
| 58 |
>=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] |
| 59 |
>=x11-libs/qt-webkit-${QT_MINIMAL}:4 |
| 60 |
- >=x11-libs/qt-xmlpatterns-${QT_MINIMAL}:4 |
| 61 |
fftw? ( sci-libs/fftw:3.0 ) |
| 62 |
jabber? ( net-libs/jreen ) |
| 63 |
libsamplerate? ( media-libs/libsamplerate ) |
| 64 |
- resolver? ( |
| 65 |
- dev-libs/libattica |
| 66 |
- >=dev-libs/quazip-0.4.3 |
| 67 |
- ) |
| 68 |
twitter? ( net-libs/qtweetlib ) |
| 69 |
" |
| 70 |
RDEPEND="${DEPEND} |
| 71 |
@@ -53,14 +53,12 @@ RDEPEND="${DEPEND} |
| 72 |
src_configure() { |
| 73 |
local mycmakeargs=( |
| 74 |
$(cmake-utils_use_with jabber Jreen) |
| 75 |
- $(cmake-utils_use_with resolver LibAttica) |
| 76 |
- $(cmake-utils_use_with resolver QuaZip) |
| 77 |
$(cmake-utils_use_with twitter QTweetLib) |
| 78 |
-DINTERNAL_JREEN=OFF |
| 79 |
) |
| 80 |
|
| 81 |
if [[ ${PV} != *9999* ]]; then |
| 82 |
- mycmakeargs+=( -DBUILD_RELEASE=ON ) |
| 83 |
+ mycmakeargs+=( -DBUILD_RELEASE=ON ) |
| 84 |
fi |
| 85 |
|
| 86 |
cmake-utils_src_configure |
| 87 |
@@ -73,12 +71,3 @@ src_compile() { |
| 88 |
src_install() { |
| 89 |
cmake-utils_src_install |
| 90 |
} |
| 91 |
- |
| 92 |
-pkg_postinst() { |
| 93 |
- if ! use resolver; then |
| 94 |
- echo |
| 95 |
- elog "Information on how to get more resolvers for ${PN}" |
| 96 |
- elog "is available at ${HOMEPAGE}resolvers" |
| 97 |
- echo |
| 98 |
- fi |
| 99 |
-} |
Archives