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

[Johannes Huber]

commit:     1eab3f0a43e6d0765ecc442408b022a77d5c04b9
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Fri Nov  4 14:06:30 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Nov  4 14:06:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1eab3f0a

[media-sound/tomahawk] Fix configure in live

(Portage version: 2.2.0_alpha72/git/Linux x86_64, signed Manifest commit with key DF018462)

---
 ...-clucene.patch => tomahawk-0.2.3-clucene.patch} |    0
 ...k-clucene.patch => tomahawk-9999-clucene.patch} |   45 ++++++++++++--------
 media-sound/tomahawk/tomahawk-0.2.3.ebuild         |    2 +-
 media-sound/tomahawk/tomahawk-9999.ebuild          |    2 +-
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/media-sound/tomahawk/files/tomahawk-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.2.3-clucene.patch
similarity index 100%
copy from media-sound/tomahawk/files/tomahawk-clucene.patch
copy to media-sound/tomahawk/files/tomahawk-0.2.3-clucene.patch

diff --git a/media-sound/tomahawk/files/tomahawk-clucene.patch b/media-sound/tomahawk/files/tomahawk-9999-clucene.patch
similarity index 82%
rename from media-sound/tomahawk/files/tomahawk-clucene.patch
rename to media-sound/tomahawk/files/tomahawk-9999-clucene.patch
index e597d4e..ff1bc0b 100644
--- a/media-sound/tomahawk/files/tomahawk-clucene.patch
+++ b/media-sound/tomahawk/files/tomahawk-9999-clucene.patch
@@ -1,6 +1,6 @@
-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
+diff -upr tomahawk.orig//CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/FindCLucene.cmake
+--- tomahawk.orig//CMakeModules/FindCLucene.cmake	2011-11-04 14:42:01.000000000 +0100
++++ tomahawk/CMakeModules/FindCLucene.cmake	2011-07-26 19:12:39.000000000 +0200
 @@ -4,7 +4,7 @@
  #
  # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
@@ -10,11 +10,19 @@ diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/Fin
  # CLUCENE_VERSION      = The CLucene version string
  # CLucene_FOUND        = set to 1 if clucene is found
  #
-@@ -12,12 +12,9 @@
+@@ -12,20 +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_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
 -
+-    #MESSAGE(FATAL_ERROR NARF)
+-ELSE(CLUCENEUNSTABLE_FOUND)
 -IF(CLucene_FIND_VERSION)
 -  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
 -ELSEIF()
@@ -26,7 +34,7 @@ diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/Fin
  
  IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
    INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
-@@ -26,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneCon
+@@ -34,11 +23,12 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneCon
  SET(TRIAL_LIBRARY_PATHS
    $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
    ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
@@ -40,23 +48,23 @@ diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/Fin
    )
  SET(TRIAL_INCLUDE_PATHS
    $ENV{CLUCENE_HOME}/include
-@@ -40,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
+@@ -48,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
    /sw/include
    /usr/pkg/include
    )
 -FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
--  WIN32_DEBUG_POSTFIX d
++FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+   WIN32_DEBUG_POSTFIX d
 -  NAMES clucene-core
--  PATHS ${TRIAL_LIBRARY_PATHS})
++  NAMES clucene 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
+-  WIN32_DEBUG_POSTFIX d
 -  NAMES clucene-shared
-+  NAMES clucene clucene-core
-   PATHS ${TRIAL_LIBRARY_PATHS})
+-  PATHS ${TRIAL_LIBRARY_PATHS})
 -IF (CLUCENE_SHARED_LIBRARY)
 -  MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
 -ENDIF (CLUCENE_SHARED_LIBRARY)
@@ -71,7 +79,7 @@ diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/Fin
  FIND_PATH(CLUCENE_INCLUDE_DIR
    NAMES CLucene.h
    PATHS ${TRIAL_INCLUDE_PATHS})
-@@ -73,36 +59,35 @@ ENDIF(WIN32)
+@@ -81,37 +59,35 @@ ENDIF(WIN32)
  
  SET(CLUCENE_GOOD_VERSION TRUE)
  
@@ -119,6 +127,7 @@ diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/Fin
 +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(CLUCENEUNSTABLE_FOUND)
 +ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
  
  IF(CLucene_FOUND)
@@ -128,17 +137,17 @@ diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeModules/Fin
    ENDIF(NOT CLucene_FIND_QUIETLY)
  ELSE(CLucene_FOUND)
    IF(CLucene_FIND_REQUIRED)
-@@ -113,5 +98,5 @@ ENDIF(CLucene_FOUND)
+@@ -122,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
+diff -upr tomahawk.orig//src/libtomahawk/CMakeLists.txt tomahawk/src/libtomahawk/CMakeLists.txt
+--- tomahawk.orig//src/libtomahawk/CMakeLists.txt	2011-11-04 14:41:57.000000000 +0100
++++ tomahawk/src/libtomahawk/CMakeLists.txt	2011-11-04 14:53:44.000000000 +0100
+@@ -612,7 +612,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
      ${QJSON_LIBRARIES}
      ${PHONON_LIBS}
      ${TAGLIB_LIBRARIES}

diff --git a/media-sound/tomahawk/tomahawk-0.2.3.ebuild b/media-sound/tomahawk/tomahawk-0.2.3.ebuild
index 7106f70..b83a4a8 100644
--- a/media-sound/tomahawk/tomahawk-0.2.3.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.2.3.ebuild
@@ -50,7 +50,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-clucene.patch"
+	"${FILESDIR}/${P}-clucene.patch"
 )
 
 src_configure() {

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index f257cb4..762a032 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-clucene.patch"
+	"${FILESDIR}/${P}-clucene.patch"
 )
 
 src_configure() {