Version bump. Remove old.

(Portage version: 2.2.0_alpha120/cvs/Linux i686)

6 files changed, 12 insertions, 129 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/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