From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-sound/tomahawk/Manifest | 8 ++ .../tomahawk/files/tomahawk-liblastfm-cmake.patch | 126 +++++++++++++++++++++ .../tomahawk/files/tomahawk-qtkeychain-cmake.patch | 28 +++++ media-sound/tomahawk/metadata.xml | 16 +++ .../tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild | 82 ++++++++++++++ media-sound/tomahawk/tomahawk-9999.ebuild | 78 +++++++++++++ 6 files changed, 338 insertions(+) create mode 100644 media-sound/tomahawk/Manifest create mode 100644 media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch create mode 100644 media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch create mode 100644 media-sound/tomahawk/metadata.xml create mode 100644 media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild create mode 100644 media-sound/tomahawk/tomahawk-9999.ebuild (limited to 'media-sound/tomahawk') diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest new file mode 100644 index 000000000000..21b891abfeb3 --- /dev/null +++ b/media-sound/tomahawk/Manifest @@ -0,0 +1,8 @@ +AUX tomahawk-liblastfm-cmake.patch 3722 SHA256 a472cf76c7f9ffb3e9c159e5007a7fd179ebc5bedf846e226b5f6694e8de168f SHA512 3e65d70d274abeee63cf98f1ee390157a95d82884678251f77b3257e3f7f042a778c6f346b47b3c5c5a0cfff9ac12e4d05d6bf5de818f0c1f1d433f8cce00e53 WHIRLPOOL caf37635ccb197449509b5b2e4a11c4db6e6c92ec82620a9b5be56fa3c8755476e90d5b9cf59b0c833cab2bcdc75562e6f73678627c900a69a3f5f9676dbccb9 +AUX tomahawk-qtkeychain-cmake.patch 1262 SHA256 efa0558274dcb4c4e6470bd801ff51195998ad32e0d178cdaf3d71c3d04e1417 SHA512 925a67398e1d61fd4b4682307ad2a3e961becd2c3440305e4551fb4209dc6b875aef62e93fee663a1b2028e318424ee01825dcca0d040f9532d9a1d0618a338c WHIRLPOOL cde6047da5c5e547e283bbc89e7150a4a538b87c63f9c666864b1e469f17a23f11690b481b128d99a1bc57f566e2cd5694977e2aa0f280441ff15b96f5acf868 +DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9 WHIRLPOOL b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa777765e17433dc268f2c317537716c31928f6 +EBUILD tomahawk-0.9.0_pre20161029-r1.ebuild 1826 SHA256 4eaa729ea8666fe8e366a74f06abdfd82692b5f28722dc415220340430e3b942 SHA512 c1c408a48caa137cc03b9af082d0d8813126ca513c9c8b7fee1cab6ede3af68448b7df981113c523b24df89c767d8eeac0fe336b51a48f2d4a07d80d21899f62 WHIRLPOOL 2b10c37aeaf9019a1297d3715339501356d88aff9552bf4d4c66bc83b1391fa6215e6e7409efb68a8b0beefdbfb44227c39beb95699e62b30c0a591125933cc9 +EBUILD tomahawk-9999.ebuild 1717 SHA256 ff9f53e3ca5bf52263544adaac93018a135ffe177388352ead96446c8c715c9b SHA512 bd1b68fbc523560f089e3e2a33b6cd60fb1de4ff15e2678a696cd21edc7b1dfc21b3a5ea81672f47d35d927a7463a82d205974e302f906a1a470b09671cdb9bd WHIRLPOOL 147c9e57c7e14d4ceab06a59de9dcfde454237b0faffc998d642fcdf3e921e4ac7bc7b9cb13fb316da6bd93f879b7234db9ca828795f68ba09cf06770928e09b +MISC ChangeLog 6816 SHA256 18154889bfd318e654877c474897faba5a8019056e08c1a0a7c0b29233cb5b05 SHA512 e076cf849c18072c4e3092abb2f9a93b2c8cf4fc78b7e04d0d23fefef72c5dc54b55a409f64025fb5c5a25193a820af96df4d0c3245f91a19c65304d89fae1e7 WHIRLPOOL 5d028d1cd2090118a3b4db9e98bbcced92f20eb3198797d3d78742e677d90c1656a9fee8252a770dc357eaf374f24e63fa035146e78fb08e2ae568d77de6e775 +MISC ChangeLog-2015 8170 SHA256 ef08376b3756e02356dc68f0ce72af660ae34fa6d6f6479f9bab8497977453e4 SHA512 0d1fb474d3cd11fee9895cb873f8f1bbcb3eee72fe483945bd2ea43c6c2afaa3d2f57eb5859ca21d6e9a7c55852605354971495c8c6ac2a962e2b98dce4990a7 WHIRLPOOL ff68893537e3dc3a83a8fbf8d0477cb710fc086b2f23bf5ef566ed6fb05398c3e2975be947ae14ea0203eeee6d9b14869aee3dcd421d5cac512da66b3e7814ba +MISC metadata.xml 554 SHA256 309d4166868558b37050ae75eb377faa3c13fd35e08120f4b33bb25507f758bb SHA512 25fb52f0a1c11c21f841e68d1485c4e1bcb8194ef16b414f71caa7d378fcea31461f73b0bd064049435d09baf4c90ebb85113f248232c5a933b54f7c971ef017 WHIRLPOOL 7a500992f4783f96988eaad11bf888ba3145359dfaaa17900f7db19dc137353fd5b65088485e11100910a435ad41da276f467bb715838237f6090343f71b4219 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 000000000000..763397c613b7 --- /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-qtkeychain-cmake.patch b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch new file mode 100644 index 000000000000..e4b3bf0304c9 --- /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/metadata.xml b/media-sound/tomahawk/metadata.xml new file mode 100644 index 000000000000..a36075aeec6a --- /dev/null +++ b/media-sound/tomahawk/metadata.xml @@ -0,0 +1,16 @@ + + + + + johu@gentoo.org + Johannes Huber + + + kde@gentoo.org + 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_pre20161029-r1.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild new file mode 100644 index 000000000000..39c73c56872a --- /dev/null +++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild @@ -0,0 +1,82 @@ +# 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=( + "${FILESDIR}/${PN}-liblastfm-cmake.patch" + "${FILESDIR}/${PN}-qtkeychain-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 +} diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild new file mode 100644 index 000000000000..e433366a995b --- /dev/null +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -0,0 +1,78 @@ +# 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 +} -- cgit v1.2.3