[gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

["Johannes Huber" <johu@gmx.de>]

commit:     1e29d340de42625a43d68cac50482cc49c879af7
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Thu Nov 10 15:35:51 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Thu Nov 10 15:35:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1e29d340

[media-sound/tomahawk] Bump 0.3.0. Remove old.

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

---
 .../tomahawk/files/tomahawk-0.2.3-clucene.patch    |  149 --------------------
 ...tomahawk-0.2.3.ebuild => tomahawk-0.3.0.ebuild} |   34 +++--
 2 files changed, 19 insertions(+), 164 deletions(-)

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 e597d4e..0000000
--- 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
similarity index 68%
rename from media-sound/tomahawk/tomahawk-0.2.3.ebuild
rename to media-sound/tomahawk/tomahawk-0.3.0.ebuild
index b83a4a8..a37781f 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
 }