Version bump, bug #549474

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 123 insertions, 5 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index f13fdb419a9b..03c1206e2e21 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.46 2015/05/11 20:57:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.47 2015/05/28 19:15:38 johu Exp $
+
+*tomahawk-0.8.4 (28 May 2015)
+
+  28 May 2015; Johannes Huber <johu@gentoo.org> +tomahawk-0.8.4.ebuild:
+  Version bump, bug #549474
 
   11 May 2015; Pacho Ramos <pacho@gentoo.org> tomahawk-0.8.2.ebuild,
   tomahawk-9999.ebuild:
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index bec96fffe519..bcf81dfade88 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -2,14 +2,26 @@
 Hash: SHA256
 
 DIST tomahawk-0.8.2.tar.bz2 8563213 SHA256 522d2ef873f8548990ac1fc736c11dd08c347687c77d63b520f55207f19db3ae SHA512 30a95a583796a0a8082aaaf3e3555719b91eb18a8744eb72865c8105d16128b2b477d82838ae6914d38c6b0f09e700761e84083dab79d1375acb1ad88d919a26 WHIRLPOOL f81f3ffd41e9439355a6a9d7808c92a1c8d1295f18eea90be3a4f788e4dcfa80a956b85f8b3745f4c241ca306f51b43762d3d6a38635bc92d0fa59e35af1cc31
+DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7 WHIRLPOOL 3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013
 EBUILD tomahawk-0.8.2.ebuild 2204 SHA256 f166e8952017cdf388cad34dc33a0dde0f63572f062a68e1c731b254e32d014c SHA512 2da7e9a66ccbeca5905f33ce46f977f8641566557903b8ab0f756d42eca11a9fe6dc9b47b0c0995f8ebab3018621a7236bb693594dc018951cac57400f0a7037 WHIRLPOOL cbf3459f693d21def6ece70fb987694fbb163f4c23c50a1d8bbf9b647410c218f28a8df1942071b0feaeed1ce8f1f0c8d901e86fef45d63b8a1e18dde2baf71a
+EBUILD tomahawk-0.8.4.ebuild 2203 SHA256 1ce0c3a00e9031f8d711d2516d5a355530075e98a265e8dc5329a6ad327bf343 SHA512 fd2bda57c8b3b713970a9d7da9505d00e8b6f445e2774148f06f2dadfcb6d76909f28d2b503c53e75ffed37dfd600b8eb5dc7ae23c27c1acc67d9dc2177ae716 WHIRLPOOL e3457bb77be990b1442ee7768cb7b93b57b09b467ccfe4e62da8d36310291e4ad58cacf61a405fc160ca4465b0ffa43ddea4a4a46d3efc532bc55c6a3a994acb
 EBUILD tomahawk-9999.ebuild 2157 SHA256 0cd6a22969c263f34ecf58dd30124cf5ab775ae7d8136ca0294f6c223ce4630c SHA512 68452847aea25f058941c82a11e036ad984f5749794088473776e9f149c9c25be99c42e39a8706df034eebc26bccc5563d22928426efaeed463b45b0285e5b03 WHIRLPOOL f5dab3d79d1425122f9ab7b754ffd97f65af2a2dfc7c2c37f556a08eede0ad26f3358776d06c492734e4e0c8d215f9d8b0db76528e85bb0a53fcb4cb9ad5be68
-MISC ChangeLog 7504 SHA256 aee127cc9076f53d0163249fe6a93193ff38daaff8b1b52996457e4b9067d7b8 SHA512 703d88486404038dbfe78315dfb816c25521c1c4c00cc61760a5c72da2fb423182cb79ec8067ce9877f09e36f2fe94be36534688362e6b1044795e07890eea9a WHIRLPOOL a4f3903df0f79f83b2e7cee0b9e2b5362b1bb99ee2fcd4438e210de2a5ed33ade5277861eecc9bf3b408cdf2ce5afd2356c149dbcf3a76641261c7100e708fdf
+MISC ChangeLog 7635 SHA256 52f6c25efd8a69463b7576b105a4f27e9bc344b7fa8885c88c34569cd4fbcfc3 SHA512 e21489dc761ef0869367b5e2ebe14217b643e384b694d96dd880690a077386ba21643a3c4190936c534e2beb3740a0274a02b397fd3f94826704fbcf98ed2122 WHIRLPOOL 834fa1e78a5f9f45a9d32df69985ba25a4fc9771682b042c0770713ac38a3cab2ef7315dbd3a2edff80ab7090e3aa0efef28879e921b71dfc64d2fefaf3a9b93
 MISC metadata.xml 449 SHA256 49d0ed467fa509bfdabea945cda8147db6980b565d5cf57ef0f7122d918973f6 SHA512 618943cbf72f232ab56ab529e08e9fb1f600b9c7885dc1a3d7e84f0bbf19bfd13befc253bbfc5b6f22863e9d890040f749fcbf50fe7c3c10825464f30f654343 WHIRLPOOL d13c16baef4735c911d00c682bea15832f0f0dc75b45e151171f498db29820ad8a8ffcc5d98fedafdc66857f681cd3f1455dfa71b71065d82a25bb56f8c5e7a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVRF80ACgkQCaWpQKGI+9TrXQCeIJTlmKMoUxPxbcALG0IbxbDv
-UJAAn0SVdxols6uNmBZtSt9RyHINjYpF
-=J3dw
+iQIcBAEBCAAGBQJVZ2mAAAoJEGVpnaTzz9K9NacP/RlPmrmwwHvskr3odXIxAz3V
+G59C6yF4rvbOZQIQEbrVea31N0kJYQeTOrN2E3BDydlm5WgQCtgBtJgv6bfLVPzx
+k43zc4WgjcGqZ0BroV/Mpg1Woxbibmgg5WKYnrp1+O7I319y0ZO4+pAMRMh0+z69
+SUATnXx0JfPZ6/pC5rrsu34lS+9Hd25RmSzQx6Li7xJzhFQoOZSc+8NXXXUOhJ6d
+UnXJn0YqPe31WjM04QBerj28WIZ2m0sljqrbbgb/axcuJqIvD2wQZpzQ47oXtIYp
+RBSi4NYUwrFK23cigrLlPp4DfHukpdJt8tdJVOKvgMZw6eUGX9BruZSA9NsG6pIO
+JgDeH8vm7yP/5phib1tScH3EYYt/O8gpgDS0HIbh7I+wcvGlmE2+JLPpW0t1SRzF
+OfZRx0KWvjXeiydQMYgii5jqZ3sve/Zgyua+sMXul6ayZdT1u1KE71VhQ+zDWUx2
+8iQ5JnCmO92F+DhcjFgAP7GZx2gTBREjbqzGAWl94t00nsI2CPLMBPhfyC8a7jTI
+Nuy0mYiDYTZT92kpv+GREOPPsGXEeRcEPaR7rKj/LbTeCvKydff7KRQ55+Ucq+md
+HrFNHHQSRX4CeFZaIbherq4nFLhiPUlpLU0LpMdwDxDAFTRY050dZ4xzpaqtn4TO
+aJ/IZ24XKip3c+jqKaaW
+=E2SG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/tomahawk-0.8.4.ebuild b/media-sound/tomahawk/tomahawk-0.8.4.ebuild
new file mode 100644
index 000000000000..2e2b5e4b909d
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.8.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.4.ebuild,v 1.1 2015/05/28 19:15:38 johu Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+inherit kde4-base ${GIT_ECLASS}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="http://tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="debug +hatchet kde qt5 telepathy xmpp"
+
+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
+	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-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]
+		telepathy? ( net-libs/telepathy-qt[qt4] )
+	)
+	qt5? (
+		app-crypt/qca:2[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[qt5] )
+	)
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca:2[openssl]
+"
+
+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)
+	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}