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

2016-10-28 Thread Johannes Huber 
commit: 28e7023267eaaa0c9709e24eb474425c2ca0716e
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 28 16:42:55 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 28 16:42:55 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=28e70232

media-sound/tomahawk: Fix use dependency

Package-Manager: portage-2.3.2

 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 c3d5f0c..62a586d 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -53,7 +53,7 @@ DEPEND="${CDEPEND}
$(add_qt_dep qtconcurrent)
 "
 RDEPEND="${CDEPEND}
-   app-crypt/qca:2[openssl]
+   app-crypt/qca:2[ssl]
 "
 
 DOCS=( AUTHORS ChangeLog README.md )

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

2016-05-23 Thread Johannes Huber 
commit: dc5518ca4de45b61d2141d717cc9aad76d7e25b5
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May 23 20:04:17 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May 23 20:04:17 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=dc5518ca

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

Package-Manager: portage-2.3.0_rc1

 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 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] dev/johu:master commit in: media-sound/tomahawk/

2016-05-13 Thread Johannes Huber 
commit: 55c5458c274196e6cd160c421090948bb07cf4e9
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri May 13 15:44:02 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri May 13 15:44:02 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=55c5458c

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

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 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] dev/johu:master commit in: media-sound/tomahawk/

2016-05-02 Thread Johannes Huber 
commit: 8a4b35b04641694c4ab9b507497da891353bd1ac
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May  2 08:11:06 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May  2 08:11:06 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=8a4b35b0

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] dev/johu:master commit in: media-sound/tomahawk/

2016-04-27 Thread Johannes Huber 
commit: 0ea81a1586062c16bc19c2e0da921eb763b3f8de
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Apr 27 09:55:23 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Apr 27 09:55:23 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=0ea81a15

media-sound/tomahawk: Update dependencies

Sync with tree.

Package-Manager: portage-2.2.28

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

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 89198fe..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"
@@ -39,10 +38,10 @@ CDEPEND="
dev-libs/boost:=
dev-libs/qtkeychain[qt5]
dev-libs/quazip[qt5]
-   >=media-libs/libechonest-2.3.0:=[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] dev/johu:master commit in: media-sound/tomahawk/

2016-04-15 Thread Johannes Huber 
commit: b2d87a3b018e97057e2c4e1f607fec91a820cc2e
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr 15 18:46:05 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Apr 15 18:46:05 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=b2d87a3b

media-sound/tomahawk: Drop Qt4 support

Upstream says it is 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] dev/johu:master commit in: media-sound/tomahawk/, media-sound/tomahawk/files/

2016-04-11 Thread Johannes Huber 
commit: 50db16702ac0ff3e316adbe4c6d134c419df2300
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 11 16:53:14 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 11 16:53:14 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=50db1670

media-sound/tomahawk: Sync with tree

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  |  23 ++--
 3 files changed, 208 insertions(+), 8 deletions(-)

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

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

2015-06-19 Thread Johannes Huber 
commit: 21d5a97c436a0f35c07bebe57a42f5fcf67a503b
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jun 19 12:29:42 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jun 19 12:29:42 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=21d5a97c

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.20

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

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 0e29f3a..dbc3200 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -28,8 +28,7 @@ REQUIRED_USE="telepathy? ( kde )"
 DEPEND="
dev-cpp/lucene++
dev-cpp/sparsehash
-   dev-libs/boost
-   dev-libs/quazip
+   dev-libs/boost:=
>=media-libs/taglib-1.8.0
>=net-libs/gnutls-3.2
x11-libs/libX11
@@ -40,6 +39,7 @@ DEPEND="
>=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
@@ -55,6 +55,7 @@ DEPEND="
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

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

2015-05-28 Thread Johannes Huber 
commit: 24d304b87b93989e3bcc3c5e072b895ce13a64c5
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu May 28 21:07:44 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu May 28 21:07:44 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=24d304b8

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.20

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

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index e876b77..0e29f3a 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://tomahawk-player.org/";
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug +hatchet jabber kde qt5 telepathy"
+IUSE="debug +hatchet kde qt5 telepathy xmpp"
 
 REQUIRED_USE="telepathy? ( kde )"
 
@@ -34,7 +34,7 @@ DEPEND="
>=net-libs/gnutls-3.2
x11-libs/libX11
hatchet? ( dev-cpp/websocketpp )
-   jabber? ( net-libs/jreen )
+   xmpp? ( net-libs/jreen )
!qt5? (
app-crypt/qca:2[qt4]
>=dev-libs/libattica-0.4.0
@@ -77,7 +77,7 @@ src_configure() {
local mycmakeargs=(
-DWITH_CRASHREPORTER=OFF
$(cmake-utils_use_build hatchet)
-   $(cmake-utils_use_with jabber Jreen)
+   $(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)

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

2015-02-22 Thread Johannes Huber 
commit: 129f1d69435f412838db967a385e2ae6646da9df
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Feb 22 21:59:38 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Feb 22 21:59:38 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=129f1d69

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.17

---
 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 51298f8..e876b77 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -68,7 +68,7 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}
-   || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+   app-crypt/qca:2[openssl]
 "
 
 DOCS=( AUTHORS ChangeLog README.md )

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

2015-01-29 Thread Johannes Huber 
commit: 36ff1d9773364a36826f23355632b7992cba5c76
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan 29 22:41:44 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan 29 22:41:44 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=36ff1d97

[media-sound/tomahawk] Fix qt5 build

Package-Manager: portage-2.2.15

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

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index e14b939..51298f8 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -25,17 +25,11 @@ IUSE="debug +hatchet jabber kde qt5 telepathy"
 
 REQUIRED_USE="telepathy? ( kde )"
 
-# TODO
-# qt5 use flag needs some work:
-# - deps with missing qt4/qt5 use flags
-# - does not build with in-tree only deps
 DEPEND="
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost
dev-libs/quazip
-   >=media-libs/libechonest-2.2.0:=
-   media-libs/liblastfm
>=media-libs/taglib-1.8.0
>=net-libs/gnutls-3.2
x11-libs/libX11
@@ -54,6 +48,8 @@ DEPEND="
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? (
@@ -66,6 +62,8 @@ DEPEND="
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] )
)
 "

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

2015-01-29 Thread Johannes Huber 
commit: 762b36c66d261a3c56d5513f31cc775924c9476e
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan 29 21:30:37 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan 29 21:30:37 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=762b36c6

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.15

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

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index ccd9b6c..e14b939 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -30,7 +30,6 @@ REQUIRED_USE="telepathy? ( kde )"
 # - deps with missing qt4/qt5 use flags
 # - does not build with in-tree only deps
 DEPEND="
-   app-crypt/qca:2
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost
@@ -43,6 +42,7 @@ DEPEND="
hatchet? ( dev-cpp/websocketpp )
jabber? ( net-libs/jreen )
!qt5? (
+   app-crypt/qca:2[qt4]
>=dev-libs/libattica-0.4.0
dev-libs/qjson
dev-libs/qtkeychain[qt4]
@@ -57,6 +57,7 @@ DEPEND="
telepathy? ( net-libs/telepathy-qt[qt4] )
)
qt5? (
+   app-crypt/qca:2[qt5]
dev-libs/qtkeychain[qt5]
dev-qt/designer:5
dev-qt/qtcore:5
@@ -69,7 +70,7 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}
-   app-crypt/qca-ossl
+   || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 "
 
 DOCS=( AUTHORS ChangeLog README.md )

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

2015-01-16 Thread Johannes Huber 
commit: c8bb2188f64af63ef0e264e01c491688d74989b9
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jan 16 23:28:07 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jan 16 23:28:07 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=c8bb2188

[media-sound/tomahawk] Update dependencies

Package-Manager: portage-2.2.15

---
 media-sound/tomahawk/metadata.xml |  1 +
 media-sound/tomahawk/tomahawk-.ebuild | 15 +--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-sound/tomahawk/metadata.xml 
b/media-sound/tomahawk/metadata.xml
index 21a6857..55e1aa0 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -7,6 +7,7 @@
Johannes Huber


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

 

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index b46f902..ccd9b6c 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,25 +21,26 @@ HOMEPAGE="http://tomahawk-player.org/";
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug jabber kde qt5 telepathy"
+IUSE="debug +hatchet jabber kde qt5 telepathy"
 
 REQUIRED_USE="telepathy? ( kde )"
 
 # TODO
-# qt5 use flag needs a lot of work:
+# qt5 use flag needs some work:
 # - deps with missing qt4/qt5 use flags
 # - does not build with in-tree only deps
 DEPEND="
app-crypt/qca:2
-   >=dev-cpp/clucene-2.3.3.4
+   dev-cpp/lucene++
dev-cpp/sparsehash
-   >=dev-libs/boost-1.41
+   dev-libs/boost
dev-libs/quazip
>=media-libs/libechonest-2.2.0:=
media-libs/liblastfm
>=media-libs/taglib-1.8.0
>=net-libs/gnutls-3.2
x11-libs/libX11
+   hatchet? ( dev-cpp/websocketpp )
jabber? ( net-libs/jreen )
!qt5? (
>=dev-libs/libattica-0.4.0
@@ -53,6 +54,7 @@ DEPEND="
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/phonon[qt4]
+   telepathy? ( net-libs/telepathy-qt[qt4] )
)
qt5? (
dev-libs/qtkeychain[qt5]
@@ -63,8 +65,8 @@ DEPEND="
dev-qt/qtwidgets:5
kde-frameworks/attica:5
media-libs/phonon[qt5]
+   telepathy? ( net-libs/telepathy-qt[qt5] )
)
-   telepathy? ( net-libs/telepathy-qt )
 "
 RDEPEND="${DEPEND}
app-crypt/qca-ossl
@@ -75,6 +77,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 src_configure() {
local mycmakeargs=(
-DWITH_CRASHREPORTER=OFF
+   $(cmake-utils_use_build hatchet)
$(cmake-utils_use_with jabber Jreen)
$(cmake-utils_use_with kde KDE4)
$(cmake-utils_use_build !qt5 WITH_QT4)

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

2014-08-18 Thread Johannes Huber 
commit: 3baffb1f1c9af99eb937545c05bc27878c2ae5fc
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jul 22 16:43:50 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jul 22 16:43:50 2014 +
URL:http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=3baffb1f

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.10

---
 media-sound/tomahawk/metadata.xml |  1 -
 media-sound/tomahawk/tomahawk-.ebuild | 31 +++
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/media-sound/tomahawk/metadata.xml 
b/media-sound/tomahawk/metadata.xml
index c2ec31a..21a6857 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -8,7 +8,6 @@


Enable support for the real-time 
communication framework telepathy
-   Enable twitter support

 
 

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index bf6776f..b46f902 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -16,30 +16,35 @@ else
KEYWORDS=""
 fi
 
-DESCRIPTION="Qt playdar social music player"
+DESCRIPTION="Multi-source social music player"
 HOMEPAGE="http://tomahawk-player.org/";
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug jabber kde qt5 telepathy twitter"
+IUSE="debug jabber kde qt5 telepathy"
 
 REQUIRED_USE="telepathy? ( kde )"
 
+# TODO
+# qt5 use flag needs a lot of work:
+# - deps with missing qt4/qt5 use flags
+# - does not build with in-tree only deps
 DEPEND="
app-crypt/qca:2
>=dev-cpp/clucene-2.3.3.4
+   dev-cpp/sparsehash
>=dev-libs/boost-1.41
-   dev-libs/qjson
dev-libs/quazip
-   dev-libs/qtkeychain
-   >=media-libs/libechonest-2.1.0
-   >=media-libs/liblastfm-1.0.1
-   >=media-libs/phonon-4.5.0
-   >=media-libs/taglib-1.6.0
+   >=media-libs/libechonest-2.2.0:=
+   media-libs/liblastfm
+   >=media-libs/taglib-1.8.0
+   >=net-libs/gnutls-3.2
x11-libs/libX11
-   jabber? ( >=net-libs/jreen-1.1.1 )
+   jabber? ( net-libs/jreen )
!qt5? (
>=dev-libs/libattica-0.4.0
+   dev-libs/qjson
+   dev-libs/qtkeychain[qt4]
dev-qt/designer:4
dev-qt/qtcore:4
dev-qt/qtdbus:4
@@ -47,17 +52,19 @@ DEPEND="
dev-qt/qtsql:4[sqlite]
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
+   media-libs/phonon[qt4]
)
qt5? (
-   >=dev-libs/libattica-0.4.0[qt5]
+   dev-libs/qtkeychain[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]
)
telepathy? ( net-libs/telepathy-qt )
-   twitter? ( net-libs/qtweetlib )
 "
 RDEPEND="${DEPEND}
app-crypt/qca-ossl
@@ -67,11 +74,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_CRASHREPORTER=OFF
$(cmake-utils_use_with jabber Jreen)
$(cmake-utils_use_with kde KDE4)
$(cmake-utils_use_build !qt5 WITH_QT4)
$(cmake-utils_use_with telepathy TelepathyQt)
-   $(cmake-utils_use_with twitter QTweetLib)
)
 
if [[ ${PV} != ** ]]; then

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

2014-07-22 Thread Johannes Huber 
commit: 3baffb1f1c9af99eb937545c05bc27878c2ae5fc
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jul 22 16:43:50 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jul 22 16:43:50 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=3baffb1f

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.10

---
 media-sound/tomahawk/metadata.xml |  1 -
 media-sound/tomahawk/tomahawk-.ebuild | 31 +++
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/media-sound/tomahawk/metadata.xml 
b/media-sound/tomahawk/metadata.xml
index c2ec31a..21a6857 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -8,7 +8,6 @@


Enable support for the real-time 
communication framework telepathy
-   Enable twitter support

 
 

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index bf6776f..b46f902 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -16,30 +16,35 @@ else
KEYWORDS=""
 fi
 
-DESCRIPTION="Qt playdar social music player"
+DESCRIPTION="Multi-source social music player"
 HOMEPAGE="http://tomahawk-player.org/";
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-IUSE="debug jabber kde qt5 telepathy twitter"
+IUSE="debug jabber kde qt5 telepathy"
 
 REQUIRED_USE="telepathy? ( kde )"
 
+# TODO
+# qt5 use flag needs a lot of work:
+# - deps with missing qt4/qt5 use flags
+# - does not build with in-tree only deps
 DEPEND="
app-crypt/qca:2
>=dev-cpp/clucene-2.3.3.4
+   dev-cpp/sparsehash
>=dev-libs/boost-1.41
-   dev-libs/qjson
dev-libs/quazip
-   dev-libs/qtkeychain
-   >=media-libs/libechonest-2.1.0
-   >=media-libs/liblastfm-1.0.1
-   >=media-libs/phonon-4.5.0
-   >=media-libs/taglib-1.6.0
+   >=media-libs/libechonest-2.2.0:=
+   media-libs/liblastfm
+   >=media-libs/taglib-1.8.0
+   >=net-libs/gnutls-3.2
x11-libs/libX11
-   jabber? ( >=net-libs/jreen-1.1.1 )
+   jabber? ( net-libs/jreen )
!qt5? (
>=dev-libs/libattica-0.4.0
+   dev-libs/qjson
+   dev-libs/qtkeychain[qt4]
dev-qt/designer:4
dev-qt/qtcore:4
dev-qt/qtdbus:4
@@ -47,17 +52,19 @@ DEPEND="
dev-qt/qtsql:4[sqlite]
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
+   media-libs/phonon[qt4]
)
qt5? (
-   >=dev-libs/libattica-0.4.0[qt5]
+   dev-libs/qtkeychain[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]
)
telepathy? ( net-libs/telepathy-qt )
-   twitter? ( net-libs/qtweetlib )
 "
 RDEPEND="${DEPEND}
app-crypt/qca-ossl
@@ -67,11 +74,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_CRASHREPORTER=OFF
$(cmake-utils_use_with jabber Jreen)
$(cmake-utils_use_with kde KDE4)
$(cmake-utils_use_build !qt5 WITH_QT4)
$(cmake-utils_use_with telepathy TelepathyQt)
-   $(cmake-utils_use_with twitter QTweetLib)
)
 
if [[ ${PV} != ** ]]; then

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

2014-03-15 Thread Johannes Huber 
commit: ee86e81eb609ec8c6fd14968b65f04908d1f8b68
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Mar 15 14:26:20 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Mar 15 14:26:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=ee86e81e

[media-sound/tomahawk] Sync with tree

Package-Manager: portage-2.2.8-r1

---
 media-sound/tomahawk/tomahawk-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index 3f58275..bf6776f 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -29,10 +29,9 @@ DEPEND="
app-crypt/qca:2
>=dev-cpp/clucene-2.3.3.4
>=dev-libs/boost-1.41
-   >=dev-libs/libattica-0.4.0
dev-libs/qjson
dev-libs/quazip
-   dev-libs/qtkeychain[qt5?]
+   dev-libs/qtkeychain
>=media-libs/libechonest-2.1.0
>=media-libs/liblastfm-1.0.1
>=media-libs/phonon-4.5.0
@@ -40,6 +39,7 @@ DEPEND="
x11-libs/libX11
jabber? ( >=net-libs/jreen-1.1.1 )
!qt5? (
+   >=dev-libs/libattica-0.4.0
dev-qt/designer:4
dev-qt/qtcore:4
dev-qt/qtdbus:4
@@ -49,6 +49,7 @@ DEPEND="
dev-qt/qtwebkit:4
)
qt5? (
+   >=dev-libs/libattica-0.4.0[qt5]
dev-qt/designer:5
dev-qt/qtcore:5
dev-qt/qtsvg:5