Sync live ebuild with dev overlay. Updates dependencies and build options.

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

3 files changed, 24 insertions, 34 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 3bc03a5ea662..eeaabae3b90e 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.11 2012/04/11 09:13:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.12 2012/06/30 20:46:17 johu Exp $
+
+  30 Jun 2012; Johannes Huber <johu@gentoo.org> tomahawk-9999.ebuild:
+  Sync live ebuild with dev overlay. Updates dependencies and build options.
 
 *tomahawk-0.4.2 (11 Apr 2012)
 
@@ -60,4 +63,3 @@
   +files/tomahawk-0.3.0-remove-quazip.patch, +tomahawk-9999.ebuild,
   +metadata.xml:
   New application, bug 379385. Thanks to eliasp, johu and jmbsvicetto...
-
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 3e3bc9203ef5..f44c632f6ace 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -6,17 +6,17 @@ DIST tomahawk-0.4.1.tar.bz2 4751167 RMD160 b96a6a92d1eb3562d58da3a14aa0f84a2f12a
 DIST tomahawk-0.4.2.tar.bz2 4790562 RMD160 2f9bae83839ef7c8421df33f3c4c60c0d9f23731 SHA1 360e301cd79610ec8256ce4d1c1dc0ead6a3088c SHA256 8556fd1df7bf16a1a52e6bb2176c200462521b7d2e9afad9f1a3c516a0a8133c
 EBUILD tomahawk-0.4.1.ebuild 1956 RMD160 f946457e447c1d619baa52f61f8261ed5047af6f SHA1 97fe4955fa2766b5e62ecfee24f6b1c1b5cfb706 SHA256 a79a48d572d9cbe3dc6547d0c868655dbc54a1be542645ca5907dd68bf40cf73
 EBUILD tomahawk-0.4.2.ebuild 1956 RMD160 c5c287d5a9d95d46daf2633d209d63cb8892aef1 SHA1 bd588540e25f630e18a6e4b3ed73ab5999c4dbb9 SHA256 e897b1501174b780098b2b90efc4c9d732d4144d1c4a0a4e67acd443c481da0a
-EBUILD tomahawk-9999.ebuild 1900 RMD160 38bb29791453b062181739bac729930e3835bf34 SHA1 8759027846e5d626b9efaeef9899f5b05ccec772 SHA256 12dfd6ed5753408a901ff414a189a801f1200b135c212dfb573ad29123be5370
-MISC ChangeLog 2173 RMD160 894e4f03cb4f38d1b99b25a0804118e8cca46420 SHA1 f0f25a1fa34b4e3abe1362f51e489f29a4d98f78 SHA256 43a8d21e19b5d1b7967e3dccb68f75b3a81aba0619f6c50805abe14eaec65175
+EBUILD tomahawk-9999.ebuild 1611 RMD160 dbb760de9c1b2885fad77a23f8a67bcdb3fa81e7 SHA1 3b94a96499d3c69442dbf4dac0c06161fcc4e930 SHA256 fa8f50347874b57a4fbbd884945ff6215992cdd36ebcb81e74ae15c2e8fbe172
+MISC ChangeLog 2320 RMD160 0a9ba22e753378a0217be7e18af3887a3328ebc1 SHA1 525fb9c59515008a4ddb2eec229077fdd74776c0 SHA256 a519a9d79f64acd2c68f6a1c373d84fd634f2281fc714bdb29f08c41ae2663eb
 MISC metadata.xml 396 RMD160 998d05e2f8ef6d73f552532a3a1f1aef2eeb67df SHA1 1bbeb16a3c3156e6bd514117777cf3112c8e70fe SHA256 394b94c6342f4a7a45ac02a410693ad6ff4b1cbeba8336bb31431d8aa40bde0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPhUtwAAoJEO+t9ga+3I3aPnkIAKk9ZLoOZq9poU9JSdrQlNYY
-eMD/k040KEuYTdgUkbTUuEfVJF/bH9wViBZ53MuHaFpVFayAuke6WNtPHWmLggRH
-XaGfqXwSibyar9FoN78LWm1D071nkahqezyPM9V1uXZmKc4iFjndSbXqyY8l/WWQ
-N6Pou8b5cOd+vyKh4cRDAltX9FcQDrZdLHN2hew+HSrCvvHMN5EDORHHFuYuClhI
-VCfgwXrSCb6mYLJrGSWj7N+A1fZWjaMIk2YzxYtS7GBbHdo95b+evCDxCg4aSF28
-SjK8eYDvRfUdITuLWScp4j2KpqX1pupXQ74f7WxOhgGQhyhd8CQvGpumtsPo0xA=
-=oZPF
+iQEcBAEBCgAGBQJP72WcAAoJEO+t9ga+3I3aHdgH/02ZUjEGZ4e6Q8fqwHC65HlD
+H4e4JbE+W3L/LEg8wpIz5p/m8D1pn0pivz9DI1Y3v2mcYR4kAwqxKX0foZXO6qDv
+HGKlmAkJK3qzDeQ64exydzvp7uPMH1IbiYUrbDawTK8xLAU5aK2lvH5CI4JTEFuX
+m7r1lqiBq8l5eds4rfPuum78ZEiMG6MwMF7PTnGpoLx1Z4HXXVY7uWJbrFK9gDru
+OcJRCyViMDpisKWX0fvSW2/yWvE1WHl7lbx3Y3D729l/kF+TNrzc2QjioRSiq6G/
+/4pAruxAb+kF+1oxetPOvad/kKrRcjWVpemhnKL1PbhgARu6gEDFszTQqrUwRWA=
+=2afb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 15670b1bd0ae..414703b98f95 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.6 2012/04/06 08:44:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.7 2012/06/30 20:46:17 johu Exp $
 
 EAPI=4
 
@@ -22,28 +22,28 @@ HOMEPAGE="http://tomahawk-player.org/"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug fftw jabber libsamplerate +resolver twitter"
+IUSE="debug fftw jabber libsamplerate twitter"
 
 DEPEND="
 	app-crypt/qca
 	>=dev-cpp/clucene-2.3.3.4
 	>=dev-libs/boost-1.41
-	>=dev-libs/qjson-0.7.1
-	>=media-libs/libechonest-1.1.10
+	>=dev-libs/libattica-0.4.0
+	dev-libs/qjson
+	dev-libs/quazip
+	>=media-libs/liblastfm-1.0.1
+	media-libs/libechonest
 	>=media-libs/phonon-4.5.0
 	media-libs/taglib
+	x11-libs/libX11
 	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-dbus-${QT_MINIMAL}:4
 	>=x11-libs/qt-gui-${QT_MINIMAL}:4
 	>=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite]
 	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
-	>=x11-libs/qt-xmlpatterns-${QT_MINIMAL}:4
 	fftw? ( sci-libs/fftw:3.0 )
 	jabber? ( net-libs/jreen )
 	libsamplerate? ( media-libs/libsamplerate )
-	resolver? (
-		dev-libs/libattica
-		>=dev-libs/quazip-0.4.3
-	)
 	twitter? ( net-libs/qtweetlib )
 "
 RDEPEND="${DEPEND}
@@ -53,14 +53,11 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with jabber Jreen)
-		$(cmake-utils_use_with resolver LibAttica)
-		$(cmake-utils_use_with resolver QuaZip)
 		$(cmake-utils_use_with twitter QTweetLib)
-		-DINTERNAL_JREEN=OFF
 	)
 
 	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=(	-DBUILD_RELEASE=ON )
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
 	fi
 
 	cmake-utils_src_configure
@@ -73,12 +70,3 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 }
-
-pkg_postinst() {
-	if ! use resolver; then
-		echo
-		elog "Information on how to get more resolvers for ${PN}"
-		elog "is available at ${HOMEPAGE}resolvers"
-		echo
-	fi
-}