summaryrefslogtreecommitdiff
path: root/media-sound/tomahawk
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/tomahawk')
-rw-r--r--media-sound/tomahawk/Manifest6
-rw-r--r--media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch28
-rw-r--r--media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild82
-rw-r--r--media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild (renamed from media-sound/tomahawk/tomahawk-9999.ebuild)22
4 files changed, 11 insertions, 127 deletions
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 0684aa6e2e7a..5f4d51289765 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,6 +1,4 @@
AUX tomahawk-liblastfm-cmake.patch 3722 BLAKE2B ec639c4e2d36ddb9a087d37265b453a8085a869d950d2b8261906ebdef5f13ba3794f0417e00be422a5f0f1ef6cbe9e15f371c924be6f55cd291bb0257dcae09 SHA512 3e65d70d274abeee63cf98f1ee390157a95d82884678251f77b3257e3f7f042a778c6f346b47b3c5c5a0cfff9ac12e4d05d6bf5de818f0c1f1d433f8cce00e53
-AUX tomahawk-qtkeychain-cmake.patch 1262 BLAKE2B 777b11512837e11a899f0b3ab95d1096fa1cf5d9521387e362d973d81f1cd738e77b5e6784afcd4c329bb2e8982e721063464b52dab458df53a8acbf1b20dd68 SHA512 925a67398e1d61fd4b4682307ad2a3e961becd2c3440305e4551fb4209dc6b875aef62e93fee663a1b2028e318424ee01825dcca0d040f9532d9a1d0618a338c
-DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9 WHIRLPOOL b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa777765e17433dc268f2c317537716c31928f6
-EBUILD tomahawk-0.9.0_pre20161029-r1.ebuild 1826 BLAKE2B 960d12c35841dc3b13bf37ece419083815d4db166c6d380ce209e2948fbe0ab333fd1af5fadeb23a3043a114a65672868797723d7ecbd174db5712cd49e96577 SHA512 c1c408a48caa137cc03b9af082d0d8813126ca513c9c8b7fee1cab6ede3af68448b7df981113c523b24df89c767d8eeac0fe336b51a48f2d4a07d80d21899f62
-EBUILD tomahawk-9999.ebuild 1717 BLAKE2B fb77788df65af10ee5aab4d903f910b091aa9df68b99081ac7d6423f1c6a0fd0611b37c29d454b88ea2718d296e836922064f0fb837c7c79ca4761a46c8b2e3e SHA512 bd1b68fbc523560f089e3e2a33b6cd60fb1de4ff15e2678a696cd21edc7b1dfc21b3a5ea81672f47d35d927a7463a82d205974e302f906a1a470b09671cdb9bd
+DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560 SHA512 edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b
+EBUILD tomahawk-0.9.0_pre20170808.ebuild 1735 BLAKE2B a8d8481d4138fc35ab5daa850b184fcbb7985d369c0d82eda9770c7b5249ff5fb9fc0e3b0aa2b4335d47c65a8cd7f80f9fdb5167c094d10722be7c71d2363f11 SHA512 be085094b287b0230212afc36a4aed87f8b4ec3ebac95af76dcccec6a6d0e759956ec3f0179fe8412c743f4c638ffe38937b09120817f7c2fa28451e7e40e7d3
MISC metadata.xml 554 BLAKE2B 162f2f8391a4b5226910cae53834752b14eb003091e7cce4f345f93923a6a09ada4289008efb9e76886f1b7dbd7709f75e010abfb85af71745e06b11394fb9a3 SHA512 25fb52f0a1c11c21f841e68d1485c4e1bcb8194ef16b414f71caa7d378fcea31461f73b0bd064049435d09baf4c90ebb85113f248232c5a933b54f7c971ef017
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 e4b3bf0304c9..000000000000
--- 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 <dev@dominik-schmidt.de>
-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 39c73c56872a..000000000000
--- 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=(
- "${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-0.9.0_pre20170808.ebuild
index e433366a995b..11fbc52732b3 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild
@@ -3,20 +3,16 @@
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
+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="
@@ -30,20 +26,20 @@ CDEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
- app-crypt/qca:2[qt5]
+ 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]
+ >=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[qt5(+)] )
- xmpp? ( net-libs/jreen[qt5] )
+ telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
+ xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
"
DEPEND="${CDEPEND}
$(add_qt_dep designer)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 06:38:10 +0000