Version bump. Remove old.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

7 files changed, 24 insertions, 144 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index aa817263ea6d..db10d72f8e40 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2012/07/13 13:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.18 2012/07/30 10:50:43 johu Exp $
+
+*tomahawk-0.5.5 (30 Jul 2012)
+
+  30 Jul 2012; Johannes Huber <johu@gentoo.org> +tomahawk-0.5.5.ebuild,
+  -files/tomahawk-0.3.2-remove-quazip.patch, -tomahawk-0.4.2.ebuild,
+  -tomahawk-0.5.4.ebuild, metadata.xml, tomahawk-9999.ebuild:
+  Version bump. Remove old.
 
 *tomahawk-0.5.4 (13 Jul 2012)
 
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 048ec5e7784f..632e9492e47e 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tomahawk-0.3.2-remove-quazip.patch 1567 SHA256 0d0aa71ba4445459d40647265db547de655027efb29baec2a657cd94fe8c05f5 SHA512 dff3651db101abaec8c8334c18faf4cead06533cdd0df0a46650418cd4a954f7b1d50b52bc335f0974f30fcc520df494164c272f59f8a2978fdc2597f9b4ad80 WHIRLPOOL 67fb1a12402d4db8c465cc0209c88004d1e4e5b2d02f33a8b39e30eef7ae80b5244df7e95c2ebf10d3543dacfb9ed602ca7844243f1fadbaf97509f6632fa1e7
-DIST tomahawk-0.4.2.tar.bz2 4790562 SHA256 8556fd1df7bf16a1a52e6bb2176c200462521b7d2e9afad9f1a3c516a0a8133c
-DIST tomahawk-0.5.4.tar.bz2 4830011 SHA256 b1b932da9d5c262216c3483383d40278c27de87a18b32100c5b55921d599befa SHA512 35f0ba6a0da34679e68f66c50c74b0c9849de024dc385addefacb26bd7920059e2266fee1c685c26c8e3781cf7a74711a053f2b1d57d37236cb76ee273caa5c5 WHIRLPOOL 057275f4591c59f030ec26cbd22e4e484103c54698eb16990d5170be6376e6d876689a30230a5f5b154d05cb08619acd2302b7cc24cd1c8c54a6d9e4a97c67f1
-EBUILD tomahawk-0.4.2.ebuild 1956 SHA256 e897b1501174b780098b2b90efc4c9d732d4144d1c4a0a4e67acd443c481da0a SHA512 97e8461095a8f0eade0d7867da528dd30fa52c36d16c0c70df4c8c694e85650fa941439fdf63db7b8841fa0955966235402f1ac412d4d44b1aec72bf033038e4 WHIRLPOOL d8aa22572673108470e5168f80778f1d61059902597fb5a3dc7b966b21b072e93073110d4098646978e76fc4b0f239df751c23dddfb0c608a9be13c34f476207
-EBUILD tomahawk-0.5.4.ebuild 1612 SHA256 24f85a467dc13fbda28592ee58a3fcd9eaba0075f8232ce13b37100f36d71c87 SHA512 f71f3e4b2a16a702ec72ec418d64ddfd272a0e870f59a63c3bd89dc4429c4324b6b2371987b9dedeb5bdc447f845ae9357e10d5d4e6f46a447a0b7320b5eb3fb WHIRLPOOL 796bd57b3eadfaa18a3808efef387c64bb7972c278bf2d8f1bf52ef87804c111d5689e108da96aac411bb9f85f278672218d786d98078af9c4e2a2e179ecfbc5
-EBUILD tomahawk-9999.ebuild 1611 SHA256 fa8f50347874b57a4fbbd884945ff6215992cdd36ebcb81e74ae15c2e8fbe172 SHA512 4ec357ccf40141c55f47f2dd691af4ec7f32ac02d33802d1bdf35b4afe6f336e46f4aa765068f71be8425b4c1d54634c98ed1b7669b3b7a332079af1e531aa71 WHIRLPOOL 30f7527847b05081ad91bb77cdab083e7084e0bf06d1e545b81537dfec112482ab1ad3cfc3a64d5f77f1526eb1a77e2d6ad790d814aa3419eabe2b9c24b8576c
-MISC ChangeLog 3110 SHA256 62f261ffc4fee8c235966a9265e738c711453e582b2102785b56ad541d91e8c5 SHA512 64e511be647f5c925c376fc41a85ac7b5b1fc2284f6d6fd7b4d59d7ead7a7eee18413bf7d637ff6e169f97bb7c7eefd7ac25cd7bfd9bf87ec527775c1823bb76 WHIRLPOOL f20d16a9a3db52162cc5a4ba783300ce1c7e39b1371c7964e3086dcf249d31c9832fde3d563ce7dc0369ea772b43df2e973c58dbcf9d833e64b999d7f9a085ec
-MISC metadata.xml 396 SHA256 394b94c6342f4a7a45ac02a410693ad6ff4b1cbeba8336bb31431d8aa40bde0a SHA512 0af34d6f848ae08b2c65d24b399a9e472299a1251bc6a15ce4d9033aa1d2ac87590480ee904bb7e4f8892f0aaa8a8a83e8c85f8fa64335fba9693a78dd949e18 WHIRLPOOL 23a05af38b67a99dbd5ab90f3ac4ace40b98033c49abb2b1a496d33ede9b5f07010a279cf3e173aeeb20d579efb01602574c6051478357ce9a56ca723b891d6a
+DIST tomahawk-0.5.5.tar.bz2 4831653 SHA256 703fb3aff04e2d3fb1fa02fe484674032b9b9b928dec5a0befa7b024304b0c4f SHA512 748a0c6bf5e193c3063b1378c5f81e6529cf352cbbe4a54fecb7db1e88f95e86d36ba65ff050e810655c676781dbca9f2e9f4ab574525fda3fd8a5cc68e1569f WHIRLPOOL 0177023139f470cfed26f3ded51dc186346150aac3a6a5bbe0925af79be0b315980fc4695b981eb4c11df98d9d5e9cb98eb414d2ea30a08c3ddf9a2bedcea189
+EBUILD tomahawk-0.5.5.ebuild 1620 SHA256 e930f2720390834335ab72259a4f06154909c691743d38398402c4a0736e4e95 SHA512 ed0250f4153baa72b5c5669f16f89795c5525d219225b9d1b297f0059c086498697794d36b2de576132be74715129977de6f440d293e2263d08fb3959c7af3e9 WHIRLPOOL a66e4d1406f646f80eaba87dabf32b91ec36e36f5fccfe8bc6e2144d05ab92f12122b37f78f53d2926eab2f3cd40f94aa172cf30bf2f5e491faceba0f0aa467d
+EBUILD tomahawk-9999.ebuild 1619 SHA256 aa5b8aab8477c933e87be02dac90ed9fa3d2b9656048c6c7a018ede23fe45ed3 SHA512 bdc38b52b1f617b68ec36aef1fd21a588dac261f639b982018b3aefcbd220225654b2179496c699ff7db518b18edab016ea16a777e9b1dd71187f686889aa25e WHIRLPOOL 3203a8f9673804af8e59e3d00b9e2dbfbf520ef36bca23c4f62149128349d6b8c17fefa760ed656c7821684ccbad909c143dc2dc737628f1bae7a36f898fc446
+MISC ChangeLog 3373 SHA256 0b370acaa1c4f0d6a16b57ba7085db26064b6a402600c4dac0c1c3f1ff46aa52 SHA512 2f23e7647332a40e4416949e8221b8085cede8db4fd9d71577ab4c7bb4ad072f5557327ee161b1ea2688ed0506171f5822e41b434bbcd15ed498378ed1347016 WHIRLPOOL 20da884028c5b6eb4189101060f95a025f7548b3460b21abdb61b92b06e59a6d5f2b03f613c0d8bfa13db50ea3613cdb005e1d86046d1c34cd66e96c4dc5ef98
+MISC metadata.xml 318 SHA256 110c482959e914940abfdf001e224a4b98315d40030aba341ddf0298d1ed0a75 SHA512 761afbcd315fc46b1ad2fe7912ab2e21988760c229a0f2ba62f0851f8c61e6be6408faa17cdaf9cf925e840710610be82904d84759574d40720da576628a0b2e WHIRLPOOL afa87cac470a565a1d20b615a1c17ccb6df2ec82cc06cb3e8d5c96bedd4b364bf55b7da813cfb2efd8df5fd9c087d291ee226a9c74580ecfdba63317fad6ae38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQACSqAAoJEO+t9ga+3I3aRW4H/iHc8NV00pqDHWgpP7i/A3uk
-0Qnyk6c+sQPArfLb1TDQpB+DxyLkEPypJgxtALDavgzomt0mSD5yCD2bQkAw5PD4
-qFH4bdQmTNl5iRoEf+M64vX8kufNQbCLGEDRln2fEfHJ4YAYED+hijJhdtD8xBlR
-G7b8F6JYeGzXaTzqDo/CkM43q3ZeEW3sYHZRaujmZhOkhbkoX/RE6eBndS3kouHq
-i2AhHRZWxa4yhXwck6xF+mp6iDZDA0LpQZiysDwbEKWNZN05lakYJPOP+xXGT1sh
-f22x4RYqMqANBzOXkf1qbN4rwnKvxXjIzfQGauWhn2zuGIm0KOgJ9sFZlx3Xu/c=
-=ezTt
+iQEcBAEBCAAGBQJQFmgoAAoJEO+t9ga+3I3aOksIALSCBGboMr/jrsmfF8we0b/L
+ai93saGrZd2mYcH2rI6/Zt5sDqCwMkFnfV6xOMUmaOKOd4+w7ypCwY5BcpIP7kHH
+RrvJQKBa1PoLyqjv4xZiMlYJPCoNLWeE7kSNMdWXWofqf/AjES7vYvmjSrWgbOUX
+f7u0dQnOnEoxYe7WoFBRa8+nlW/AB58kUu0RMtsasSzB8MXocxjRBFu2AToWMiJx
+fhMFGJ27hkIbM/rIK/InJnvdO9qtUJKXnWhoiyyYe/a4tCbXC8tZE5fsgahgl8bT
+JsuvpmUIJ7d2Xwj0GrL7n5c1gsvefGTgipHO7UNnu78mstFSixr4oX/5kiGt9Zg=
+=+Jfm
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch b/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
deleted file mode 100644
index c2ffca0ade1b..000000000000
--- a/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 683274cace247ba9ca5b972f37ffd4d40d8892fa Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gmx.de>
-Date: Thu, 24 Nov 2011 15:13:38 +0100
-Subject: [PATCH 2/2] Remove internal quazip hack
-
----
- CMakeLists.txt |   12 ------------
- 1 files changed, 0 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 070db41..0e15c61 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,18 +110,6 @@ macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fe
- macro_optional_find_package(QuaZip)
- macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
- 
--IF( NOT QuaZip_FOUND )
--    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
--    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
--    SET( QuaZip_LIBRARY quazip )
--    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
--    SET( QuaZip_FOUND true )
--    macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
--
--    # copy headers to build/quazip so we can use proper includes inside the code
--    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
--ENDIF()
--
- # required
- #While we distribute our own liblastfm2, don't need to look for it
- #macro_optional_find_package(LibLastFm 0.3.3)
--- 
-1.7.8.rc3
-
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index 4d9321740a16..df344c1b4b05 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -7,7 +7,6 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<use>
-		<flag name="resolver">Resolver download and installation integration</flag>
 		<flag name="twitter">Enable twitter support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/tomahawk/tomahawk-0.4.2.ebuild b/media-sound/tomahawk/tomahawk-0.4.2.ebuild
deleted file mode 100644
index cfafdf989f85..000000000000
--- a/media-sound/tomahawk/tomahawk-0.4.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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-0.4.2.ebuild,v 1.1 2012/04/11 09:13:44 johu Exp $
-
-EAPI=4
-
-QT_MINIMAL="4.7.0"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="Qt playdar social music player"
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="debug fftw jabber libsamplerate +resolver 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
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	>=x11-libs/qt-core-${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}
-	app-crypt/qca-ossl
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.2-remove-quazip.patch"
-)
-
-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 )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_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
-}
diff --git a/media-sound/tomahawk/tomahawk-0.5.4.ebuild b/media-sound/tomahawk/tomahawk-0.5.5.ebuild
index 0fabfe8b602f..aeb0829b7941 100644
--- a/media-sound/tomahawk/tomahawk-0.5.4.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.5.5.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-0.5.4.ebuild,v 1.1 2012/07/13 13:37:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.5.5.ebuild,v 1.1 2012/07/30 10:50:43 johu Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ DEPEND="
 	dev-libs/qjson
 	dev-libs/quazip
 	>=media-libs/liblastfm-1.0.1
-	media-libs/libechonest
+	>=media-libs/libechonest-2.0.1
 	>=media-libs/phonon-4.5.0
 	media-libs/taglib
 	x11-libs/libX11
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 414703b98f95..39bbbad30be8 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.7 2012/06/30 20:46:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.8 2012/07/30 10:50:43 johu Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ DEPEND="
 	dev-libs/qjson
 	dev-libs/quazip
 	>=media-libs/liblastfm-1.0.1
-	media-libs/libechonest
+	>=media-libs/libechonest-2.0.1
 	>=media-libs/phonon-4.5.0
 	media-libs/taglib
 	x11-libs/libX11