subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-sound\/tomahawk\/"

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

2020-07-12 Thread Andreas Sturmlechner

commit: a56e41a7a6a49de23189cce5c31c6d5acd09695d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 13 00:16:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 13 00:29:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56e41a7

media-sound/tomahawk: Fix build with ECM >=5.72.0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../tomahawk-0.9.0_pre20181030-findtaglib.patch| 244 +
 .../tomahawk/tomahawk-0.9.0_pre20181030.ebuild |   3 +-
 2 files changed, 246 insertions(+), 1 deletion(-)

diff --git 
a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch 
b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
new file mode 100644
index 000..9a53e0d6902
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
@@ -0,0 +1,244 @@
+From 7c7b57e295aebcca9b09d8c5798e172cb8fd179c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 13 Jul 2020 02:11:06 +0200
+Subject: [PATCH] Import FindTaglib.cmake from ECM 5.72.0
+
+This version of ECM gained a module that is overriding Tomahawk's own, but
+variables are incompatible. Use the updated ECM module until we can depend
+on the necessary ECM version itself.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt |   2 +-
+ CMakeModules/CheckTagLibFileName.cmake |   5 +-
+ CMakeModules/FindTaglib.cmake  | 173 +
+ src/libtomahawk/CMakeLists.txt |   4 +-
+ 4 files changed, 93 insertions(+), 91 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9422a808e..2f1e72238 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -213,7 +213,7 @@ macro_optional_find_package(Lucene++ 3.0.0)
+ macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search 
engine" "https://github.com/luceneplusplus/LucenePlusPlus/; TRUE "" "Lucene++ 
is used for indexing the collection")
+ 
+ macro_optional_find_package(Taglib 1.8.0)
+-macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" 
"http://developer.kde.org/~wheeler/taglib.html; TRUE "" "taglib is needed for 
reading meta data from audio files")
++macro_log_feature(Taglib_FOUND "TagLib" "Audio Meta-Data Library" 
"http://developer.kde.org/~wheeler/taglib.html; TRUE "" "taglib is needed for 
reading meta data from audio files")
+ include( CheckTagLibFileName )
+ check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+ 
+diff --git a/CMakeModules/CheckTagLibFileName.cmake 
b/CMakeModules/CheckTagLibFileName.cmake
+index e5b3706c9..7828dcf34 100644
+--- a/CMakeModules/CheckTagLibFileName.cmake
 b/CMakeModules/CheckTagLibFileName.cmake
+@@ -1,9 +1,8 @@
+ # taglib changed filenames to be a char/wchar struct on some platforms, need 
to check for it
+ macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX)
+   include (CheckCXXSourceCompiles)
+-  set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS})
+-  set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES})
+-  set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES})
++  set (CMAKE_REQUIRED_INCLUDES ${Taglib_INCLUDE_DIRS})
++  set (CMAKE_REQUIRED_LIBRARIES ${Taglib_LIBRARIES})
+   check_cxx_source_compiles(
+   "#include 
+   int main()
+diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
+index d4ada2592..ad14c79cd 100644
+--- a/CMakeModules/FindTaglib.cmake
 b/CMakeModules/FindTaglib.cmake
+@@ -1,87 +1,90 @@
+-# - Try to find the Taglib library
+-# Once done this will define
++#.rst:
++# FindTaglib
++# --
+ #
+-#  TAGLIB_FOUND - system has the taglib library
+-#  TAGLIB_CFLAGS - the taglib cflags
+-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
+-
+-# Copyright (c) 2006, Laurent Montel, 
++# Try to find the Taglib library.
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-IF(TAGLIB_FOUND)
+-  MESSAGE(STATUS "Using manually specified taglib locations")
+-ELSE()
+-
+-  if(NOT TAGLIB_MIN_VERSION)
+-set(TAGLIB_MIN_VERSION "1.6")
+-  endif(NOT TAGLIB_MIN_VERSION)
+-
+-  if(NOT WIN32)
+-  find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
+- ${BIN_INSTALL_DIR}
+-  )
+-  endif(NOT WIN32)
+-
+-  #reset vars
+-  set(TAGLIB_LIBRARIES)
+-  set(TAGLIB_CFLAGS)
+-
+-# MESSAGE( STATUS "PATHS: ${PATHS}")
+-  # if taglib-config has been found
+-  if(TAGLIBCONFIG_EXECUTABLE)
+-
+-exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE 
_return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+-
+-if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-   message(STATUS "TagLib version not found: version searched 
:${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+-

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2020-07-12 Thread Andreas Sturmlechner

commit: 84b47fc4cc33228e2f8a47ff589514246f88f2ad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 12 23:58:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 13 00:29:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b47fc4

media-sound/tomahawk: Sort DEPENDs

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index e3e201984d0..147b6958096 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -19,6 +19,12 @@ BDEPEND="
dev-qt/linguist-tools:5
 "
 COMMON_DEPEND="
+   app-crypt/qca:2[qt5(+)]
+   dev-cpp/lucene++
+   dev-cpp/sparsehash
+   dev-libs/boost:=
+   dev-libs/qtkeychain:=[qt5(+)]
+   >=dev-libs/quazip-0.7.2[qt5(+)]
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -29,12 +35,6 @@ COMMON_DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
-   app-crypt/qca:2[qt5(+)]
-   dev-cpp/lucene++
-   dev-cpp/sparsehash
-   dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5(+)]
-   >=dev-libs/quazip-0.7.2[qt5(+)]
kde-frameworks/extra-cmake-modules:5
kde-frameworks/attica:5
>=media-libs/liblastfm-1.1.0_pre20150206

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

2020-05-08 Thread Andreas Sturmlechner

commit: 4e33aa61197053aecccb7c693ac74a44223bc77a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May  8 22:34:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  8 22:36:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e33aa61

media-sound/tomahawk: EAPI-7 bump, use cmake.eclass, build w/ Qt 5.15

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/tomahawk-0.9.0_pre20181030-qt-5.15.patch | 140 +
 .../tomahawk/tomahawk-0.9.0_pre20181030.ebuild |  13 +-
 2 files changed, 148 insertions(+), 5 deletions(-)

diff --git 
a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch 
b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
new file mode 100644
index 000..f07b746a03f
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-qt-5.15.patch
@@ -0,0 +1,140 @@
+From 4fb44c931be648d61ef3c8d10426b34de1b2a53b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 8 May 2020 23:55:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath)
+
+---
+ src/libtomahawk/utils/AnimatedSpinner.cpp   | 1 +
+ src/libtomahawk/utils/TomahawkUtilsGui.cpp  | 1 +
+ src/libtomahawk/widgets/DropDownButton.cpp  | 2 ++
+ src/libtomahawk/widgets/HoverControls.cpp   | 1 +
+ src/libtomahawk/widgets/SourceTreePopupDialog.cpp   | 1 +
+ src/libtomahawk/widgets/searchlineedit/SearchButton.cpp | 9 +
+ src/tomahawk/widgets/AccountsPopupWidget.cpp| 1 +
+ src/tomahawk/widgets/SlideSwitchButton.cpp  | 1 +
+ src/tomahawk/widgets/SocialWidget.cpp   | 3 ++-
+ 9 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/libtomahawk/utils/AnimatedSpinner.cpp 
b/src/libtomahawk/utils/AnimatedSpinner.cpp
+index b4778cbe9..a705cfaa2 100644
+--- a/src/libtomahawk/utils/AnimatedSpinner.cpp
 b/src/libtomahawk/utils/AnimatedSpinner.cpp
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp 
b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+index b35799723..d2733d4a7 100644
+--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
 b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/libtomahawk/widgets/DropDownButton.cpp 
b/src/libtomahawk/widgets/DropDownButton.cpp
+index 74aa344d1..106e8b882 100644
+--- a/src/libtomahawk/widgets/DropDownButton.cpp
 b/src/libtomahawk/widgets/DropDownButton.cpp
+@@ -19,6 +19,8 @@
+ #include "DropDownButton.h"
+ 
+ #include 
++#include 
++#include 
+ 
+ #include "Artist.h"
+ #include "Album.h"
+diff --git a/src/libtomahawk/widgets/HoverControls.cpp 
b/src/libtomahawk/widgets/HoverControls.cpp
+index 3e31bf236..0b6b20aa8 100644
+--- a/src/libtomahawk/widgets/HoverControls.cpp
 b/src/libtomahawk/widgets/HoverControls.cpp
+@@ -27,6 +27,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ using namespace Tomahawk;
+ 
+diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp 
b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+index 807eb354a..1379c9c53 100644
+--- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
 b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+@@ -22,6 +22,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp 
b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+index 1d9f1c4bd..97c5406f2 100644
+--- a/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
 b/src/libtomahawk/widgets/searchlineedit/SearchButton.cpp
+@@ -19,10 +19,11 @@
+ 
+ #include "SearchButton.h"
+ 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ SearchButton::SearchButton(QWidget *parent)
+ : QAbstractButton(parent)
+diff --git a/src/tomahawk/widgets/AccountsPopupWidget.cpp 
b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+index cb5739b97..ffd5dcaa1 100644
+--- a/src/tomahawk/widgets/AccountsPopupWidget.cpp
 b/src/tomahawk/widgets/AccountsPopupWidget.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/src/tomahawk/widgets/SlideSwitchButton.cpp 
b/src/tomahawk/widgets/SlideSwitchButton.cpp
+index 3c61b4987..103562e00 100644
+--- a/src/tomahawk/widgets/SlideSwitchButton.cpp
 b/src/tomahawk/widgets/SlideSwitchButton.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/tomahawk/widgets/SocialWidget.cpp 
b/src/tomahawk/widgets/SocialWidget.cpp
+index f0901279d..b43f44c5d 100644
+--- a/src/tomahawk/widgets/SocialWidget.cpp
 b/src/tomahawk/widgets/SocialWidget.cpp
+@@ -29,8

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2019-07-20 Thread Andreas Sturmlechner

commit: 367f117f02bc0f6d85edc6939fa389960ece59da
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 20 19:12:58 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul 20 19:29:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367f117f

media-sound/tomahawk: tomahawk-player.org is no more

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index 82c9537fd05..fca16414dfb 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -7,7 +7,7 @@ COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
 inherit cmake-utils xdg-utils
 
 DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/;
+HOMEPAGE="https://github.com/tomahawk-player/tomahawk;
 SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3 BSD"

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

2019-01-26 Thread Andreas Sturmlechner

commit: 488d5319cf31630b221a1abe66e284df51fdd11a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 26 08:35:20 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 26 08:46:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488d5319

media-sound/tomahawk: Try to fix build with https://bugs.gentoo.org/674826
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../tomahawk-0.9.0_pre20181030-cmakepolicy.patch   | 37 ++
 .../tomahawk/tomahawk-0.9.0_pre20181030.ebuild |  7 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git 
a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch 
b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
new file mode 100644
index 000..7ddf116eecc
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
@@ -0,0 +1,37 @@
+From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 25 Jan 2019 21:13:05 +0100
+Subject: [PATCH] Fix build with

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2019-01-09 Thread Andreas Sturmlechner

commit: d76271b591a693a39346c9638bd30b2c986f3b66
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  9 12:04:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  9 12:04:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d76271b5

media-sound/tomahawk: Drop 0.9.0_pre20180501 snapshot

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/tomahawk/Manifest  |  1 -
 .../tomahawk/tomahawk-0.9.0_pre20180501.ebuild | 69 --
 2 files changed, 70 deletions(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 4f38e703b20..9ff5a58e990 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 
430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f
 SHA512 
51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B 
aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605
 SHA512 
de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
deleted file mode 100644
index 3c553a30e8c..000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=34c1f88171f00a3e9fae57250799f3d3623b5f74
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/;
-SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="telepathy xmpp"
-
-CDEPEND="
-   $(add_frameworks_dep attica)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebkit)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   app-crypt/qca:2[qt5(+)]
-   dev-cpp/lucene++
-   dev-cpp/sparsehash
-   dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5(+)]
-   >=dev-libs/quazip-0.7.2[qt5(+)]
-   >=media-libs/liblastfm-1.1.0_pre20150206
-   >=media-libs/taglib-1.8.0
-   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-   >=net-libs/gnutls-3.2:=
-   x11-libs/libX11
-   telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
-   xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
-"
-DEPEND="${CDEPEND}
-   $(add_qt_dep designer)
-   $(add_qt_dep linguist-tools)
-   $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-   app-crypt/qca:2[ssl]
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_CRASHREPORTER=OFF
-   -DBUILD_TESTS=OFF
-   -DBUILD_TOOLS=OFF
-   -DBUILD_WITH_QT4=OFF
-   -DWITH_KDE4=OFF
-   -DBUILD_HATCHET=OFF
-   -DWITH_TelepathyQt=$(usex telepathy)
-   -DWITH_Jreen=$(usex xmpp)
-   )
-
-   if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   mycmakeargs+=( -DBUILD_RELEASE=ON )
-   fi
-
-   kde5_src_configure
-}

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

2018-11-08 Thread Andreas Sturmlechner

commit: 3ec10b6ac354f7df33a50d3ae5b64e1a4623302e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov  8 13:35:53 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov  8 15:54:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec10b6a

media-sound/tomahawk: 0.9.0_pre20181030 snapshot bump

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/tomahawk/Manifest  |  1 +
 .../tomahawk-0.9.0_pre20181030-fix-warning.patch   | 26 +++
 .../tomahawk/tomahawk-0.9.0_pre20181030.ebuild | 79 ++
 3 files changed, 106 insertions(+)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index f1955d31d4f..4f38e703b20 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1 +1,2 @@
 DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 
430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f
 SHA512 
51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
+DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B 
aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605
 SHA512 
de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202

diff --git 
a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch 
b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
new file mode 100644
index 000..8e02e8e300c
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-fix-warning.patch
@@ -0,0 +1,26 @@
+From cd5444573eec73a564263c20220ba0562cc655c5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 8 Nov 2018 15:10:56 +0100
+Subject: [PATCH] Fix "control reaches end of non-void function" in
+ DelegateConfigWrapper
+
+Thanks-to: Fabian Vogt 
+---
+ src/libtomahawk/accounts/DelegateConfigWrapper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp 
b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
+index e78b64aec..875016ca1 100644
+--- a/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
 b/src/libtomahawk/accounts/DelegateConfigWrapper.cpp
+@@ -247,6 +247,7 @@ DelegateConfigWrapper::getTestConfigMessage( int code )
+   case Tomahawk::Accounts::ConfigTestResultAccountExpired:
+   return tr( "Your account has expired." );
+ }
++return QString();
+ }
+ 
+ 
+-- 
+2.19.1
+

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
new file mode 100644
index 000..b9e80fa1ed9
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=777b31219179b43f56c7b95857d2fbd7f33199aa
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="https://www.tomahawk-player.org/;
+SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="telepathy xmpp"
+
+COMMON_DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   app-crypt/qca:2[qt5(+)]
+   dev-cpp/lucene++
+   dev-cpp/sparsehash
+   dev-libs/boost:=
+   dev-libs/qtkeychain:=[qt5(+)]
+   >=dev-libs/quazip-0.7.2[qt5(+)]
+   kde-frameworks/extra-cmake-modules:5
+   kde-frameworks/attica:5
+   >=media-libs/liblastfm-1.1.0_pre20150206
+   >=media-libs/taglib-1.8.0
+   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
+   >=net-libs/gnutls-3.2:=
+   x11-libs/libX11
+   telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
+   xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-qt/designer:5
+   dev-qt/linguist-tools:5
+   dev-qt/qtconcurrent:5
+"
+RDEPEND="${COMMON_DEPEND}
+   app-crypt/qca:2[ssl]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-warning.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_CRASHREPORTER=OFF
+   -DBUILD_TESTS=OFF
+   -DBUILD_TOOLS=OFF
+   -DBUILD_HATCHET=OFF
+   -DWITH_TelepathyQt=$(usex telepathy)
+   -DWITH_Jreen=$(usex xmpp)
+   )
+
+   [[ ${PV} != ** ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
+
+   cmake-utils_src_configure
+}
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2018-10-20 Thread Johannes Huber

commit: 0c555f21649fa3a519dc96612d63b6047beeddc9
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct 20 09:59:27 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct 20 09:59:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c555f21

media-sound/tomahawk: Drop myself as maintainer

Signed-off-by: Johannes Huber  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-sound/tomahawk/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-sound/tomahawk/metadata.xml 
b/media-sound/tomahawk/metadata.xml
index 3bc448c2a0a..602a023a5be 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   j...@gentoo.org
-   Johannes Huber
-   

k...@gentoo.org
Gentoo KDE Project

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2018-10-03 Thread Andreas Sturmlechner

commit: e31a3e43a6e753e23a42e2beb103e878f557
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct  3 22:57:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct  3 22:57:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31a

media-sound/tomahawk: Drop USE hatchet

Closes: https://bugs.gentoo.org/663318
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 media-sound/tomahawk/metadata.xml  | 1 -
 media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild | 7 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-sound/tomahawk/metadata.xml 
b/media-sound/tomahawk/metadata.xml
index a36075aeec6..3bc448c2a0a 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -10,7 +10,6 @@
Gentoo KDE Project


-   Enable support for the synchronisation 
through Hatchet
Enable support for the real-time 
communication framework telepathy

 

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
index 78600519cd5..3c553a30e8c 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 LICENSE="GPL-3 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+hatchet telepathy xmpp"
+IUSE="telepathy xmpp"
 
 CDEPEND="
$(add_frameworks_dep attica)
@@ -37,7 +37,6 @@ CDEPEND="
media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
>=net-libs/gnutls-3.2:=
x11-libs/libX11
-   hatchet? ( dev-cpp/websocketpp )
telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
 "
@@ -57,7 +56,7 @@ src_configure() {
-DBUILD_TOOLS=OFF
-DBUILD_WITH_QT4=OFF
-DWITH_KDE4=OFF
-   -DBUILD_HATCHET=$(usex hatchet)
+   -DBUILD_HATCHET=OFF
-DWITH_TelepathyQt=$(usex telepathy)
-DWITH_Jreen=$(usex xmpp)
)

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

2018-05-01 Thread Johannes Huber

commit: b58f368495ad06c6638abffb758728c566d71176
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May  1 18:48:45 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May  1 18:49:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58f3684

media-sound/tomahawk: Remove 0.9.0_pre20170808

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/tomahawk/Manifest  |   1 -
 .../tomahawk-0.9.0_pre20170808-qt-5.11b3.patch | 240 -
 .../tomahawk/files/tomahawk-liblastfm-cmake.patch  | 126 ---
 .../tomahawk/tomahawk-0.9.0_pre20170808.ebuild |  78 ---
 4 files changed, 445 deletions(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 5b46c7f1068..f1955d31d4f 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 
5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560
 SHA512 
edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b
 DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 
430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f
 SHA512 
51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7

diff --git 
a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch 
b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch
deleted file mode 100644
index 6fb139c6bf1..000
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From 208a259b08676f2e0db35451b78e8225cb87547d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 17 Apr 2018 13:09:25 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-

- CMakeLists.txt |  3 ---
- TomahawkAddLibrary.cmake   |  4 +++-
- TomahawkUse.cmake.in   |  3 ---
- src/crashreporter/CMakeLists.txt   |  6 --
- src/libtomahawk/CMakeLists.txt | 18 +++---
- src/tests/tomahawk_add_test.cmake  |  8 ++--
- src/tomahawk/CMakeLists.txt| 17 ++---
- src/tools/database-reader/CMakeLists.txt   |  4 +++-
- .../tomahawk-test-musicscan/CMakeLists.txt |  4 +++-
- .../kdsingleapplicationguard/CMakeLists.txt|  4 +++-
- .../src/certificate/CMakeLists.txt |  6 +++---
- .../qxt/qxtweb-standalone/CMakeLists.txt   | 10 +-
- 12 files changed, 51 insertions(+), 36 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7004e1b70..616db971f 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -243,9 +243,6 @@ if( NOT Qt5Core_DIR )
- macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} 
)
- macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI 
framework" "http://qt-project.org; TRUE "" "If you see this, although 
libqt4-devel is installed, check whether the \n qtwebkit-devel package and 
whatever contains QtUiTools is installed too")
- 
--macro(qt5_use_modules)
--endmacro()
--
- macro(qt_wrap_ui)
- qt4_wrap_ui(${ARGN})
- endmacro()
-diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake
-index 384394e45..f67a48900 100644
 a/TomahawkAddLibrary.cmake
-+++ b/TomahawkAddLibrary.cmake
-@@ -46,7 +46,9 @@ function(tomahawk_add_library)
- endif()
- 
- # HACK: add qt modules - every lib should define its own set of modules
--qt5_use_modules(${target} Core Network Widgets Sql Xml 
${LIBRARY_QT5_MODULES})
-+if(Qt5Core_DIR)
-+target_link_libraries(${target} Qt5::Core Qt5::Network Qt5::Widgets 
Qt5::Sql Qt5::Xml)
-+endif()
- 
- # definitions - can this be moved into set_target_properties below?
- add_definitions(${QT_DEFINITIONS})
-diff --git a/TomahawkUse.cmake.in b/TomahawkUse.cmake.in
-index cb39fe219..9401e1851 100644
 a/TomahawkUse.cmake.in
-+++ b/TomahawkUse.cmake.in
-@@ -81,9 +81,6 @@ else(TOMAHAWK_QT5)
- find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
- include( ${QT_USE_FILE} )
- 
--macro(qt5_use_modules)
--endmacro()
--
- macro(qt_wrap_ui)
- qt4_wrap_ui(${ARGN})
- endmacro()
-diff --git a/src/crashreporter/CMakeLists.txt 
b/src/crashreporter/CMakeLists.txt
-index b837eb941..d47c91b62 100644
 a/src/crashreporter/CMakeLists.txt
-+++ b/src/crashreporter/CMakeLists.txt
-@@ -43,7 +43,9 @@ target_link_libraries( ${TOMAHAWK_CRASH_REPORTER_TARGET}
- ${QT_LIBRARIES}
- )
- 
-+if(Qt5Core_DIR)
-+

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2018-05-01 Thread Johannes Huber

commit: 5c933d0c1863147db8a63c8503eb6002a581d52d
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May  1 18:46:16 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May  1 18:49:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c933d0c

media-sound/tomahawk: Snapshot bump 0.9.0_pre20180501

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/tomahawk/Manifest  |  1 +
 .../tomahawk/tomahawk-0.9.0_pre20180501.ebuild | 70 ++
 2 files changed, 71 insertions(+)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index dfa5a8e4793..5b46c7f1068 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1 +1,2 @@
 DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 
5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560
 SHA512 
edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b
+DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 
430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f
 SHA512 
51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
new file mode 100644
index 000..78600519cd5
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=34c1f88171f00a3e9fae57250799f3d3623b5f74
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="https://www.tomahawk-player.org/;
+SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+hatchet telepathy xmpp"
+
+CDEPEND="
+   $(add_frameworks_dep attica)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   app-crypt/qca:2[qt5(+)]
+   dev-cpp/lucene++
+   dev-cpp/sparsehash
+   dev-libs/boost:=
+   dev-libs/qtkeychain:=[qt5(+)]
+   >=dev-libs/quazip-0.7.2[qt5(+)]
+   >=media-libs/liblastfm-1.1.0_pre20150206
+   >=media-libs/taglib-1.8.0
+   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
+   >=net-libs/gnutls-3.2:=
+   x11-libs/libX11
+   hatchet? ( dev-cpp/websocketpp )
+   telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
+   xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
+"
+DEPEND="${CDEPEND}
+   $(add_qt_dep designer)
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${CDEPEND}
+   app-crypt/qca:2[ssl]
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_CRASHREPORTER=OFF
+   -DBUILD_TESTS=OFF
+   -DBUILD_TOOLS=OFF
+   -DBUILD_WITH_QT4=OFF
+   -DWITH_KDE4=OFF
+   -DBUILD_HATCHET=$(usex hatchet)
+   -DWITH_TelepathyQt=$(usex telepathy)
+   -DWITH_Jreen=$(usex xmpp)
+   )
+
+   if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   mycmakeargs+=( -DBUILD_RELEASE=ON )
+   fi
+
+   kde5_src_configure
+}

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

2018-04-17 Thread Andreas Sturmlechner

commit: 3c3186be7affddef949635aac80d85332c7fd600
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 17 11:27:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 17 12:02:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c3186be

media-sound/tomahawk: Fix build with Qt 5.11_beta3

Package-Manager: Portage-2.3.29, Repoman-2.3.9

 .../tomahawk-0.9.0_pre20170808-qt-5.11b3.patch | 240 +
 .../tomahawk/tomahawk-0.9.0_pre20170808.ebuild |   2 +
 2 files changed, 242 insertions(+)

diff --git 
a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch 
b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch
new file mode 100644
index 000..6fb139c6bf1
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch
@@ -0,0 +1,240 @@
+From 208a259b08676f2e0db35451b78e8225cb87547d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 17 Apr 2018 13:09:25 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ CMakeLists.txt |  3 ---
+ TomahawkAddLibrary.cmake   |  4 +++-
+ TomahawkUse.cmake.in   |  3 ---
+ src/crashreporter/CMakeLists.txt   |  6 --
+ src/libtomahawk/CMakeLists.txt | 18 +++---
+ src/tests/tomahawk_add_test.cmake  |  8 ++--
+ src/tomahawk/CMakeLists.txt| 17 ++---
+ src/tools/database-reader/CMakeLists.txt   |  4 +++-
+ .../tomahawk-test-musicscan/CMakeLists.txt |  4 +++-
+ .../kdsingleapplicationguard/CMakeLists.txt|  4 +++-
+ .../src/certificate/CMakeLists.txt |  6 +++---
+ .../qxt/qxtweb-standalone/CMakeLists.txt   | 10 +-
+ 12 files changed, 51 insertions(+), 36 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7004e1b70..616db971f 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -243,9 +243,6 @@ if( NOT Qt5Core_DIR )
+ macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} 
)
+ macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI 
framework" "http://qt-project.org; TRUE "" "If you see this, although 
libqt4-devel is installed, check whether the \n qtwebkit-devel package and 
whatever contains QtUiTools is installed too")
+ 
+-macro(qt5_use_modules)
+-endmacro()
+-
+ macro(qt_wrap_ui)
+ qt4_wrap_ui(${ARGN})
+ endmacro()
+diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake
+index 384394e45..f67a48900 100644
+--- a/TomahawkAddLibrary.cmake
 b/TomahawkAddLibrary.cmake
+@@ -46,7 +46,9 @@ function(tomahawk_add_library)
+ endif()
+ 
+ # HACK: add qt modules - every lib should define its own set of modules
+-qt5_use_modules(${target} Core Network Widgets Sql Xml 
${LIBRARY_QT5_MODULES})
++if(Qt5Core_DIR)
++target_link_libraries(${target} Qt5::Core Qt5::Network Qt5::Widgets 
Qt5::Sql Qt5::Xml)
++endif()
+ 
+ # definitions - can this be moved into set_target_properties below?
+ add_definitions(${QT_DEFINITIONS})
+diff --git a/TomahawkUse.cmake.in b/TomahawkUse.cmake.in
+index cb39fe219..9401e1851 100644
+--- a/TomahawkUse.cmake.in
 b/TomahawkUse.cmake.in
+@@ -81,9 +81,6 @@ else(TOMAHAWK_QT5)
+ find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
+ include( ${QT_USE_FILE} )
+ 
+-macro(qt5_use_modules)
+-endmacro()
+-
+ macro(qt_wrap_ui)
+ qt4_wrap_ui(${ARGN})
+ endmacro()
+diff --git a/src/crashreporter/CMakeLists.txt 
b/src/crashreporter/CMakeLists.txt
+index b837eb941..d47c91b62 100644
+--- a/src/crashreporter/CMakeLists.txt
 b/src/crashreporter/CMakeLists.txt
+@@ -43,7 +43,9 @@ target_link_libraries( ${TOMAHAWK_CRASH_REPORTER_TARGET}
+ ${QT_LIBRARIES}
+ )
+ 
++if(Qt5Core_DIR)
++target_link_libraries(${TOMAHAWK_CRASH_REPORTER_TARGET} Qt5::Widgets 
Qt5::Network)
++endif()
++
+ set_target_properties(${TOMAHAWK_CRASH_REPORTER_TARGET} PROPERTIES AUTOMOC ON)
+ install(TARGETS ${TOMAHAWK_CRASH_REPORTER_TARGET} RUNTIME DESTINATION 
${CMAKE_INSTALL_LIBEXECDIR})
+-
+-qt5_use_modules(${TOMAHAWK_CRASH_REPORTER_TARGET} Widgets Network)
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index adb3edfa0..a85a835ad 100644
+--- a/src/libtomahawk/CMakeLists.txt
 b/src/libtomahawk/CMakeLists.txt
+@@ -500,12 +500,17 @@ set_target_properties(
+ OUTPUT_NAME ${TOMAHAWK_BASE_TARGET_NAME}
+ )
+ 
+-
+-qt5_use_modules(${TOMAHAWK_LIBRARY} Widgets Network Sql WebKitWidgets 
Concurrent Xml UiTools Svg)
+-IF(APPLE)
+-   qt5_use_modules(${TOMAHAWK_LIBRARY} MacExtras)
+-ENDIF()
+-
++if(Qt5Core_DIR)
++target_link_libraries(${TOMAHAWK_LIBRARY}
++Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent 
Qt5::Xml Qt5::UiTools Qt5::Svg
++)

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2018-03-22 Thread Andreas Sturmlechner

commit: 347fa987bb937bde8c00701b769f51ba9b39b70e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 22 18:00:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 22 18:02:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347fa987

media-sound/tomahawk: Compat. with liblastfm-1.1.0_pre20150206

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
index 11fbc52732b..15c73708429 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,9 +50,11 @@ RDEPEND="${CDEPEND}
app-crypt/qca:2[ssl]
 "
 
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
+src_prepare() {
+   kde5_src_prepare
+   has_version "media-libs/liblastfm[qt5]" &&
+   eapply "${FILESDIR}/${PN}-liblastfm-cmake.patch"
+}
 
 src_configure() {
local mycmakeargs=(

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

2017-11-27 Thread Andreas Sturmlechner

commit: e68151c0a6df725c4a99202924290ba4ebe16398
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 27 09:25:40 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 23:57:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68151c0

media-sound/tomahawk: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/tomahawk/Manifest  |  1 -
 .../tomahawk/files/tomahawk-qtkeychain-cmake.patch | 28 
 .../tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild  | 82 --
 3 files changed, 111 deletions(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 9a77cda1e42..dfa5a8e4793 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 BLAKE2B 
8d12eaaf055da7dfe0dc4ff3e07c2be824983ca160d8ccd592ab611a8df09cead0d334e2ca3113c1bc34dea85c61edcf1bdeb6208316f1c372caf08bc04243e1
 SHA512 
fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
 DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 
5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560
 SHA512 
edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b

diff --git a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch 
b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
deleted file mode 100644
index e4b3bf0304c..000
--- a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00f602e10203b76fc28b4615868c567e6bd4ced4 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt 
-Date: Tue, 8 Aug 2017 14:34:49 +0200
-Subject: [PATCH] Fix #619: Correctly detect qt5keychain
-

- CMakeLists.txt | 8 ++--
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad5d918ecf..7004e1b700 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -376,12 +376,8 @@ macro_optional_find_package(LibLastFm 1.0.0)
- macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm 
webservices" "https://github.com/lastfm/liblastfm; TRUE "" "liblastfm is needed 
for scrobbling tracks to Last.fm and fetching cover artwork")
- 
- if( NOT APPLE )
--if( TOMAHAWK_QT5 )
--macro_optional_find_package(Qt5Keychain 0.1.0)
--else()
--macro_optional_find_package(QtKeychain 0.1.0)
--endif()
--macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure 
credentials storage" "https://github.com/frankosterfeld/qtkeychain; TRUE "" "")
-+macro_optional_find_package(Qt5Keychain 0.1.0)
-+macro_log_feature(Qt5Keychain_FOUND "QtKeychain" "Provides support for secure 
credentials storage" "https://github.com/frankosterfeld/qtkeychain; TRUE "" "")
- endif()
- 
- if( UNIX AND NOT APPLE )

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
deleted file mode 100644
index 39c73c56872..000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   # SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
-   SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz;
-   KEYWORDS="~amd64 ~x86"
-else
-   EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git;
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/;
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="+hatchet telepathy xmpp"
-
-CDEPEND="
-   $(add_frameworks_dep attica)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebkit)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   app-crypt/qca:2[qt5]
-   dev-cpp/lucene++
-   dev-cpp/sparsehash
-   dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5(+)]
-   >=dev-libs/quazip-0.7.2[qt5]
-   media-libs/liblastfm[qt5]
-   >=media-libs/taglib-1.8.0
-   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-   >=net-libs/gnutls-3.2:=
-   x11-libs/libX11
-   hatchet? ( dev-cpp/websocketpp )
-   telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-   xmpp? ( net-libs/jreen[qt5] )
-"
-DEPEND="${CDEPEND}
-   $(add_qt_dep designer)
-   $(add_qt_dep linguist-tools)
-   $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-   app-crypt/qca:2[ssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2017-11-27 Thread Andreas Sturmlechner

commit: 0cc8440ab828a2a29ba2d92dcb3ef6327b3615dd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 26 22:15:40 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 09:03:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc8440a

media-sound/tomahawk: Add 0.9.0_pre20170808 snapshot

Fixes build with >=libvlc-3.0

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-sound/tomahawk/Manifest  |  3 +-
 .../tomahawk/tomahawk-0.9.0_pre20170808.ebuild | 74 ++
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index c02148b54a2..9a77cda1e42 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1 +1,2 @@
-DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 
de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 
fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
 WHIRLPOOL 
b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa65e17433dc268f2c317537716c31928f6
+DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 BLAKE2B 
8d12eaaf055da7dfe0dc4ff3e07c2be824983ca160d8ccd592ab611a8df09cead0d334e2ca3113c1bc34dea85c61edcf1bdeb6208316f1c372caf08bc04243e1
 SHA512 
fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
+DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 
5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560
 SHA512 
edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
new file mode 100644
index 000..11fbc52732b
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=00f602e10203b76fc28b4615868c567e6bd4ced4
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="https://www.tomahawk-player.org/;
+SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+hatchet telepathy xmpp"
+
+CDEPEND="
+   $(add_frameworks_dep attica)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   app-crypt/qca:2[qt5(+)]
+   dev-cpp/lucene++
+   dev-cpp/sparsehash
+   dev-libs/boost:=
+   dev-libs/qtkeychain:=[qt5(+)]
+   >=dev-libs/quazip-0.7.2[qt5(+)]
+   >=media-libs/liblastfm-1.0.9-r1[qt5(+)]
+   >=media-libs/taglib-1.8.0
+   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
+   >=net-libs/gnutls-3.2:=
+   x11-libs/libX11
+   hatchet? ( dev-cpp/websocketpp )
+   telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
+   xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
+"
+DEPEND="${CDEPEND}
+   $(add_qt_dep designer)
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${CDEPEND}
+   app-crypt/qca:2[ssl]
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_CRASHREPORTER=OFF
+   -DBUILD_TESTS=OFF
+   -DBUILD_TOOLS=OFF
+   -DBUILD_WITH_QT4=OFF
+   -DWITH_KDE4=OFF
+   -DBUILD_HATCHET=$(usex hatchet)
+   -DWITH_TelepathyQt=$(usex telepathy)
+   -DWITH_Jreen=$(usex xmpp)
+   )
+
+   if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   mycmakeargs+=( -DBUILD_RELEASE=ON )
+   fi
+
+   kde5_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2017-11-27 Thread Andreas Sturmlechner

commit: 3d125913602038f4eade8d3106558d4cb0a9e59c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 26 22:17:22 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 09:03:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d125913

media-sound/tomahawk: Drop live ebuild

"This project is essentially abandoned."

See also:
https://github.com/tomahawk-player/tomahawk/commit/c8389592488c07079f40e7edb9195cfabbc58740

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-sound/tomahawk/tomahawk-.ebuild | 78 ---
 1 file changed, 78 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
deleted file mode 100644
index e433366a995..000
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~x86"
-else
-   EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git;
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/;
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="+hatchet telepathy xmpp"
-
-CDEPEND="
-   $(add_frameworks_dep attica)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebkit)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   app-crypt/qca:2[qt5]
-   dev-cpp/lucene++
-   dev-cpp/sparsehash
-   dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5(+)]
-   >=dev-libs/quazip-0.7.2[qt5]
-   media-libs/liblastfm[qt5]
-   >=media-libs/taglib-1.8.0
-   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-   >=net-libs/gnutls-3.2:=
-   x11-libs/libX11
-   hatchet? ( dev-cpp/websocketpp )
-   telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-   xmpp? ( net-libs/jreen[qt5] )
-"
-DEPEND="${CDEPEND}
-   $(add_qt_dep designer)
-   $(add_qt_dep linguist-tools)
-   $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-   app-crypt/qca:2[ssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_CRASHREPORTER=OFF
-   -DBUILD_TESTS=OFF
-   -DBUILD_TOOLS=OFF
-   -DBUILD_WITH_QT4=OFF
-   -DWITH_KDE4=OFF
-   -DBUILD_HATCHET=$(usex hatchet)
-   -DWITH_TelepathyQt=$(usex telepathy)
-   -DWITH_Jreen=$(usex xmpp)
-   )
-
-   if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   mycmakeargs+=( -DBUILD_RELEASE=ON )
-   fi
-
-   kde5_src_configure
-}

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

2017-10-04 Thread Johannes Huber

commit: d261485b3b50c72f14c4d33f6a792470505f34e1
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Oct  4 18:10:24 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Oct  4 18:10:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d261485b

media-sound/tomahawk: Fix qtkeychain detection

Closes: https://bugs.gentoo.org/633470
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 .../tomahawk/files/tomahawk-qtkeychain-cmake.patch | 28 ++
 .../tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild  |  5 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch 
b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
new file mode 100644
index 000..e4b3bf0304c
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
@@ -0,0 +1,28 @@
+From 00f602e10203b76fc28b4615868c567e6bd4ced4 Mon Sep 17 00:00:00 2001
+From: Dominik Schmidt 
+Date: Tue, 8 Aug 2017 14:34:49 +0200
+Subject: [PATCH] Fix #619: Correctly detect qt5keychain
+
+---
+ CMakeLists.txt | 8 ++--
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad5d918ecf..7004e1b700 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -376,12 +376,8 @@ macro_optional_find_package(LibLastFm 1.0.0)
+ macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm 
webservices" "https://github.com/lastfm/liblastfm; TRUE "" "liblastfm is needed 
for scrobbling tracks to Last.fm and fetching cover artwork")
+ 
+ if( NOT APPLE )
+-if( TOMAHAWK_QT5 )
+-macro_optional_find_package(Qt5Keychain 0.1.0)
+-else()
+-macro_optional_find_package(QtKeychain 0.1.0)
+-endif()
+-macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure 
credentials storage" "https://github.com/frankosterfeld/qtkeychain; TRUE "" "")
++macro_optional_find_package(Qt5Keychain 0.1.0)
++macro_log_feature(Qt5Keychain_FOUND "QtKeychain" "Provides support for secure 
credentials storage" "https://github.com/frankosterfeld/qtkeychain; TRUE "" "")
+ endif()
+ 
+ if( UNIX AND NOT APPLE )

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
index b0e1a69efeb..39c73c56872 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-liblastfm-cmake.patch"
+   "${FILESDIR}/${PN}-qtkeychain-cmake.patch"
+)
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, mail-client/trojita/, net-misc/nextcloud-client/, ...

2017-09-01 Thread Andreas Sturmlechner

commit: 15935f2796bef426641e58823d1ae01eedfc273f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 31 23:00:53 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep  1 21:40:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15935f27

dev-libs/qtkeychain: Prepare rdeps for dropping USE=qt5

 kde-misc/kio-gdrive/kio-gdrive-1.2.0.1.ebuild  | 2 +-
 mail-client/trojita/trojita-0.7-r2.ebuild  | 2 +-
 mail-client/trojita/trojita-.ebuild| 2 +-
 media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild  | 2 +-
 media-sound/tomahawk/tomahawk-.ebuild  | 2 +-
 net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild | 2 +-
 net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild| 2 +-
 net-misc/owncloud-client/owncloud-client-2.3.1.ebuild  | 2 +-
 net-misc/owncloud-client/owncloud-client-2.3.2-r1.ebuild   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.0.1.ebuild 
b/kde-misc/kio-gdrive/kio-gdrive-1.2.0.1.ebuild
index dbf0238b300..e4dbff89ec3 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.0.1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.0.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
$(add_kdeapps_dep libkgapi)
$(add_qt_dep qtwidgets)
kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
-   !kaccounts? ( dev-libs/qtkeychain:=[qt5] )
+   !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
 DEPEND="${RDEPEND}
$(add_qt_dep qtgui)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index f283ed20238..bc979f3f5ee 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
dev-libs/mimetic
)
dbus? ( dev-qt/qtdbus:5 )
-   password? ( dev-libs/qtkeychain[qt5] )
+   password? ( dev-libs/qtkeychain[qt5(+)] )
zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b29c7c68baf..919326db5b1 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
>=app-crypt/gpgme-1.8.0[cxx,qt5]
)
dbus? ( dev-qt/qtdbus:5 )
-   password? ( dev-libs/qtkeychain[qt5] )
+   password? ( dev-libs/qtkeychain[qt5(+)] )
zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
index 9185d511544..b0e1a69efeb 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
@@ -35,7 +35,7 @@ CDEPEND="
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5]
+   dev-libs/qtkeychain:=[qt5(+)]
>=dev-libs/quazip-0.7.2[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index fe4249953a2..e433366a995 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -34,7 +34,7 @@ CDEPEND="
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5]
+   dev-libs/qtkeychain:=[qt5(+)]
>=dev-libs/quazip-0.7.2[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0

diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild 
b/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
index 27ba48e9612..01e8d34e154 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.1-r2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc dolphin nautilus samba +sftp shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-   dev-libs/qtkeychain[qt5]
+   dev-libs/qtkeychain[qt5(+)]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5

diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild 
b/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
index 27ba48e9612..01e8d34e154 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc dolphin nautilus samba +sftp shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-   dev-libs/qtkeychain[qt5]
+   dev-libs/qtkeychain[qt5(+)]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5

diff --git a/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild 
b/net-misc/owncloud-client/owncloud-client-2.3.1.ebuild
index f98d38c8e39..dc30d73d71a

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2017-08-12 Thread Michael Palimaka

commit: dfbf94577a5b1b43ace0ba3f945414f119b5d359
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Aug 12 14:27:32 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Aug 12 14:31:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbf9457

media-sound/tomahawk: update HOMEPAGE

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild | 2 +-
 media-sound/tomahawk/tomahawk-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
index 7146cae1bf0..7abb65727ba 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://tomahawk-player.org/;
+HOMEPAGE="https://www.tomahawk-player.org/;
 
 LICENSE="GPL-3 BSD"
 SLOT="0"

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 8a1a51f9fbb..37e6e56117f 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://tomahawk-player.org/;
+HOMEPAGE="https://www.tomahawk-player.org/;
 
 LICENSE="GPL-3 BSD"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2017-02-20 Thread Andreas Sturmlechner

commit: bf5adf0822b623d9eab59cf1c304351f5dc66a99
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb 21 00:43:27 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 21 00:44:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5adf08

media-sound/tomahawk: Drop old

Package-Manager: portage-2.3.3

 .../tomahawk/tomahawk-0.9.0_pre20161029.ebuild | 81 --
 1 file changed, 81 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029.ebuild
deleted file mode 100644
index 43d4b289ad..00
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   # SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
-   SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz;
-   KEYWORDS="~amd64 ~x86"
-else
-   EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
-fi
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/;
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-IUSE="+hatchet telepathy xmpp"
-
-CDEPEND="
-   $(add_frameworks_dep attica)
-   $(add_qt_dep designer)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebkit)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   app-crypt/qca:2[qt5]
-   dev-cpp/lucene++
-   dev-cpp/sparsehash
-   dev-libs/boost:=
-   dev-libs/qtkeychain:=[qt5]
-   >=dev-libs/quazip-0.7.2[qt5]
-   >=media-libs/libechonest-2.3.1:=[qt5]
-   media-libs/liblastfm[qt5]
-   >=media-libs/taglib-1.8.0
-   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-   >=net-libs/gnutls-3.2:=
-   x11-libs/libX11
-   hatchet? ( dev-cpp/websocketpp )
-   telepathy? ( net-libs/telepathy-qt[qt5] )
-   xmpp? ( net-libs/jreen[qt5] )
-"
-DEPEND="${CDEPEND}
-   $(add_qt_dep linguist-tools)
-   $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-   app-crypt/qca:2[ssl]
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_CRASHREPORTER=OFF
-   -DBUILD_TESTS=OFF
-   -DBUILD_TOOLS=OFF
-   -DBUILD_WITH_QT4=OFF
-   -DWITH_KDE4=OFF
-   -DBUILD_HATCHET=$(usex hatchet)
-   -DWITH_TelepathyQt=$(usex telepathy)
-   -DWITH_Jreen=$(usex xmpp)
-   )
-
-   if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   mycmakeargs+=( -DBUILD_RELEASE=ON )
-   fi
-
-   kde5_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2017-02-20 Thread Andreas Sturmlechner

commit: 1de2a4f7d218dede710d276c6d51f04f7c7985b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb 21 00:40:38 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 21 00:44:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de2a4f7

media-sound/tomahawk: Drop media-libs/libechonest

Upstream commit ed9a02764431d9e2bb29c479db23396a647ed842

Gentoo-bug: 591796

Package-Manager: portage-2.3.3

 ...mahawk-.ebuild => tomahawk-0.9.0_pre20161029-r1.ebuild} | 10 +-
 media-sound/tomahawk/tomahawk-.ebuild  |  7 +++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
similarity index 88%
copy from media-sound/tomahawk/tomahawk-.ebuild
copy to media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
index 5e61a7e281..2287e3c5a2 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,14 +7,15 @@ EAPI=6
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
+   # SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
+   SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz;
KEYWORDS="~amd64 ~x86"
 else
EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
 fi
 
 DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/;
+HOMEPAGE="https://tomahawk-player.org/;
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
@@ -22,7 +23,6 @@ IUSE="+hatchet telepathy xmpp"
 
 CDEPEND="
$(add_frameworks_dep attica)
-   $(add_qt_dep designer)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
@@ -38,7 +38,6 @@ CDEPEND="
dev-libs/boost:=
dev-libs/qtkeychain:=[qt5]
>=dev-libs/quazip-0.7.2[qt5]
-   >=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0
media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
@@ -49,6 +48,7 @@ CDEPEND="
xmpp? ( net-libs/jreen[qt5] )
 "
 DEPEND="${CDEPEND}
+   $(add_qt_dep designer)
$(add_qt_dep linguist-tools)
$(add_qt_dep qtconcurrent)
 "

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 5e61a7e281..2438e72649 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Multi-source social music player"
-HOMEPAGE="http://tomahawk-player.org/;
+HOMEPAGE="https://tomahawk-player.org/;
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
@@ -22,7 +22,6 @@ IUSE="+hatchet telepathy xmpp"
 
 CDEPEND="
$(add_frameworks_dep attica)
-   $(add_qt_dep designer)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
@@ -38,7 +37,6 @@ CDEPEND="
dev-libs/boost:=
dev-libs/qtkeychain:=[qt5]
>=dev-libs/quazip-0.7.2[qt5]
-   >=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0
media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
@@ -49,6 +47,7 @@ CDEPEND="
xmpp? ( net-libs/jreen[qt5] )
 "
 DEPEND="${CDEPEND}
+   $(add_qt_dep designer)
$(add_qt_dep linguist-tools)
$(add_qt_dep qtconcurrent)
 "

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-10-29 Thread Johannes Huber

commit: 08cb681f8c0844f7fc7fffdac14a5345302da0ea
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct 29 10:44:31 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct 29 10:46:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08cb681f

media-sound/tomahawk: Version bump 0.9.0 pre snapshot

Last release is ancient, segfaults with Qt5 (bug #591344) and fails to build
with latest quazip (bug #598262).

Gentoo-bug: 591344
Gentoo-bug: 598262

Package-Manager: portage-2.3.2

 media-sound/tomahawk/Manifest  |  1 +
 .../tomahawk/tomahawk-0.9.0_pre20161029.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 3187743..e64b76d 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1 +1,2 @@
 DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 
0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 
5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7
 WHIRLPOOL 
3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013
+DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 
de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 
fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
 WHIRLPOOL 
b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa65e17433dc268f2c317537716c31928f6

diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029.ebuild 
b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029.ebuild
new file mode 100644
index ..43d4b28
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   # SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
+   SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz;
+   KEYWORDS="~amd64 ~x86"
+else
+   EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="http://tomahawk-player.org/;
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="+hatchet telepathy xmpp"
+
+CDEPEND="
+   $(add_frameworks_dep attica)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   app-crypt/qca:2[qt5]
+   dev-cpp/lucene++
+   dev-cpp/sparsehash
+   dev-libs/boost:=
+   dev-libs/qtkeychain:=[qt5]
+   >=dev-libs/quazip-0.7.2[qt5]
+   >=media-libs/libechonest-2.3.1:=[qt5]
+   media-libs/liblastfm[qt5]
+   >=media-libs/taglib-1.8.0
+   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
+   >=net-libs/gnutls-3.2:=
+   x11-libs/libX11
+   hatchet? ( dev-cpp/websocketpp )
+   telepathy? ( net-libs/telepathy-qt[qt5] )
+   xmpp? ( net-libs/jreen[qt5] )
+"
+DEPEND="${CDEPEND}
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${CDEPEND}
+   app-crypt/qca:2[ssl]
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_CRASHREPORTER=OFF
+   -DBUILD_TESTS=OFF
+   -DBUILD_TOOLS=OFF
+   -DBUILD_WITH_QT4=OFF
+   -DWITH_KDE4=OFF
+   -DBUILD_HATCHET=$(usex hatchet)
+   -DWITH_TelepathyQt=$(usex telepathy)
+   -DWITH_Jreen=$(usex xmpp)
+   )
+
+   if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   mycmakeargs+=( -DBUILD_RELEASE=ON )
+   fi
+
+   kde5_src_configure
+}

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

2016-10-29 Thread Johannes Huber

commit: 1e9ac26727286ba78c253684af3bf3ca71bebfd3
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct 29 10:46:40 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct 29 10:46:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9ac267

media-sound/tomahawk: Remove 0.8.4 (r3)

Package-Manager: portage-2.3.2

 media-sound/tomahawk/Manifest  |   1 -
 .../files/tomahawk-0.8.4-echonest231.patch | 168 -
 .../files/tomahawk-0.8.4-qca-qt5-linking.patch |  70 -
 .../tomahawk/files/tomahawk-0.8.4-qt55.patch   |  34 -
 .../files/tomahawk-0.8.4-taglib-1.10.patch |  35 -
 media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild  | 108 -
 6 files changed, 416 deletions(-)

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index e64b76d..c02148b 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,2 +1 @@
-DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 
0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 
5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7
 WHIRLPOOL 
3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013
 DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 
de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 
fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9
 WHIRLPOOL 
b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa65e17433dc268f2c317537716c31928f6

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch 
b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
deleted file mode 100644
index 537fa1d..
--- a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-commit 778b8ee180480e4296fe96d2496b740df8365f02
-Author: Dominik Schmidt 
-Date:   Fri Feb 6 22:48:54 2015 +0100
-
-Use new echonest5 include dir for Qt5
-
-diff --git a/CMakeModules/FindEchonest.cmake b/CMakeModules/FindEchonest.cmake
-index 2a3625e..1459372 100644
 a/CMakeModules/FindEchonest.cmake
-+++ b/CMakeModules/FindEchonest.cmake
-@@ -13,7 +13,7 @@ endif()
- 
- PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
- 
--FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
-+FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
- HINTS
- ${PC_ECHONEST_INCLUDEDIR}
- ${PC_ECHONEST_INCLUDE_DIRS}
-diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.cpp 
b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
-index 92e8c11..a17c4a4 100644
 a/src/infoplugins/generic/echonest/EchonestPlugin.cpp
-+++ b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
-@@ -23,7 +23,11 @@
- #include "utils/Logger.h"
- #include "utils/NetworkAccessManager.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include 
-+#else
- #include 
-+#endif
- 
- #include 
- 
-diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.h 
b/src/infoplugins/generic/echonest/EchonestPlugin.h
-index 7388b38..40edd0c 100644
 a/src/infoplugins/generic/echonest/EchonestPlugin.h
-+++ b/src/infoplugins/generic/echonest/EchonestPlugin.h
-@@ -25,7 +25,11 @@
- #include "infosystem/InfoSystem.h"
- #include "infosystem/InfoSystemWorker.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include 
-+#else
- #include 
-+#endif
- 
- #include 
- 
-diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp 
b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
-index cb70ed8..5d030c7 100644
 a/src/libtomahawk/EchonestCatalogSynchronizer.cpp
-+++ b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
-@@ -33,8 +33,13 @@
- #include "TomahawkSettings.h"
- #include "Track.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include 
-+#include 
-+#else
- #include 
- #include 
-+#endif
- 
- using namespace Tomahawk;
- 
-diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.h 
b/src/libtomahawk/EchonestCatalogSynchronizer.h
-index 50d7cc2..0e7a5ac 100644
 a/src/libtomahawk/EchonestCatalogSynchronizer.h
-+++ b/src/libtomahawk/EchonestCatalogSynchronizer.h
-@@ -22,7 +22,11 @@
- #include "DllMacro.h"
- #include "Query.h"
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include 
-+#else
- #include 
-+#endif
- 
- #include 
- #include 
-diff --git a/src/libtomahawk/GlobalActionManager.cpp 
b/src/libtomahawk/GlobalActionManager.cpp
-index 1b14bb2..24f0ad1 100644
 a/src/libtomahawk/GlobalActionManager.cpp
-+++ b/src/libtomahawk/GlobalActionManager.cpp
-@@ -61,8 +61,12 @@
- #include 
- #include 
- 
--#include 
- 
-+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-+#include 
-+#else
-+#include 
-+#endif
- 
-

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

2016-10-28 Thread Johannes Huber

commit: 3452b9b6889dfa420bca27f2ddf9fdb531abc530
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 28 20:38:30 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 28 20:40:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3452b9b6

media-sound/tomahawk: Fix live /w latest dev-libs/quazip

Package-Manager: portage-2.3.2

 .../tomahawk/files/tomahawk-quazip-cmake.patch | 67 --
 media-sound/tomahawk/tomahawk-.ebuild  |  7 +--
 2 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch 
b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
deleted file mode 100644
index 7972056..
--- a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/CMakeModules/FindQuaZip.cmake b/CMakeModules/FindQuaZip.cmake
-deleted file mode 100644
-index 7e628fc..000
 a/CMakeModules/FindQuaZip.cmake
-+++ /dev/null
-@@ -1,43 +0,0 @@
--# QUAZIP_FOUND   - QuaZip library was found
--# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
--# QUAZIP_INCLUDE_DIRS- Path to QuaZip and zlib include dir (combined 
from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
--# QUAZIP_LIBRARIES   - List of QuaZip libraries
--# QUAZIP_ZLIB_INCLUDE_DIR- The include dir of zlib headers
--
--
--IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
--  # in cache already
--  SET(QUAZIP_FOUND TRUE)
--ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
--IF (Qt5Core_FOUND)
--set(QUAZIP_LIB_VERSION_SUFFIX 5)
--ENDIF()
--  IF (WIN32)
--  FIND_PATH(QUAZIP_LIBRARY_DIR
--  WIN32_DEBUG_POSTFIX d
--NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
--  HINTS "C:/Programme/" "C:/Program Files"
--  PATH_SUFFIXES QuaZip/lib
--  )
--FIND_LIBRARY(QUAZIP_LIBRARIES NAMES 
libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
--  FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS 
${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES 
include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
--  FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
--  ELSE(WIN32)
--  FIND_PACKAGE(PkgConfig)
--# pkg_check_modules(PC_QCA2 QUIET qca2)
--  pkg_check_modules(PC_QUAZIP quazip)
--  FIND_LIBRARY(QUAZIP_LIBRARIES
--  WIN32_DEBUG_POSTFIX d
--NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
--  HINTS /usr/lib /usr/lib64
--  )
--  FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
--  HINTS /usr/include /usr/local/include
--  PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
--  )
--  FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include 
/usr/local/include)
--  ENDIF (WIN32)
--  INCLUDE(FindPackageHandleStandardArgs)
--  SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} 
${QUAZIP_ZLIB_INCLUDE_DIR})
--  find_package_handle_standard_args(QUAZIP DEFAULT_MSG  QUAZIP_LIBRARIES 
QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
--ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
-diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp 
b/src/libtomahawk/utils/TomahawkUtils.cpp
-index 0baa27c..74b403b 100644
 a/src/libtomahawk/utils/TomahawkUtils.cpp
-+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
-@@ -39,13 +39,8 @@
- #endif
- #endif
- 
--#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
--#include 
--#include 
--#else
- #include 
- #include 
--#endif
- // We need this for the version info (if available)
- #include 
- 

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 62a586d..5e61a7e 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -37,7 +37,7 @@ CDEPEND="
dev-cpp/sparsehash
dev-libs/boost:=
dev-libs/qtkeychain:=[qt5]
-   dev-libs/quazip[qt5]
+   >=dev-libs/quazip-0.7.2[qt5]
>=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0
@@ -58,10 +58,7 @@ RDEPEND="${CDEPEND}
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=(
-   "${FILESDIR}/${PN}-quazip-cmake.patch"
-   "${FILESDIR}/${PN}-liblastfm-cmake.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-10-28 Thread Johannes Huber

commit: 61ef420fc99b0847a69f3a3fdc997a28f25279d7
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 28 20:40:27 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 28 20:40:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ef420f

media-sound/tomahawk: Restrict latest dev-libs/quazip

Needs patching/backporting.

Package-Manager: portage-2.3.2

 media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild 
b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
index e11b09b..2c4d55b 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
@@ -38,7 +38,7 @@ DEPEND="
>=dev-libs/libattica-0.4.0
dev-libs/qjson
dev-libs/qtkeychain:=[qt4]
-   dev-libs/quazip[qt4]
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-06-16 Thread Michael Palimaka

commit: 1691d025371fbdd151bdb4c10e5774127c864936
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun 16 20:19:06 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun 16 20:30:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1691d025

media-sound/tomahawk: fix net-libs/jreen USE dependency

Package-Manager: portage-2.3.0_rc1

 media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild 
b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
index 819ac42..57847fe 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
@@ -33,7 +33,6 @@ DEPEND="
>=net-libs/gnutls-3.2:=
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )
-   xmpp? ( net-libs/jreen )
!qt5? (
app-crypt/qca:2[qt4(+)]
>=dev-libs/libattica-0.4.0
@@ -51,6 +50,7 @@ DEPEND="
>=media-libs/libechonest-2.3.1:=[qt4]
media-libs/liblastfm[qt4]
telepathy? ( net-libs/telepathy-qt[qt4] )
+   xmpp? ( net-libs/jreen[qt4] )
)
qt5? (
app-crypt/qca:2[qt5(+)]
@@ -66,6 +66,7 @@ DEPEND="
>=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
telepathy? ( net-libs/telepathy-qt[qt5] )
+   xmpp? ( net-libs/jreen[qt5] )
)
 "
 RDEPEND="${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-05-23 Thread Johannes Huber

commit: 70af631a69da96b61ef6c04c0b27c2306b9d750d
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 23 20:03:08 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May 23 20:04:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70af631a

media-sound/tomahawk: Use subslot on dev-libs/qtkeychain

Package-Manager: portage-2.3.0_rc1

 media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild | 4 ++--
 media-sound/tomahawk/tomahawk-.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild 
b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
index 474228f..819ac42 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
@@ -38,7 +38,7 @@ DEPEND="
app-crypt/qca:2[qt4(+)]
>=dev-libs/libattica-0.4.0
dev-libs/qjson
-   dev-libs/qtkeychain[qt4]
+   dev-libs/qtkeychain:=[qt4]
dev-libs/quazip[qt4]
dev-qt/designer:4
dev-qt/qtcore:4
@@ -54,7 +54,7 @@ DEPEND="
)
qt5? (
app-crypt/qca:2[qt5(+)]
-   dev-libs/qtkeychain[qt5]
+   dev-libs/qtkeychain:=[qt5]
dev-libs/quazip[qt5]
dev-qt/designer:5
dev-qt/qtcore:5

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 9c6f066..c3d5f0c 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -36,7 +36,7 @@ CDEPEND="
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost:=
-   dev-libs/qtkeychain[qt5]
+   dev-libs/qtkeychain:=[qt5]
dev-libs/quazip[qt5]
>=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-05-13 Thread Johannes Huber

commit: 2e4c6f16c32c1d04c349f6f7920879cd51144d30
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 13 15:42:38 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri May 13 15:42:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4c6f16

media-sound/tomahawk: Use subslot on net-libs/gnutls

Package-Manager: portage-2.2.28

 .../tomahawk/{tomahawk-0.8.4-r2.ebuild => tomahawk-0.8.4-r3.ebuild} | 2 +-
 media-sound/tomahawk/tomahawk-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild 
b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
similarity index 98%
rename from media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
rename to media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
index 535e1ab..474228f 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r3.ebuild
@@ -30,7 +30,7 @@ DEPEND="
dev-cpp/sparsehash
dev-libs/boost:=
>=media-libs/taglib-1.8.0
-   >=net-libs/gnutls-3.2
+   >=net-libs/gnutls-3.2:=
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )
xmpp? ( net-libs/jreen )

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index bacc86d..9c6f066 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0
media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-   >=net-libs/gnutls-3.2
+   >=net-libs/gnutls-3.2:=
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )
telepathy? ( net-libs/telepathy-qt[qt5] )

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-05-02 Thread Johannes Huber

commit: bc6113544d6253136b66dc1c6ddedce8c6c965eb
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May  2 08:09:22 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May  2 08:09:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc611354

media-sound/tomahawk: Add use dependencies on media-video/vlc

Reported-by: theli on irc

Package-Manager: portage-2.2.28

 media-sound/tomahawk/tomahawk-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index f5b3f10..bacc86d 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
>=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
>=media-libs/taglib-1.8.0
-   media-video/vlc:=
+   media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
>=net-libs/gnutls-3.2
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-04-27 Thread Johannes Huber

commit: 7edb8a732d068fd1048380d376989b77cece4135
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Apr 27 07:41:25 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Apr 27 07:41:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edb8a73

media-sound/tomahawk: Update dependencies in live

Upstream replaced media-libs/phonon with media-video/vlc for audio support.

Package-Manager: portage-2.2.28

 media-sound/tomahawk/tomahawk-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 8dadfa9..f5b3f10 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -11,7 +11,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
 else
EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
-   KEYWORDS=""
 fi
 
 DESCRIPTION="Multi-source social music player"
@@ -41,8 +40,8 @@ CDEPEND="
dev-libs/quazip[qt5]
>=media-libs/libechonest-2.3.1:=[qt5]
media-libs/liblastfm[qt5]
-   media-libs/phonon[qt5]
>=media-libs/taglib-1.8.0
+   media-video/vlc:=
>=net-libs/gnutls-3.2
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )

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

2016-04-18 Thread Johannes Huber

commit: 45ba63de05def5964878124c0e1a59af71711263
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 18 20:09:49 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 18 20:10:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ba63de

media-sound/tomahawk: Fix build with echonest 2.3.1

Backport upstream patch to fix build with media-libs/libechonest-2.3.1.
Unfortunately this bug release delivers breakage by introducing suffix for qt5.
At the time where tomahawk 0.8.4 was released this suffix doesn't exist and the
build system ignores it. This was fixed in master in the meantime.

Gentoo-bug: 578570

Package-Manager: portage-2.2.28

 .../files/tomahawk-0.8.4-echonest231.patch | 168 +
 media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild  |   5 +-
 media-sound/tomahawk/tomahawk-.ebuild  |   2 +-
 3 files changed, 172 insertions(+), 3 deletions(-)

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch 
b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
new file mode 100644
index 000..537fa1d
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-echonest231.patch
@@ -0,0 +1,168 @@
+commit 778b8ee180480e4296fe96d2496b740df8365f02
+Author: Dominik Schmidt 
+Date:   Fri Feb 6 22:48:54 2015 +0100
+
+Use new echonest5 include dir for Qt5
+
+diff --git a/CMakeModules/FindEchonest.cmake b/CMakeModules/FindEchonest.cmake
+index 2a3625e..1459372 100644
+--- a/CMakeModules/FindEchonest.cmake
 b/CMakeModules/FindEchonest.cmake
+@@ -13,7 +13,7 @@ endif()
+ 
+ PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
+ 
+-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
++FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
+ HINTS
+ ${PC_ECHONEST_INCLUDEDIR}
+ ${PC_ECHONEST_INCLUDE_DIRS}
+diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.cpp 
b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
+index 92e8c11..a17c4a4 100644
+--- a/src/infoplugins/generic/echonest/EchonestPlugin.cpp
 b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
+@@ -23,7 +23,11 @@
+ #include "utils/Logger.h"
+ #include "utils/NetworkAccessManager.h"
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
+ #include 
++#endif
+ 
+ #include 
+ 
+diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.h 
b/src/infoplugins/generic/echonest/EchonestPlugin.h
+index 7388b38..40edd0c 100644
+--- a/src/infoplugins/generic/echonest/EchonestPlugin.h
 b/src/infoplugins/generic/echonest/EchonestPlugin.h
+@@ -25,7 +25,11 @@
+ #include "infosystem/InfoSystem.h"
+ #include "infosystem/InfoSystemWorker.h"
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
+ #include 
++#endif
+ 
+ #include 
+ 
+diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp 
b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
+index cb70ed8..5d030c7 100644
+--- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp
 b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
+@@ -33,8 +33,13 @@
+ #include "TomahawkSettings.h"
+ #include "Track.h"
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#include 
++#else
+ #include 
+ #include 
++#endif
+ 
+ using namespace Tomahawk;
+ 
+diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.h 
b/src/libtomahawk/EchonestCatalogSynchronizer.h
+index 50d7cc2..0e7a5ac 100644
+--- a/src/libtomahawk/EchonestCatalogSynchronizer.h
 b/src/libtomahawk/EchonestCatalogSynchronizer.h
+@@ -22,7 +22,11 @@
+ #include "DllMacro.h"
+ #include "Query.h"
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
+ #include 
++#endif
+ 
+ #include 
+ #include 
+diff --git a/src/libtomahawk/GlobalActionManager.cpp 
b/src/libtomahawk/GlobalActionManager.cpp
+index 1b14bb2..24f0ad1 100644
+--- a/src/libtomahawk/GlobalActionManager.cpp
 b/src/libtomahawk/GlobalActionManager.cpp
+@@ -61,8 +61,12 @@
+ #include 
+ #include 
+ 
+-#include 
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
++#include 
++#endif
+ 
+ GlobalActionManager* GlobalActionManager::s_instance = 0;
+ 
+diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h 
b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+index b12108e..5704f35 100644
+--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
 b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+@@ -24,7 +24,11 @@
+ #include 
+ #include 
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
++#include 
++#else
+ #include 
++#endif
+ 
+ namespace Tomahawk
+ {
+diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h 
b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+index 5ed250c..adb6e6c 100644
+--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
 b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+@@ -28,7 +28,12 @@
+ 
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-04-15 Thread Johannes Huber

commit: 89e8e22d008b44a54af3585e7ed240bbd3584550
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr 15 18:48:06 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Apr 15 18:48:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e8e22d

media-sound/tomahawk: Drop Qt4 support in live

Upstream says it is unmaintained and broken.

Package-Manager: portage-2.2.28

 media-sound/tomahawk/tomahawk-.ebuild | 87 ---
 1 file changed, 32 insertions(+), 55 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 7aff77b..89198fe 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -4,14 +4,12 @@
 
 EAPI=6
 
-KDE_REQUIRED="optional"
-inherit kde4-base
+inherit kde5
 
-if [[ ${PV} != ** ]]; then
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
KEYWORDS="~amd64 ~x86"
 else
-   inherit git-r3
EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
KEYWORDS=""
 fi
@@ -21,54 +19,41 @@ HOMEPAGE="http://tomahawk-player.org/;
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug +hatchet kde qt5 telepathy xmpp"
+IUSE="+hatchet telepathy xmpp"
 
-REQUIRED_USE="telepathy? ( kde )"
-
-DEPEND="
+CDEPEND="
+   $(add_frameworks_dep attica)
+   $(add_qt_dep designer)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   app-crypt/qca:2[qt5]
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost:=
+   dev-libs/qtkeychain[qt5]
+   dev-libs/quazip[qt5]
+   >=media-libs/libechonest-2.3.0:=[qt5]
+   media-libs/liblastfm[qt5]
+   media-libs/phonon[qt5]
>=media-libs/taglib-1.8.0
>=net-libs/gnutls-3.2
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )
-   xmpp? ( net-libs/jreen )
-   !qt5? (
-   app-crypt/qca:2[qt4]
-   >=dev-libs/libattica-0.4.0
-   dev-libs/qjson
-   dev-libs/qtkeychain[qt4]
-   dev-libs/quazip[qt4]
-   dev-qt/designer:4
-   dev-qt/qtcore:4
-   dev-qt/qtdbus:4
-   dev-qt/qtgui:4
-   dev-qt/qtsql:4[sqlite]
-   dev-qt/qtsvg:4
-   dev-qt/qtwebkit:4
-   media-libs/phonon[qt4]
-   >=media-libs/libechonest-2.3.0:=[qt4]
-   media-libs/liblastfm[qt4]
-   telepathy? ( net-libs/telepathy-qt[qt4] )
-   )
-   qt5? (
-   app-crypt/qca:2[qt5]
-   dev-libs/qtkeychain[qt5]
-   dev-libs/quazip[qt5]
-   dev-qt/designer:5
-   dev-qt/qtcore:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebkit:5
-   dev-qt/qtwidgets:5
-   kde-frameworks/attica:5
-   media-libs/phonon[qt5]
-   >=media-libs/libechonest-2.3.0:=[qt5]
-   media-libs/liblastfm[qt5]
-   telepathy? ( net-libs/telepathy-qt[qt5] )
-   )
+   telepathy? ( net-libs/telepathy-qt[qt5] )
+   xmpp? ( net-libs/jreen[qt5] )
+"
+DEPEND="${CDEPEND}
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtconcurrent)
 "
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
app-crypt/qca:2[openssl]
 "
 
@@ -84,24 +69,16 @@ src_configure() {
-DWITH_CRASHREPORTER=OFF
-DBUILD_TESTS=OFF
-DBUILD_TOOLS=OFF
+   -DBUILD_WITH_QT4=OFF
+   -DWITH_KDE4=OFF
-DBUILD_HATCHET=$(usex hatchet)
-   -DWITH_KDE4=$(usex kde)
-   -DBUILD_WITH_QT4=$(usex !qt5)
-DWITH_TelepathyQt=$(usex telepathy)
-DWITH_Jreen=$(usex xmpp)
)
 
-   if [[ ${PV} != ** ]]; then
+   if [[ ${KDE_BUILD_TYPE} != live ]]; then
mycmakeargs+=( -DBUILD_RELEASE=ON )
fi
 
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-}
-
-src_install() {
-   cmake-utils_src_install
+   kde5_src_configure
 }

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

2016-04-11 Thread Johannes Huber

commit: f6d756fe90250378eab32f0622f25b79fdffc825
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 11 11:54:14 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 11 16:50:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d756fe

media-sound/tomahawk: Fix live build

Package-Manager: portage-2.2.28

 .../tomahawk/files/tomahawk-liblastfm-cmake.patch  | 126 +
 .../tomahawk/files/tomahawk-quazip-cmake.patch |  67 +++
 media-sound/tomahawk/tomahawk-.ebuild  |   5 +
 3 files changed, 198 insertions(+)

diff --git a/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch 
b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch
new file mode 100644
index 000..763397c
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch
@@ -0,0 +1,126 @@
+diff --git a/CMakeModules/FindLibLastFm.cmake 
b/CMakeModules/FindLibLastFm.cmake
+index a348835..545e39f 100644
+--- a/CMakeModules/FindLibLastFm.cmake
 b/CMakeModules/FindLibLastFm.cmake
+@@ -14,7 +14,7 @@ endif()
+ # Include dir
+ find_path(LIBLASTFM_INCLUDE_DIR
+   # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
+-  NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h
++  NAMES lastfm/Track.h
+   PATHS ${KDE4_INCLUDE_DIR}
+ )
+ 
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp 
b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+index 85b747b..098e460 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
 b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+@@ -29,17 +29,10 @@
+ #include "utils/Closure.h"
+ #include "utils/NetworkAccessManager.h"
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include 
+-#include 
+-#include 
+-#include 
+-#else
+ #include 
+ #include 
+ #include 
+ #include 
+-#endif
+ 
+ using namespace Tomahawk::Accounts;
+ 
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp 
b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+index 277a62e..cea29a1 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
 b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+@@ -34,13 +34,8 @@
+ #include "TomahawkSettings.h"
+ #include "utils/NetworkAccessManager.h"
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include 
+-#include 
+-#else
+ #include 
+ #include 
+-#endif
+ 
+ using namespace Tomahawk::Accounts;
+ using namespace Tomahawk::InfoSystem;
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h 
b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+index 0eb3b07..6e202b2 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
 b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+@@ -24,15 +24,9 @@
+ #include "infosystem/InfoSystemWorker.h"
+ #include "DllMacro.h"
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include 
+-#include 
+-#include 
+-#else
+ #include 
+ #include 
+ #include 
+-#endif
+ 
+ #include 
+ 
+diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp 
b/src/libtomahawk/utils/TomahawkUtils.cpp
+index 0baa27c..cf808d9 100644
+--- a/src/libtomahawk/utils/TomahawkUtils.cpp
 b/src/libtomahawk/utils/TomahawkUtils.cpp
+@@ -32,11 +32,7 @@
+ #include "Track.h"
+ 
+ #ifdef LIBLASTFM_FOUND
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include 
+-#else
+ #include 
+-#endif
+ #endif
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+diff --git a/src/tomahawk/Scrobbler.h b/src/tomahawk/Scrobbler.h
+index 01c2695..fab0ca6 100644
+--- a/src/tomahawk/Scrobbler.h
 b/src/tomahawk/Scrobbler.h
+@@ -20,15 +20,10 @@
+ #ifndef TOMAHAWK_SCROBBLER_H
+ #define TOMAHAWK_SCROBBLER_H
+ 
++#include "lastfm/ScrobblePoint.h"
+ #include "Result.h"
+ #include "infosystem/InfoSystem.h"
+ 
+-
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include 
+-#else
+-#include 
+-#endif
+ #include 
+ 
+ /**
+diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h
+index 953140b..c161d07 100644
+--- a/src/tomahawk/TomahawkApp.h
 b/src/tomahawk/TomahawkApp.h
+@@ -64,11 +64,7 @@ namespace Tomahawk
+ }
+ 
+ #ifdef LIBLASTFM_FOUND
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include 
+-#else
+ #include 
+-#endif
+ #include "Scrobbler.h"
+ #endif
+ 

diff --git a/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch 
b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
new file mode 100644
index 000..7972056
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-quazip-cmake.patch
@@ -0,0 +1,67 @@
+diff --git a/CMakeModules/FindQuaZip.cmake b/CMakeModules/FindQuaZip.cmake
+deleted file mode 100644
+index 7e628fc..000
+--- a/CMakeModules/FindQuaZip.cmake
 /dev/null
+@@ -1,43 +0,0 @@
+-# QUAZIP_FOUND   - QuaZip library was found
+-# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
+-# QUAZIP_INCLUDE_DIRS- Path to QuaZip and zlib include dir (combined 
from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+-# QUAZIP_LIBRARIES   - List of

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

2016-04-11 Thread Johannes Huber

commit: 63488059efef2b291c7c86f77dcbfb8b3b365cdb
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 11 16:47:55 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 11 16:50:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63488059

media-sound/tomahawk: EAPI 6

Package-Manager: portage-2.2.28

 media-sound/tomahawk/tomahawk-.ebuild | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 10d684f..f93c527 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_REQUIRED="optional"
-inherit kde4-base ${GIT_ECLASS}
+inherit kde4-base
 
 if [[ ${PV} != ** ]]; then
SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2;
KEYWORDS="~amd64 ~x86"
 else
-   GIT_ECLASS="git-r3"
+   inherit git-r3
EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
KEYWORDS=""
 fi
@@ -77,11 +77,13 @@ DOCS=( AUTHORS ChangeLog README.md )
 src_configure() {
local mycmakeargs=(
-DWITH_CRASHREPORTER=OFF
-   $(cmake-utils_use_build hatchet)
-   $(cmake-utils_use_with xmpp Jreen)
-   $(cmake-utils_use_with kde KDE4)
-   $(cmake-utils_use_build !qt5 WITH_QT4)
-   $(cmake-utils_use_with telepathy TelepathyQt)
+   -DBUILD_TESTS=OFF
+   -DBUILD_TOOLS=OFF
+   -DBUILD_HATCHET=$(usex hatchet)
+   -DWITH_KDE4=$(usex kde)
+   -DBUILD_WITH_QT4=$(usex !qt5)
+   -DWITH_TelepathyQt=$(usex telepathy)
+   -DWITH_Jreen=$(usex xmpp)
)
 
if [[ ${PV} != ** ]]; then

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

2016-03-10 Thread Johannes Huber

commit: 47568dd7628758a71f379d14a3863a8e8413c718
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 10 21:08:27 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 10 21:09:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47568dd7

media-sound/tomahawk: Fix segfault on startup with Qt5

Revision bump adds upstream patch to link correctly against qca with Qt5.
Thanks to Jan Kundrát  gentoo.org> for spotting.

Gentoo-bug: 567354

Package-Manager: portage-2.2.27

 .../files/tomahawk-0.8.4-qca-qt5-linking.patch | 70 ++
 ...wk-0.8.4-r1.ebuild => tomahawk-0.8.4-r2.ebuild} |  1 +
 2 files changed, 71 insertions(+)

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch 
b/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch
new file mode 100644
index 000..bc52cc3
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-qca-qt5-linking.patch
@@ -0,0 +1,70 @@
+From 4fa69d9607b95bf74dd86a151b8f77113f04f205 Mon Sep 17 00:00:00 2001
+From: Dominik Schmidt 
+Date: Thu, 29 Jan 2015 06:11:36 +0100
+Subject: [PATCH] Link against correct qca library with Qt5
+
+---
+ CMakeLists.txt  | 10 +-
+ src/accounts/hatchet/CMakeLists.txt |  1 -
+ src/libtomahawk/CMakeLists.txt  |  5 +
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6db3741..65eebb1 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -325,7 +325,15 @@ macro_log_feature(GNUTLS_FOUND "GnuTLS"
+ "http://gnutls.org/; TRUE ""
+ "GnuTLS is needed for serving the Playdar/HTTP API via TLS")
+ 
+-macro_optional_find_package(QCA2)
++if( TOMAHAWK_QT5 )
++  macro_optional_find_package(Qca-qt5)
++  if(Qca-qt5_DIR)
++  set(QCA2_FOUND ON CACHE BOOL "QCA2 was found")
++  set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target")
++  endif()
++else()
++  macro_optional_find_package(QCA2)
++endif()
+ macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing 
functions necessary for some resolvers and accounts" 
"http://delta.affinix.com/qca/; TRUE "" "")
+ 
+ if( TOMAHAWK_QT5 )
+diff --git a/src/accounts/hatchet/CMakeLists.txt 
b/src/accounts/hatchet/CMakeLists.txt
+index eb082ff..86ebee4 100644
+--- a/src/accounts/hatchet/CMakeLists.txt
 b/src/accounts/hatchet/CMakeLists.txt
+@@ -13,7 +13,6 @@ endif()
+ include( ${TOMAHAWK_USE_FILE} )
+ 
+ find_package(OpenSSL REQUIRED)
+-find_package(QCA2 REQUIRED)
+ find_package(websocketpp 0.2.99 REQUIRED)
+ 
+ include_directories(
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index 238670e..1e07325 100644
+--- a/src/libtomahawk/CMakeLists.txt
 b/src/libtomahawk/CMakeLists.txt
+@@ -402,10 +402,6 @@ include_directories(
+ ${QTKEYCHAIN_INCLUDE_DIRS}
+ )
+ 
+-IF(QCA2_FOUND)
+-INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
+-ENDIF(QCA2_FOUND)
+-
+ IF(LIBATTICA_FOUND)
+ SET( libGuiSources ${libGuiSources} AtticaManager.cpp )
+ INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} )
+@@ -491,6 +487,7 @@ IF(APPLE)
+ ENDIF()
+ 
+ IF(QCA2_FOUND)
++INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
+ LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} )
+ ENDIF(QCA2_FOUND)
+ 
+-- 
+1.8.3.2
+

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild 
b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
similarity index 98%
rename from media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
rename to media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
index 77374a3..11314ce 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r2.ebuild
@@ -77,6 +77,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 PATCHES=(
"${FILESDIR}/${P}-qt55.patch"
"${FILESDIR}/${P}-taglib-1.10.patch"
+   "${FILESDIR}/${P}-qca-qt5-linking.patch"
 )
 
 src_configure() {

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

2016-02-09 Thread Michael Palimaka

commit: b286a18e55066222770c7fa341a5fef0afcd0239
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Feb  9 15:07:14 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Feb  9 15:07:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b286a18e

media-sound/tomahawk: backport patch from upstream solving build failure with 
>=media-libs/taglib-1.10

Gentoo-bug: 574078

Package-Manager: portage-2.2.27

 .../files/tomahawk-0.8.4-taglib-1.10.patch | 35 ++
 media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild  |  7 +++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch 
b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
new file mode 100644
index 000..ff86225
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
@@ -0,0 +1,35 @@
+From ee4656383a92a78299aff6f8637f174fff328e98 Mon Sep 17 00:00:00 2001
+From: Pinak Ahuja 
+Date: Wed, 2 Sep 2015 14:41:00 +0530
+Subject: [PATCH] Compare taglib version properly
+
+---
+ CMakeModules/FindTaglib.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
+index e0efbef..f54ff78 100644
+--- a/CMakeModules/FindTaglib.cmake
 b/CMakeModules/FindTaglib.cmake
+@@ -34,10 +34,10 @@ ELSE()
+ 
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE 
_return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+message(STATUS "TagLib version not found: version searched 
:${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+set(TAGLIB_FOUND FALSE)
+-else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ 
+exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs 
RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -48,7 +48,7 @@ ELSE()
+ # message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES 
"${TAGLIB_CFLAGS}")
+-endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+   else(TAGLIBCONFIG_EXECUTABLE)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild 
b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
index 30323bd..77374a3 100644
--- a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -74,7 +74,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-qt55.patch"
+   "${FILESDIR}/${P}-taglib-1.10.patch"
+)
 
 src_configure() {
local mycmakeargs=(

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/, mail-client/trojita/, net-misc/nextcloud-client/, ...

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

[gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/

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

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

36 matches

Site Navigation

Mail list logo

Footer information