* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/files/, media-sound/tomahawk/
@ 2011-11-24 14:41 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2011-11-24 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 32a659b63605edcdb4e8831c4e3cbb8d5a6b4b80
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Thu Nov 24 14:36:45 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Thu Nov 24 14:41:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=32a659b6
[media-sound/tomahawk] Fix live
(Portage version: 2.2.0_alpha76/git/Linux x86_64, unsigned Manifest commit)
---
media-sound/tomahawk/ChangeLog | 13 ++
.../tomahawk/files/tomahawk-0.3.2-clucene.patch | 184 ++++++++++++++++++++
.../files/tomahawk-0.3.2-remove-quazip.patch | 35 ++++
media-sound/tomahawk/metadata.xml | 9 +
media-sound/tomahawk/tomahawk-9999.ebuild | 86 +++++++++
5 files changed, 327 insertions(+), 0 deletions(-)
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
new file mode 100644
index 0000000..3d551d6
--- /dev/null
+++ b/media-sound/tomahawk/ChangeLog
@@ -0,0 +1,13 @@
+# 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.1 2011/11/12 19:22:24 dilfridge Exp $
+
+*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-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch
new file mode 100644
index 0000000..4f8aa43
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch
@@ -0,0 +1,184 @@
+From 01d13bec7a3cd33bb815968012d1f00c7eb3e700 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gmx.de>
+Date: Thu, 24 Nov 2011 15:10:41 +0100
+Subject: [PATCH] Patch clucene
+
+---
+ CMakeModules/FindCLucene.cmake | 97 ++++++++++++++--------------------------
+ src/libtomahawk/CMakeLists.txt | 2 +-
+ 2 files changed, 35 insertions(+), 64 deletions(-)
+
+diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake
+index 1d5e8d9..906afcc 100644
+--- a/CMakeModules/FindCLucene.cmake
++++ b/CMakeModules/FindCLucene.cmake
+@@ -2,10 +2,9 @@
+ # This module looks for clucene (http://clucene.sf.net) support
+ # It will define the following values
+ #
+-# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
+ # CLUCENE_INCLUDE_DIR = where CLucene/StdHeader.h can be found
+ # CLUCENE_LIBRARY_DIR = where CLucene/clucene-config.h can be found
+-# CLUCENE_LIBRARIES = the libraries to link against CLucene
++# CLUCENE_LIBRARY = the library to link against CLucene
+ # CLUCENE_VERSION = The CLucene version string
+ # CLucene_FOUND = set to 1 if clucene is found
+ #
+@@ -13,21 +12,9 @@
+ INCLUDE(CheckSymbolExists)
+ INCLUDE(FindLibraryWithDebug)
+
+-# try to locate a patched unstable version (for comp's sake *sigh*) first
+-FIND_PACKAGE(CLuceneUnstable)
+-IF(CLUCENEUNSTABLE_FOUND)
+- SET(CLucene_FOUND TRUE)
+- SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
+- SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
+- SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
+-
+- #MESSAGE(FATAL_ERROR NARF)
+-ELSE(CLUCENEUNSTABLE_FOUND)
+-IF(CLucene_FIND_VERSION)
+- SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
+-ELSEIF()
+- SET(CLUCENE_MIN_VERSION "0.9.23")
+-ENDIF(CLucene_FIND_VERSION)
++if(NOT CLUCENE_MIN_VERSION)
++ set(CLUCENE_MIN_VERSION "0.9.19")
++endif(NOT CLUCENE_MIN_VERSION)
+
+ IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+ INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
+@@ -36,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+ SET(TRIAL_LIBRARY_PATHS
+ $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
+ ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
++ ${CMAKE_LIBRARY_PATH}
+ /usr/local/lib${LIB_SUFFIX}
++ /opt/local/lib${LIB_SUFFIX}
+ /usr/lib${LIB_SUFFIX}
+ /sw/lib${LIB_SUFFIX}
+ /usr/pkg/lib${LIB_SUFFIX}
+- /usr/lib64
+ )
+ SET(TRIAL_INCLUDE_PATHS
+ $ENV{CLUCENE_HOME}/include
+@@ -50,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
+ /sw/include
+ /usr/pkg/include
+ )
+-FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
+- WIN32_DEBUG_POSTFIX d
+- NAMES clucene-core
+- PATHS ${TRIAL_LIBRARY_PATHS})
+-IF (CLUCENE_CORE_LIBRARY)
+- MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
+-ENDIF (CLUCENE_CORE_LIBRARY)
+-FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
++FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+ WIN32_DEBUG_POSTFIX d
+- NAMES clucene-shared
++ NAMES clucene clucene-core
+ PATHS ${TRIAL_LIBRARY_PATHS})
+-IF (CLUCENE_SHARED_LIBRARY)
+- MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
+-ENDIF (CLUCENE_SHARED_LIBRARY)
+-
+-IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
+- SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
+-ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
+-
++IF (CLUCENE_LIBRARY)
++ MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
++ENDIF (CLUCENE_LIBRARY)
+ FIND_PATH(CLUCENE_INCLUDE_DIR
+ NAMES CLucene.h
+ PATHS ${TRIAL_INCLUDE_PATHS})
+@@ -83,39 +59,35 @@ ENDIF(WIN32)
+
+ SET(CLUCENE_GOOD_VERSION TRUE)
+
++GET_FILENAME_COMPONENT(_CLUCENE_LIBDIR ${CLUCENE_LIBRARY} PATH)
+ FIND_PATH(CLUCENE_LIBRARY_DIR
+- NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
+- PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
++ NAMES CLucene/clucene-config.h PATHS ${CLUCENE_INCLUDE_DIR} ${_CLUCENE_LIBDIR} NO_DEFAULT_PATH)
+ IF (CLUCENE_LIBRARY_DIR)
+ MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
+- # include CLuceneConfig/CLuceneConfig.cmake
+- IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+- INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+- ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+- # include CLucene/CLuceneConfig.cmake
+- IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+- INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+- ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+- IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+- MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+- SET(CLUCENE_GOOD_VERSION FALSE)
+- ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+- IF (CLUCENE_VERSION STREQUAL "0.9.17")
+- MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+- SET(CLUCENE_GOOD_VERSION FALSE)
+- ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
++ FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
++ STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
++ IF (CLMATCH)
++ STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
++ IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
++ MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
++ SET(CLUCENE_GOOD_VERSION FALSE)
++ ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
++ IF (CLUCENE_VERSION STREQUAL "0.9.17")
++ MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
++ SET(CLUCENE_GOOD_VERSION FALSE)
++ ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
++ ENDIF (CLMATCH)
++ELSE (CLUCENE_LIBRARY_DIR)
++ MESSAGE(STATUS "CLucene library dir not found.")
+ ENDIF (CLUCENE_LIBRARY_DIR)
+
+-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
++IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+ SET(CLucene_FOUND TRUE)
+- SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
+-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+-
+-ENDIF(CLUCENEUNSTABLE_FOUND)
++ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+
+ IF(CLucene_FOUND)
+ IF(NOT CLucene_FIND_QUIETLY)
+- MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
++ MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
+ ENDIF(NOT CLucene_FIND_QUIETLY)
+ ELSE(CLucene_FOUND)
+ IF(CLucene_FIND_REQUIRED)
+@@ -124,8 +96,7 @@ ELSE(CLucene_FOUND)
+ ENDIF(CLucene_FOUND)
+
+ MARK_AS_ADVANCED(
+- CLUCENE_INCLUDE_DIRS
+- CLUCENE_INCLUDE_DIR
+- CLUCENE_LIBRARY_DIR
+- CLUCENE_LIBRARIES
++ CLUCENE_INCLUDE_DIR
++ CLUCENE_LIBRARY_DIR
++ CLUCENE_LIBRARY
+ )
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index ace7438..82c587b 100644
+--- a/src/libtomahawk/CMakeLists.txt
++++ b/src/libtomahawk/CMakeLists.txt
+@@ -645,7 +645,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
+ ${QJSON_LIBRARIES}
+ ${PHONON_LIBS}
+ ${TAGLIB_LIBRARIES}
+- ${CLUCENE_LIBRARIES}
++ ${CLUCENE_LIBRARY}
+ ${LIBECHONEST_LIBRARY}
+ ${QT_QTUITOOLS_LIBRARY}
+ ${QT_LIBRARIES}
+--
+1.7.8.rc3
+
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..d1f30bb
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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[gstreamer]
+ 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-clucene.patch"
+ "${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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/files/, media-sound/tomahawk/
@ 2011-11-24 21:31 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2011-11-24 21:31 UTC (permalink / raw
To: gentoo-commits
commit: fa8acb3377c1ef49e89b724d6283f0de446198a6
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Nov 24 21:31:10 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 21:31:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fa8acb33
[media-sound/tomahawk] Moved to main tree
---
media-sound/tomahawk/ChangeLog | 13 --
.../tomahawk/files/tomahawk-0.3.2-clucene.patch | 184 --------------------
.../files/tomahawk-0.3.2-remove-quazip.patch | 35 ----
media-sound/tomahawk/metadata.xml | 9 -
media-sound/tomahawk/tomahawk-0.3.2.ebuild | 86 ---------
media-sound/tomahawk/tomahawk-9999.ebuild | 86 ---------
6 files changed, 0 insertions(+), 413 deletions(-)
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
deleted file mode 100644
index 3d551d6..0000000
--- a/media-sound/tomahawk/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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.1 2011/11/12 19:22:24 dilfridge Exp $
-
-*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-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch
deleted file mode 100644
index 4f8aa43..0000000
--- a/media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 01d13bec7a3cd33bb815968012d1f00c7eb3e700 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gmx.de>
-Date: Thu, 24 Nov 2011 15:10:41 +0100
-Subject: [PATCH] Patch clucene
-
----
- CMakeModules/FindCLucene.cmake | 97 ++++++++++++++--------------------------
- src/libtomahawk/CMakeLists.txt | 2 +-
- 2 files changed, 35 insertions(+), 64 deletions(-)
-
-diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake
-index 1d5e8d9..906afcc 100644
---- a/CMakeModules/FindCLucene.cmake
-+++ b/CMakeModules/FindCLucene.cmake
-@@ -2,10 +2,9 @@
- # This module looks for clucene (http://clucene.sf.net) support
- # It will define the following values
- #
--# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
- # CLUCENE_INCLUDE_DIR = where CLucene/StdHeader.h can be found
- # CLUCENE_LIBRARY_DIR = where CLucene/clucene-config.h can be found
--# CLUCENE_LIBRARIES = the libraries to link against CLucene
-+# CLUCENE_LIBRARY = the library to link against CLucene
- # CLUCENE_VERSION = The CLucene version string
- # CLucene_FOUND = set to 1 if clucene is found
- #
-@@ -13,21 +12,9 @@
- INCLUDE(CheckSymbolExists)
- INCLUDE(FindLibraryWithDebug)
-
--# try to locate a patched unstable version (for comp's sake *sigh*) first
--FIND_PACKAGE(CLuceneUnstable)
--IF(CLUCENEUNSTABLE_FOUND)
-- SET(CLucene_FOUND TRUE)
-- SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
-- SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
-- SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
--
-- #MESSAGE(FATAL_ERROR NARF)
--ELSE(CLUCENEUNSTABLE_FOUND)
--IF(CLucene_FIND_VERSION)
-- SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
--ELSEIF()
-- SET(CLUCENE_MIN_VERSION "0.9.23")
--ENDIF(CLucene_FIND_VERSION)
-+if(NOT CLUCENE_MIN_VERSION)
-+ set(CLUCENE_MIN_VERSION "0.9.19")
-+endif(NOT CLUCENE_MIN_VERSION)
-
- IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
- INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
-@@ -36,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
- SET(TRIAL_LIBRARY_PATHS
- $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
- ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-+ ${CMAKE_LIBRARY_PATH}
- /usr/local/lib${LIB_SUFFIX}
-+ /opt/local/lib${LIB_SUFFIX}
- /usr/lib${LIB_SUFFIX}
- /sw/lib${LIB_SUFFIX}
- /usr/pkg/lib${LIB_SUFFIX}
-- /usr/lib64
- )
- SET(TRIAL_INCLUDE_PATHS
- $ENV{CLUCENE_HOME}/include
-@@ -50,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
- /sw/include
- /usr/pkg/include
- )
--FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
-- WIN32_DEBUG_POSTFIX d
-- NAMES clucene-core
-- PATHS ${TRIAL_LIBRARY_PATHS})
--IF (CLUCENE_CORE_LIBRARY)
-- MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
--ENDIF (CLUCENE_CORE_LIBRARY)
--FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
-+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
- WIN32_DEBUG_POSTFIX d
-- NAMES clucene-shared
-+ NAMES clucene clucene-core
- PATHS ${TRIAL_LIBRARY_PATHS})
--IF (CLUCENE_SHARED_LIBRARY)
-- MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
--ENDIF (CLUCENE_SHARED_LIBRARY)
--
--IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
-- SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
--ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
--
-+IF (CLUCENE_LIBRARY)
-+ MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
-+ENDIF (CLUCENE_LIBRARY)
- FIND_PATH(CLUCENE_INCLUDE_DIR
- NAMES CLucene.h
- PATHS ${TRIAL_INCLUDE_PATHS})
-@@ -83,39 +59,35 @@ ENDIF(WIN32)
-
- SET(CLUCENE_GOOD_VERSION TRUE)
-
-+GET_FILENAME_COMPONENT(_CLUCENE_LIBDIR ${CLUCENE_LIBRARY} PATH)
- FIND_PATH(CLUCENE_LIBRARY_DIR
-- NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
-- PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
-+ NAMES CLucene/clucene-config.h PATHS ${CLUCENE_INCLUDE_DIR} ${_CLUCENE_LIBDIR} NO_DEFAULT_PATH)
- IF (CLUCENE_LIBRARY_DIR)
- MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
-- # include CLuceneConfig/CLuceneConfig.cmake
-- IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-- INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-- ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-- # include CLucene/CLuceneConfig.cmake
-- IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-- INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-- ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-- IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-- MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-- SET(CLUCENE_GOOD_VERSION FALSE)
-- ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-- IF (CLUCENE_VERSION STREQUAL "0.9.17")
-- MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-- SET(CLUCENE_GOOD_VERSION FALSE)
-- ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-+ FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
-+ STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
-+ IF (CLMATCH)
-+ STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
-+ IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-+ MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-+ SET(CLUCENE_GOOD_VERSION FALSE)
-+ ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-+ IF (CLUCENE_VERSION STREQUAL "0.9.17")
-+ MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-+ SET(CLUCENE_GOOD_VERSION FALSE)
-+ ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-+ ENDIF (CLMATCH)
-+ELSE (CLUCENE_LIBRARY_DIR)
-+ MESSAGE(STATUS "CLucene library dir not found.")
- ENDIF (CLUCENE_LIBRARY_DIR)
-
--IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-+IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
- SET(CLucene_FOUND TRUE)
-- SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
--ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
--
--ENDIF(CLUCENEUNSTABLE_FOUND)
-+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-
- IF(CLucene_FOUND)
- IF(NOT CLucene_FIND_QUIETLY)
-- MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
-+ MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
- ENDIF(NOT CLucene_FIND_QUIETLY)
- ELSE(CLucene_FOUND)
- IF(CLucene_FIND_REQUIRED)
-@@ -124,8 +96,7 @@ ELSE(CLucene_FOUND)
- ENDIF(CLucene_FOUND)
-
- MARK_AS_ADVANCED(
-- CLUCENE_INCLUDE_DIRS
-- CLUCENE_INCLUDE_DIR
-- CLUCENE_LIBRARY_DIR
-- CLUCENE_LIBRARIES
-+ CLUCENE_INCLUDE_DIR
-+ CLUCENE_LIBRARY_DIR
-+ CLUCENE_LIBRARY
- )
-diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
-index ace7438..82c587b 100644
---- a/src/libtomahawk/CMakeLists.txt
-+++ b/src/libtomahawk/CMakeLists.txt
-@@ -645,7 +645,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
- ${QJSON_LIBRARIES}
- ${PHONON_LIBS}
- ${TAGLIB_LIBRARIES}
-- ${CLUCENE_LIBRARIES}
-+ ${CLUCENE_LIBRARY}
- ${LIBECHONEST_LIBRARY}
- ${QT_QTUITOOLS_LIBRARY}
- ${QT_LIBRARIES}
---
-1.7.8.rc3
-
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 c2ffca0..0000000
--- 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
deleted file mode 100644
index a841699..0000000
--- a/media-sound/tomahawk/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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-0.3.2.ebuild b/media-sound/tomahawk/tomahawk-0.3.2.ebuild
deleted file mode 100644
index d1f30bb..0000000
--- a/media-sound/tomahawk/tomahawk-0.3.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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[gstreamer]
- 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-clucene.patch"
- "${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
-}
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
deleted file mode 100644
index d1f30bb..0000000
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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[gstreamer]
- 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-clucene.patch"
- "${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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-24 21:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24 14:41 [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/files/, media-sound/tomahawk/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2011-11-24 21:31 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox