From 7b5c354a74812a19a61f1fd6c3be2f2ebc54e30f Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Thu, 8 Dec 2011 13:07:27 +0000 Subject: [PATCH] Removed not needed patch anymore. Cause was bug #361385 Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- media-sound/tomahawk/ChangeLog | 7 +- media-sound/tomahawk/Manifest | 21 +- .../files/tomahawk-0.3.2-clucene.patch | 184 ------------------ media-sound/tomahawk/tomahawk-0.3.3.ebuild | 3 +- media-sound/tomahawk/tomahawk-9999.ebuild | 3 +- 5 files changed, 18 insertions(+), 200 deletions(-) delete mode 100644 media-sound/tomahawk/files/tomahawk-0.3.2-clucene.patch diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog index f921f0327ca2..22185847d11e 100644 --- a/media-sound/tomahawk/ChangeLog +++ b/media-sound/tomahawk/ChangeLog @@ -1,6 +1,11 @@ # 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.4 2011/12/08 00:58:58 johu Exp $ +# $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 + -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) diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest index 82c5f5fdaff2..084b4b4c4f8f 100644 --- a/media-sound/tomahawk/Manifest +++ b/media-sound/tomahawk/Manifest @@ -1,21 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX tomahawk-0.3.2-clucene.patch 7222 RMD160 e0cb86c699dc87eb2322fff662460aa73325fa51 SHA1 f9bd4c01530c9f7c7ba7ffc19ff2e9abd4ad3eda SHA256 0a14d2e1140cc24cbe9f01ca4d5b37cfa49d32861649814298be46285874d383 AUX tomahawk-0.3.2-remove-quazip.patch 1567 RMD160 81a5a5582b8bdccc2e6fcbe29142e78a7c3e77b5 SHA1 767af98d128241dae690997e99d442c3eb5ff38f SHA256 0d0aa71ba4445459d40647265db547de655027efb29baec2a657cd94fe8c05f5 DIST tomahawk-0.3.3.tar.bz2 4651817 RMD160 d8eae3c37e2915904a096e0ef64e488ff9fec8bf SHA1 e83bbac581daad8a21c639e4ed68e1499a07ac73 SHA256 a69c68e688469aedace8665f5c882c614338d23cf24697ca3284e048fdce7c51 -EBUILD tomahawk-0.3.3.ebuild 1955 RMD160 971919f175d26cb9074da295428da37ac5c033f5 SHA1 bbf2285c00ef514db69d038790697db5352b8237 SHA256 581d4adb479029b53acdeb5b49034455a1e31e3a225bd44cd7be37adbe5bac6f -EBUILD tomahawk-9999.ebuild 1959 RMD160 a1500d96ab45eab0477fa5a4e588f9d3b0647ba3 SHA1 077e9b0dd6de48c8548ac6ca92b699932851940f SHA256 3e39bc85526110a3a34050b8e593c2735e04cea4cff98872bd01685fc6285e88 -MISC ChangeLog 1227 RMD160 7a92b3e06806aae09aaaa303a35fabf5b6e98299 SHA1 8e29562db886311a0b61939f168464e143a23164 SHA256 0b50843d4de5241d94e9d43a28dffee4285d49a7f6357cc8b0965ef01d71e175 +EBUILD tomahawk-0.3.3.ebuild 1914 RMD160 734427c9600a4d5cdd0a2d6de6519b0b0c5c88d8 SHA1 9eddf699c6041cdbf73bb4ef03573acca05c61f6 SHA256 fe1bc1b197ca0a08df41a95df8311ebc7c0b669edfe5bd9b9133328131920d54 +EBUILD tomahawk-9999.ebuild 1913 RMD160 faf22d04fb0b8e3604e2efad614dace0997ee2db SHA1 0edfc958b0fa155810952b549b105f6447d862a2 SHA256 c30892e29b0e7dabda5664aab86f9e732899958dfe056edda73bab689b2d517c +MISC ChangeLog 1420 RMD160 f258dd0b8814dc6a04db19bfa46e655b9e7a5567 SHA1 ebeee344a624d34aa4ff47d2159943db12a3a118 SHA256 79c3dbbcd83f1da7b080a04748a87c6849d6de552eeb7dbebb27e039abc64419 MISC metadata.xml 298 RMD160 87c06873e5ec06e5e2528503bc85bc99eacca2df SHA1 5c14d05b4ecc4948a82e05309d5d31e3e4b81c5f SHA256 b31850559d4e1b20c5d22d66fef82e1825af3e22386b6161fa436ad5931bf0df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO4AxFAAoJEO+t9ga+3I3aAlcH/iZawt1NSlyUghD7Ibzpybx4 -n5e3W+3EEyHyj1/UpwqcWdLHB34+kFZcnJ2V3osZcDPpWACQFluo4KTK2Dov0WO8 -cZDeYynKrVrdGBdY3rmudIi3oz6kPTpdSNl61VWek+URi34K74ICwP2D6q7Wtsiz -5oyM3BxbQOL1lfiLGfEypibACFXscUApXXurnP7rX3FbcNCsy1iKsiV4WSOvxPAj -8J8h/4XuMBkYt0+u/TnWGzeTMvCVfkSvumvSUnATt0YnQAaGp37A1WcFDheWP8sj -VL3v3B7wtrfea7bB6rPwGnDaUxK827N86cf2g9JZF+lG8/QuXYEz/rRysuUchm8= -=ZWAS +iQEcBAEBCgAGBQJO4LaVAAoJEO+t9ga+3I3a2k4H/1ifCv8DdLsLb0D2qWNcVrrf +p9/Yz5cMRrOOHUhdbG+aXruSaYRrOKyrHseEzMJAtex2sxn7t0jJpBC5tAkE6NHf +tkIJTtE69zM+jhbvVjjq/LxG0vdHctop6ZyHsUQG5Pe0tB1nojmH8DeH4CKEfksV +BNpWsf977bfGMX8XwNE1hUDC1zIK2yvcy5yGR8li8Z5LYuyzM8DVmQ6oHQVpxV9s +vTaol893wlzdsMbg4H+Ez3Su4Fb7M5WfZr6wzy0LDBS1XohUbctabLptUkPDXevn +flxMJh4oN/CSJ6tnAezchvPSydFPOHeGknmQrCUt5j0Eun0oLBXqIUw2gbcaFW8= +=dxCl -----END PGP SIGNATURE----- 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 4f8aa4311394..000000000000 --- 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 -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/tomahawk-0.3.3.ebuild b/media-sound/tomahawk/tomahawk-0.3.3.ebuild index 7798156e57ca..37c6f28f18a2 100644 --- a/media-sound/tomahawk/tomahawk-0.3.3.ebuild +++ b/media-sound/tomahawk/tomahawk-0.3.3.ebuild @@ -1,6 +1,6 @@ # 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-0.3.3.ebuild,v 1.1 2011/12/08 00:58:58 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.3.3.ebuild,v 1.2 2011/12/08 13:07:27 johu Exp $ EAPI=4 @@ -48,7 +48,6 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.3.2-clucene.patch" "${FILESDIR}/${PN}-0.3.2-remove-quazip.patch" ) diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild index 1b339ebe3e25..1a5f0ece1713 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -1,6 +1,6 @@ # 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.3 2011/12/01 22:18:34 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.4 2011/12/08 13:07:27 johu Exp $ EAPI=4 @@ -48,7 +48,6 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-0.3.2-clucene.patch" "${FILESDIR}/${PN}-0.3.2-remove-quazip.patch" ) -- 2.26.2