gentoo resync : 18.11.2018

3 files changed, 108 insertions, 0 deletions

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index a2ce05e9cb71..397cb13f36af 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,3 +1,6 @@
+AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
 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
 EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1719 BLAKE2B fb60cb5b1d1242063fd1061f602402b680de409245f988f07e136ab80f80dd4fd6e4d3c614a8686931ab5a59a2c8a5020eda9ee0074e719a85cbd39e740e7bdc SHA512 5131942184c391b6d9865e0f0e7bdb0bc068a97214b8c88a446cebcfd05ae548b1156ec4be01bb0aeabc81eab8ee8612bd90cf5c8e4429a5a60e4bb94d42ba25
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
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 000000000000..8e02e8e300c3
--- /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 <asturm@gentoo.org>
+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 <fabian@ritter-vogt.de>
+---
+ 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 000000000000..b9e80fa1ed9e
--- /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} != *9999* ]] && mycmakeargs+=( -DBUILD_RELEASE=ON )
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}