diff options
| -rw-r--r-- | media-sound/tomahawk/Manifest | 2 | ||||
| -rw-r--r-- | media-sound/tomahawk/files/tomahawk-0.2.3-clucene.patch | 149 | ||||
| -rw-r--r-- | media-sound/tomahawk/tomahawk-0.3.0.ebuild (renamed from media-sound/tomahawk/tomahawk-0.2.3.ebuild) | 34 |
3 files changed, 20 insertions, 165 deletions
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest index 8c1d46dc564..d3f4136ee39 100644 --- a/media-sound/tomahawk/Manifest +++ b/media-sound/tomahawk/Manifest @@ -1 +1 @@ -DIST tomahawk-0.2.3.tar.bz2 1191555 SHA256 5304b5e07295e9a0216af432c5b828b15848655a5972bf7bec59f539ffaa244e SHA512 e97f9cd992197f0ea838e54dd66dc4f833de49a04b194cd92025515579647dbf69c942f1054b2f86dc01eac194c0cab9f7c62ddb80f8d89d3cb6f9ec00b56af8 WHIRLPOOL ee026cb35ccd4f9ab657b45ade7763a62b4fc54dddaa2d3fc1a66973b75e6381c23b0986bfe42e08b0255d0dfeb0d652be59f0ba3858ed2e177e6767252328ef +DIST tomahawk-0.3.0.tar.bz2 4602076 SHA256 207c27ae7d5a6735911587b07d38af0e84a76082b211e7fbf245de323e1cee6f SHA512 3473eae856f112c59b4530833ca85898690e19abe922c658665a51a44dae0e1bd3796af1d75dfebec222e38dd9be6f4886aeb622efff72f44b3bd16a6f9ef00e WHIRLPOOL f9f9661b5351f12236edc3205b6d49c7db5f6df6bdcb584366db21d3549d83abf3399560e5d91ae18c1c93e86802af508df5e902e7e180d9831133dd07a72bfa diff --git a/media-sound/tomahawk/files/tomahawk-0.2.3-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.2.3-clucene.patch deleted file mode 100644 index e597d4e2d99..00000000000 --- a/media-sound/tomahawk/files/tomahawk-0.2.3-clucene.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/FindCLucene.cmake ---- tomahawk.orig/CMakeModules/FindCLucene.cmake 2011-08-18 23:12:23.000000000 +0200 -+++ tomahawk/CMakeModules/FindCLucene.cmake 2011-06-02 11:29:26.000000000 +0200 -@@ -4,7 +4,7 @@ - # - # 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 - # -@@ -12,12 +12,9 @@ - INCLUDE(CheckSymbolExists) - INCLUDE(FindLibraryWithDebug) - -- --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) -@@ -26,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneCon - 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 -@@ -40,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}) -@@ -73,36 +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) --ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) -+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) -@@ -113,5 +98,5 @@ ENDIF(CLucene_FOUND) - MARK_AS_ADVANCED( - CLUCENE_INCLUDE_DIR - CLUCENE_LIBRARY_DIR -- CLUCENE_LIBRARIES -+ CLUCENE_LIBRARY - ) -diff -upr tomahawk.orig/src/libtomahawk/CMakeLists.txt tomahawk/src/libtomahawk/CMakeLists.txt ---- tomahawk.orig/src/libtomahawk/CMakeLists.txt 2011-08-18 23:12:23.000000000 +0200 -+++ tomahawk/src/libtomahawk/CMakeLists.txt 2011-08-19 13:21:40.000000000 +0200 -@@ -490,7 +490,7 @@ target_link_libraries( tomahawklib - ${QJSON_LIBRARIES} - ${PHONON_LIBS} - ${TAGLIB_LIBRARIES} -- ${CLUCENE_LIBRARIES} -+ ${CLUCENE_LIBRARY} - ${LIBECHONEST_LIBRARY} - ${QT_QTUITOOLS_LIBRARY} - ${QT_LIBRARIES} diff --git a/media-sound/tomahawk/tomahawk-0.2.3.ebuild b/media-sound/tomahawk/tomahawk-0.3.0.ebuild index b83a4a83ca3..a37781f492a 100644 --- a/media-sound/tomahawk/tomahawk-0.2.3.ebuild +++ b/media-sound/tomahawk/tomahawk-0.3.0.ebuild @@ -22,41 +22,43 @@ HOMEPAGE="http://tomahawk-player.org/" LICENSE="GPL-3 BSD" SLOT="0" -IUSE="debug fftw libsamplerate" - -# Broken -X (Headless mode) by upstream -# X? ( -# >=x11-libs/qt-gui-${QT_MINIMAL}:4 -# >=x11-libs/qt-webkit-${QT_MINIMAL}:4 -#) +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.8 + >=media-libs/libechonest-1.1.10 >=media-libs/phonon-4.5.0 media-libs/taglib - net-libs/jreen - net-libs/qtweetlib >=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}/${P}-clucene.patch" + "${FILESDIR}/${P}-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 - -DINTERNAL_QTWEETLIB=OFF ) if [[ ${PV} != *9999* ]]; then @@ -75,8 +77,10 @@ src_install() { } pkg_postinst() { - echo - elog "Information on how to get more resolvers for ${PN}" - elog "is available at ${HOMEPAGE}resolvers" - echo + if ! use resolver; then + echo + elog "Information on how to get more resolvers for ${PN}" + elog "is available at ${HOMEPAGE}resolvers" + echo + fi } |