[gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/files/, media-sound/tomahawk/

[gentoo-commits] dev/johu:master commit in: media-sound/tomahawk/files/, media-sound/tomahawk/

[Johannes Huber]

commit:     285b0a169f2c1d9bd5456660892322980371ed95
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 13:55:49 2011 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 13:55:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=285b0a16

[media-sound/tomahawk] Add for maintaining

(Portage version: 2.2.0_alpha79/git/Linux x86_64, unsigned Manifest commit)

---
 media-sound/tomahawk/ChangeLog                     |   37 +++++++++
 .../files/tomahawk-0.3.2-remove-quazip.patch       |   35 ++++++++
 media-sound/tomahawk/metadata.xml                  |    9 ++
 media-sound/tomahawk/tomahawk-9999.ebuild          |   85 ++++++++++++++++++++
 4 files changed, 166 insertions(+), 0 deletions(-)

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
new file mode 100644
index 0000000..2218584
--- /dev/null
+++ b/media-sound/tomahawk/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for media-sound/tomahawk
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.5 2011/12/08 13:07:27 johu Exp $
+
+  08 Dec 2011; Johannes Huber <johu@gentoo.org>
+  -files/tomahawk-0.3.2-clucene.patch, tomahawk-0.3.3.ebuild,
+  tomahawk-9999.ebuild:
+  Removed not needed patch anymore. Cause was bug #361385
+
+*tomahawk-0.3.3 (08 Dec 2011)
+
+  08 Dec 2011; Johannes Huber <johu@gentoo.org> +tomahawk-0.3.3.ebuild,
+  -files/tomahawk-0.3.0-clucene.patch,
+  -files/tomahawk-0.3.0-remove-quazip.patch, -tomahawk-0.3.0.ebuild,
+  -tomahawk-0.3.2.ebuild:
+  Version bump 0.3.3. Remove old.
+
+  01 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> tomahawk-0.3.0.ebuild,
+  tomahawk-0.3.2.ebuild, tomahawk-9999.ebuild:
+  Can use any phonon backend
+
+*tomahawk-0.3.2 (24 Nov 2011)
+
+  24 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +tomahawk-0.3.2.ebuild, +files/tomahawk-0.3.2-clucene.patch,
+  +files/tomahawk-0.3.2-remove-quazip.patch, tomahawk-9999.ebuild:
+  Version bump, thanks johu!
+
+*tomahawk-9999 (12 Nov 2011)
+*tomahawk-0.3.0 (12 Nov 2011)
+
+  12 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +tomahawk-0.3.0.ebuild, +files/tomahawk-0.3.0-clucene.patch,
+  +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/files/tomahawk-0.3.2-remove-quazip.patch b/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
new file mode 100644
index 0000000..c2ffca0
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.3.2-remove-quazip.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 0000000..a841699
--- /dev/null
+++ b/media-sound/tomahawk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<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-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
new file mode 100644
index 0000000..1a5f0ec
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 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.4 2011/12/08 13:07:27 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="
+	>=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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-remove-quazip.patch"
+)
+
+src_configure() {
+	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
+}