public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2011-08-19 15:37 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2011-08-19 15:37 UTC (permalink / raw
  To: gentoo-commits

commit:     34931fff5fdbffe5f62502bfed5cd23bb4931934
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Fri Aug 19 13:35:33 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Aug 19 13:35:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=34931fff

[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/media-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/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/metadata.xml b/media-sound/tomahawk/metadata.xml
new file mode 100644
index 0000000..8d1e86a
--- /dev/null
+++ b/media-sound/tomahawk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/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=4
+
+QT_MINIMAL="4.7.0"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-2"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils qt4-r2 ${GIT_ECLASS}
+
+DESCRIPTION="Qt playdar social music player."
+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
+#)
+
+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/phonon
+	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 )
+	libsamplerate? ( media-libs/libsamplerate )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-clucene.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DINTERNAL_JREEN=OFF
+		-DINTERNAL_QTWEETLIB=OFF
+	)
+	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
+}



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2011-08-23 14:49 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 6+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-08-23 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     ec0672bbdd514f8660963fb794b9175297fdb515
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 14:48:04 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 14:48:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ec0672bb

Added 0.2.2 release. Synced 0.2.2 and 9999 ebuilds.
Removed the jreen and qtweetlib bundled libs. Build as release for release ebuilds. Dropped the --as-needed sed as it works here.
Thanks to Elias Probst (eliasp) for the original ebuilds.

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

---
 ...k-9999-clucene.patch => tomahawk-clucene.patch} |    0
 ...{tomahawk-9999.ebuild => tomahawk-0.2.2.ebuild} |   12 +++++++-----
 media-sound/tomahawk/tomahawk-9999.ebuild          |   12 +++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-0.2.2.ebuild
similarity index 91%
copy from media-sound/tomahawk/tomahawk-9999.ebuild
copy to media-sound/tomahawk/tomahawk-0.2.2.ebuild
index fb24449..7106f70 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.2.2.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	>=dev-libs/boost-1.41
 	>=dev-libs/qjson-0.7.1
 	>=media-libs/libechonest-1.1.8
-	media-libs/phonon
+	>=media-libs/phonon-4.5.0
 	media-libs/taglib
 	net-libs/jreen
 	net-libs/qtweetlib
@@ -50,7 +50,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-clucene.patch"
+	"${FILESDIR}/${PN}-clucene.patch"
 )
 
 src_configure() {
@@ -58,13 +58,15 @@ src_configure() {
 		-DINTERNAL_JREEN=OFF
 		-DINTERNAL_QTWEETLIB=OFF
 	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=(	-DBUILD_RELEASE=ON )
+	fi
+
 	cmake-utils_src_configure
 }
 
 src_compile() {
-	# with as-needed compile will fail
-	append-ldflags $(no-as-needed)
-
 	cmake-utils_src_compile
 }
 

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index fb24449..7106f70 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	>=dev-libs/boost-1.41
 	>=dev-libs/qjson-0.7.1
 	>=media-libs/libechonest-1.1.8
-	media-libs/phonon
+	>=media-libs/phonon-4.5.0
 	media-libs/taglib
 	net-libs/jreen
 	net-libs/qtweetlib
@@ -50,7 +50,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-clucene.patch"
+	"${FILESDIR}/${PN}-clucene.patch"
 )
 
 src_configure() {
@@ -58,13 +58,15 @@ src_configure() {
 		-DINTERNAL_JREEN=OFF
 		-DINTERNAL_QTWEETLIB=OFF
 	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=(	-DBUILD_RELEASE=ON )
+	fi
+
 	cmake-utils_src_configure
 }
 
 src_compile() {
-	# with as-needed compile will fail
-	append-ldflags $(no-as-needed)
-
 	cmake-utils_src_compile
 }
 



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2011-11-04 14:06 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2011-11-04 14:06 UTC (permalink / raw
  To: gentoo-commits

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() {



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2011-11-10 14:09 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2011-11-10 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     7372584e2f9a205d45870b47e8674afc90f8e47e
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Thu Nov 10 14:09:21 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Thu Nov 10 14:09:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7372584e

[media-sound/tomahawk] Make resolver build-in support optional

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

---
 ...-clucene.patch => tomahawk-0.3.0-clucene.patch} |    0
 .../files/tomahawk-0.3.0-remove-quazip.patch       |   21 +++++++++++++++++++
 media-sound/tomahawk/metadata.xml                  |    1 +
 media-sound/tomahawk/tomahawk-9999.ebuild          |   22 ++++++++++++++++---
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/media-sound/tomahawk/files/tomahawk-9999-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch
similarity index 100%
rename from media-sound/tomahawk/files/tomahawk-9999-clucene.patch
rename to media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch

diff --git a/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch b/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch
new file mode 100644
index 0000000..b36a2de
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch
@@ -0,0 +1,21 @@
+diff -upr tomahawk.orig//CMakeLists.txt tomahawk//CMakeLists.txt
+--- tomahawk.orig//CMakeLists.txt	2011-11-10 14:30:31.000000000 +0100
++++ tomahawk//CMakeLists.txt	2011-11-10 14:32:49.000000000 +0100
+@@ -110,17 +110,6 @@ macro_log_feature(LIBATTICA_FOUND "libat
+ macro_optional_find_package(QuaZip)
+ macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers autmatically. Will build internal copy instead." "http://quazip.sourceforge.net/" FALSE "" "")
+ 
+-IF( NOT QuaZip_FOUND )
+-    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
+-    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
+-    SET( QuaZip_LIBRARY quazip )
+-    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
+-    SET( QuaZip_FOUND true )
+-
+-    # copy headers to build/quazip so we can use proper includes inside the code
+-    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
+-ENDIF()
+-
+ # required
+ #While we distribute our own liblastfm2, don't need to look for it
+ #macro_optional_find_package(LibLastFm 0.3.3)

diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index 7ca1023..a841699 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
+	<flag name="resolver">Resolver download and installation integration</flag>
 	<flag name="twitter">Enable twitter support</flag>
 </use>
 </pkgmetadata>

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 4f20457..6d0b688 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -22,14 +22,12 @@ HOMEPAGE="http://tomahawk-player.org/"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug fftw jabber libsamplerate twitter"
+IUSE="debug fftw jabber libsamplerate +resolver twitter"
 
 DEPEND="
-	dev-libs/libattica
 	>=dev-cpp/clucene-2.3.3.4
 	>=dev-libs/boost-1.41
 	>=dev-libs/qjson-0.7.1
-	>=dev-libs/quazip-0.4.3
 	>=media-libs/libechonest-1.1.10
 	>=media-libs/phonon-4.5.0
 	media-libs/taglib
@@ -41,17 +39,24 @@ DEPEND="
 	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}/${PN}-0.3.0-clucene.patch"
+	"${FILESDIR}/${PN}-0.3.0-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
 	)
@@ -70,3 +75,12 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 }
+
+pkg_postinst() {
+	if ! use resolver; then
+		echo
+		elog "Information on how to get more resolvers for ${PN}"
+		elog "is available at ${HOMEPAGE}resolvers"
+		echo
+	fi
+}



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2011-11-10 15:39 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2011-11-10 15:39 UTC (permalink / raw
  To: gentoo-commits

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
 }



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/
@ 2011-11-12 19:23 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2011-11-12 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     36aa765c9ce800b88ae302bc8a2b9008f4f8e76a
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Nov 12 20:23:41 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 20:23:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=36aa765c

[media-sound/tomahawk] Moved to main tree

---
 .../tomahawk/files/tomahawk-0.3.0-clucene.patch    |  158 --------------------
 .../files/tomahawk-0.3.0-remove-quazip.patch       |   21 ---
 media-sound/tomahawk/metadata.xml                  |    9 -
 media-sound/tomahawk/tomahawk-0.3.0.ebuild         |   86 -----------
 media-sound/tomahawk/tomahawk-9999.ebuild          |   86 -----------
 5 files changed, 0 insertions(+), 360 deletions(-)

diff --git a/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch b/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch
deleted file mode 100644
index ff1bc0b..0000000
--- a/media-sound/tomahawk/files/tomahawk-0.3.0-clucene.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-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
- # 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,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()
--  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)
-@@ -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}
-+  ${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
-@@ -48,25 +38,13 @@ SET(TRIAL_INCLUDE_PATHS
-   /sw/include
-   /usr/pkg/include
-   )
--FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
-+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
-   WIN32_DEBUG_POSTFIX d
--  NAMES clucene-core
-+  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
--  WIN32_DEBUG_POSTFIX d
--  NAMES clucene-shared
--  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})
-@@ -81,37 +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(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)
-@@ -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-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}
--    ${CLUCENE_LIBRARIES}
-+    ${CLUCENE_LIBRARY}
-     ${LIBECHONEST_LIBRARY}
-     ${QT_QTUITOOLS_LIBRARY}
-     ${QT_LIBRARIES}

diff --git a/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch b/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch
deleted file mode 100644
index b36a2de..0000000
--- a/media-sound/tomahawk/files/tomahawk-0.3.0-remove-quazip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr tomahawk.orig//CMakeLists.txt tomahawk//CMakeLists.txt
---- tomahawk.orig//CMakeLists.txt	2011-11-10 14:30:31.000000000 +0100
-+++ tomahawk//CMakeLists.txt	2011-11-10 14:32:49.000000000 +0100
-@@ -110,17 +110,6 @@ macro_log_feature(LIBATTICA_FOUND "libat
- macro_optional_find_package(QuaZip)
- macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers autmatically. Will build internal copy instead." "http://quazip.sourceforge.net/" FALSE "" "")
- 
--IF( NOT QuaZip_FOUND )
--    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
--    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
--    SET( QuaZip_LIBRARY quazip )
--    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
--    SET( QuaZip_FOUND true )
--
--    # copy headers to build/quazip so we can use proper includes inside the code
--    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
--ENDIF()
--
- # required
- #While we distribute our own liblastfm2, don't need to look for it
- #macro_optional_find_package(LibLastFm 0.3.3)

diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
deleted file mode 100644
index a841699..0000000
--- a/media-sound/tomahawk/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="resolver">Resolver download and installation integration</flag>
-	<flag name="twitter">Enable twitter support</flag>
-</use>
-</pkgmetadata>

diff --git a/media-sound/tomahawk/tomahawk-0.3.0.ebuild b/media-sound/tomahawk/tomahawk-0.3.0.ebuild
deleted file mode 100644
index a37781f..0000000
--- a/media-sound/tomahawk/tomahawk-0.3.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-QT_MINIMAL="4.7.0"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="Qt playdar social music player."
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-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.10
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	>=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
-	)
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=(	-DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if ! use resolver; then
-		echo
-		elog "Information on how to get more resolvers for ${PN}"
-		elog "is available at ${HOMEPAGE}resolvers"
-		echo
-	fi
-}

diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
deleted file mode 100644
index 6d0b688..0000000
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-QT_MINIMAL="4.7.0"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-2"
-	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
-	KEYWORDS=""
-fi
-
-inherit cmake-utils qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="Qt playdar social music player."
-HOMEPAGE="http://tomahawk-player.org/"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-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.10
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	>=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}/${PN}-0.3.0-clucene.patch"
-	"${FILESDIR}/${PN}-0.3.0-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
-	)
-
-	if [[ ${PV} != *9999* ]]; then
-		mycmakeargs+=(	-DBUILD_RELEASE=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if ! use resolver; then
-		echo
-		elog "Information on how to get more resolvers for ${PN}"
-		elog "is available at ${HOMEPAGE}resolvers"
-		echo
-	fi
-}



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-12 19:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-04 14:06 [gentoo-commits] proj/kde:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2011-11-12 19:23 Andreas Hüttel
2011-11-10 15:39 Johannes Huber
2011-11-10 14:09 Johannes Huber
2011-08-23 14:49 Jorge Manuel B. S. Vicetto
2011-08-19 15:37 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox