From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QuR8n-0000ox-Qa for garchives@archives.gentoo.org; Fri, 19 Aug 2011 15:37:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EA8A21C0B6; Fri, 19 Aug 2011 15:37:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4F2F21C09F for ; Fri, 19 Aug 2011 15:37:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DA3B1B408B for ; Fri, 19 Aug 2011 15:37:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 25E0880052 for ; Fri, 19 Aug 2011 15:37:37 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <34931fff5fdbffe5f62502bfed5cd23bb4931934.j0hu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/ X-VCS-Repository: proj/kde X-VCS-Files: media-sound/tomahawk/files/tomahawk-9999-clucene.patch media-sound/tomahawk/metadata.xml media-sound/tomahawk/tomahawk-9999.ebuild X-VCS-Directories: media-sound/tomahawk/ media-sound/tomahawk/files/ X-VCS-Committer: j0hu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 34931fff5fdbffe5f62502bfed5cd23bb4931934 Date: Fri, 19 Aug 2011 15:37:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3178caf2ddbfa106711c8b519832a6b4 commit: 34931fff5fdbffe5f62502bfed5cd23bb4931934 Author: Johannes Huber gmx de> AuthorDate: Fri Aug 19 13:35:33 2011 +0000 Commit: Johannes Huber gmx de> CommitDate: Fri Aug 19 13:35:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D34931fff [media-sound/tomahawk] New ebuild, bug 379385 --- .../tomahawk/files/tomahawk-9999-clucene.patch | 149 ++++++++++++++= ++++++ media-sound/tomahawk/metadata.xml | 5 + media-sound/tomahawk/tomahawk-9999.ebuild | 80 +++++++++++ 3 files changed, 234 insertions(+), 0 deletions(-) diff --git a/media-sound/tomahawk/files/tomahawk-9999-clucene.patch b/med= ia-sound/tomahawk/files/tomahawk-9999-clucene.patch new file mode 100644 index 0000000..e597d4e --- /dev/null +++ b/media-sound/tomahawk/files/tomahawk-9999-clucene.patch @@ -0,0 +1,149 @@ +diff -upr tomahawk.orig/CMakeModules/FindCLucene.cmake tomahawk/CMakeMod= ules/FindCLucene.cmake +--- tomahawk.orig/CMakeModules/FindCLucene.cmake 2011-08-18 23:12:23.000= 000000 +0200 ++++ tomahawk/CMakeModules/FindCLucene.cmake 2011-06-02 11:29:26.00000000= 0 +0200 +@@ -4,7 +4,7 @@ + # + # CLUCENE_INCLUDE_DIR =3D where CLucene/StdHeader.h can be found + # CLUCENE_LIBRARY_DIR =3D where CLucene/clucene-config.h can be found +-# CLUCENE_LIBRARIES =3D the libraries to link against CLucene ++# CLUCENE_LIBRARY =3D the library to link against CLucene + # CLUCENE_VERSION =3D The CLucene version string + # CLucene_FOUND =3D set to 1 if clucene is found + # +@@ -12,12 +12,9 @@ + INCLUDE(CheckSymbolExists) + INCLUDE(FindLibraryWithDebug) +=20 +- +-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) +=20 + 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_LIBRAR= Y}") +-ENDIF (CLUCENE_SHARED_LIBRARY) +- +-IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY) +- SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRAR= Y}) +-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) +=20 + SET(CLUCENE_GOOD_VERSION TRUE) +=20 ++GET_FILENAME_COMPONENT(_CLUCENE_LIBDIR ${CLUCENE_LIBRARY} PATH) + FIND_PATH(CLUCENE_LIBRARY_DIR +- NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cm= ake +- PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_= PATH) ++ NAMES CLucene/clucene-config.h PATHS ${CLUCENE_INCLUDE_DIR} ${_CLUCEN= E_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.cm= ake) +- INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfi= g.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) +=20 +-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AN= D 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 A= ND CLUCENE_GOOD_VERSION) +=20 + IF(CLucene_FOUND) + IF(NOT CLucene_FIND_QUIETLY) +- MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCE= NE_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=20 + CLUCENE_LIBRARY_DIR=20 +- CLUCENE_LIBRARIES ++ CLUCENE_LIBRARY=20 + ) +diff -upr tomahawk.orig/src/libtomahawk/CMakeLists.txt tomahawk/src/libt= omahawk/CMakeLists.txt +--- tomahawk.orig/src/libtomahawk/CMakeLists.txt 2011-08-18 23:12:23.000= 000000 +0200 ++++ tomahawk/src/libtomahawk/CMakeLists.txt 2011-08-19 13:21:40.00000000= 0 +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/metadata.xml b/media-sound/tomahawk/met= adata.xml new file mode 100644 index 0000000..8d1e86a --- /dev/null +++ b/media-sound/tomahawk/metadata.xml @@ -0,0 +1,5 @@ + + + +kde + diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/toma= hawk/tomahawk-9999.ebuild new file mode 100644 index 0000000..fb24449 --- /dev/null +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D4 + +QT_MINIMAL=3D"4.7.0" + +if [[ ${PV} !=3D *9999* ]]; then + SRC_URI=3D"http://download.tomahawk-player.org/${P}.tar.bz2" + KEYWORDS=3D"~amd64 ~x86" +else + GIT_ECLASS=3D"git-2" + EGIT_REPO_URI=3D"git://github.com/tomahawk-player/tomahawk.git" + KEYWORDS=3D"" +fi + +inherit cmake-utils qt4-r2 ${GIT_ECLASS} + +DESCRIPTION=3D"Qt playdar social music player." +HOMEPAGE=3D"http://tomahawk-player.org/" + +LICENSE=3D"GPL-3 BSD" +SLOT=3D"0" +IUSE=3D"debug fftw libsamplerate" + +# Broken -X (Headless mode) by upstream +# X? ( +# >=3Dx11-libs/qt-gui-${QT_MINIMAL}:4 +# >=3Dx11-libs/qt-webkit-${QT_MINIMAL}:4 +#) + +DEPEND=3D" + >=3Ddev-cpp/clucene-2.3.3.4 + >=3Ddev-libs/boost-1.41 + >=3Ddev-libs/qjson-0.7.1 + >=3Dmedia-libs/libechonest-1.1.8 + media-libs/phonon + media-libs/taglib + net-libs/jreen + net-libs/qtweetlib + >=3Dx11-libs/qt-core-${QT_MINIMAL}:4 + >=3Dx11-libs/qt-gui-${QT_MINIMAL}:4 + >=3Dx11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] + >=3Dx11-libs/qt-webkit-${QT_MINIMAL}:4 + >=3Dx11-libs/qt-xmlpatterns-${QT_MINIMAL}:4 + fftw? ( sci-libs/fftw:3.0 ) + libsamplerate? ( media-libs/libsamplerate ) +" +RDEPEND=3D"${DEPEND}" + +PATCHES=3D( + "${FILESDIR}/${P}-clucene.patch" +) + +src_configure() { + mycmakeargs=3D( + -DINTERNAL_JREEN=3DOFF + -DINTERNAL_QTWEETLIB=3DOFF + ) + cmake-utils_src_configure +} + +src_compile() { + # with as-needed compile will fail + append-ldflags $(no-as-needed) + + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install +} + +pkg_postinst() { + echo + elog "Information on how to get more resolvers for ${PN}" + elog "is available at ${HOMEPAGE}resolvers" + echo +}