Version bump.

Package-Manager: portage-2.2.0_alpha92/cvs/Linux i686

3 files changed, 104 insertions, 9 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index cafea65b6405..d708f562fb67 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.6 2012/01/27 19:14:04 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.7 2012/03/19 10:15:27 johu Exp $
+
+*tomahawk-0.4.0 (19 Mar 2012)
+
+  19 Mar 2012; Johannes Huber <johu@gentoo.org> +tomahawk-0.4.0.ebuild:
+  Version bump.
 
   27 Jan 2012; Johannes Huber <johu@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 8bf38a983c65..5464609780b8 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -3,18 +3,20 @@ Hash: SHA512
 
 AUX tomahawk-0.3.2-remove-quazip.patch 1567 RMD160 81a5a5582b8bdccc2e6fcbe29142e78a7c3e77b5 SHA1 767af98d128241dae690997e99d442c3eb5ff38f SHA256 0d0aa71ba4445459d40647265db547de655027efb29baec2a657cd94fe8c05f5
 DIST tomahawk-0.3.3.tar.bz2 4651817 RMD160 d8eae3c37e2915904a096e0ef64e488ff9fec8bf SHA1 e83bbac581daad8a21c639e4ed68e1499a07ac73 SHA256 a69c68e688469aedace8665f5c882c614338d23cf24697ca3284e048fdce7c51
+DIST tomahawk-0.4.0.tar.bz2 4771856 RMD160 b8ba57d86d9acbf2ec2bff48d5466a3dc1613cdb SHA1 4e480fb7a7c13e5216f424942ee65c8cb814a121 SHA256 3e1e2987cb8763bad7f4b39bc930e1eb14cd845c71700f4250d942615b61870d
 EBUILD tomahawk-0.3.3.ebuild 1914 RMD160 734427c9600a4d5cdd0a2d6de6519b0b0c5c88d8 SHA1 9eddf699c6041cdbf73bb4ef03573acca05c61f6 SHA256 fe1bc1b197ca0a08df41a95df8311ebc7c0b669edfe5bd9b9133328131920d54
+EBUILD tomahawk-0.4.0.ebuild 1950 RMD160 064bfc254f9ba4cac4da10193cbed97cf70af81c SHA1 fadf0af5398f5f1140e8008abf3645458dd28a23 SHA256 529f9a879707ec166b193cef58600e53bb5b3aa80b4079e5d0e8b6a65434fe8c
 EBUILD tomahawk-9999.ebuild 1913 RMD160 faf22d04fb0b8e3604e2efad614dace0997ee2db SHA1 0edfc958b0fa155810952b549b105f6447d862a2 SHA256 c30892e29b0e7dabda5664aab86f9e732899958dfe056edda73bab689b2d517c
-MISC ChangeLog 1511 RMD160 278a90e6f5d198ee4bb761285b91cf9187daf0a6 SHA1 797ef79da232cc9f19a5ba93fead44f5e3aadf44 SHA256 5867b06e369e63241fddee5d4b71833feec4ea2d03285f5160bdc13e67a725ce
+MISC ChangeLog 1631 RMD160 8eee7962d81acc5a7e1779a5d706f3b6e256fe01 SHA1 b94762dda84ee6cce9053446e4224fa7bde07830 SHA256 22f048feaab685751017accef879fdec51c406ade5f49442ad78789a210b4144
 MISC metadata.xml 396 RMD160 998d05e2f8ef6d73f552532a3a1f1aef2eeb67df SHA1 1bbeb16a3c3156e6bd514117777cf3112c8e70fe SHA256 394b94c6342f4a7a45ac02a410693ad6ff4b1cbeba8336bb31431d8aa40bde0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPIvdFAAoJEO+t9ga+3I3aaKAH/iZztjw/Qj8cm4mWhe4mCTik
-onwwuvXWwXDLE2rYyBuHFyDOXIKlV8JBf3Dirt+YTl5zrS/Hg0bAvyae94SbZNZa
-60IE9rHBumvU3MvXHx9L8g/HMZd4HgEAEpWqwXIg3llhPA/ep9YafGcJlrgyaUwi
-egyI72dvvKI1iDp2HVmws7hOHdXqts3bBuMbxJdiIT5UIXcR550U/lfze6X1RTNw
-JGeFZ48eAr7ZzU3aPGqzsoSZ6iEfOaN57PcEiJZq86Q8Ba6oYHrfw2U7n7aOgAMI
-MbiuVmhVlIrDmVjcwFR7eToXZc1pRktZeVkXIb8qtiCoieH7A0wlt9blGdt123I=
-=YjHI
+iQEcBAEBCgAGBQJPZwieAAoJEO+t9ga+3I3acnkH/j9zaVXe47IsMRJOJ4p3uLS8
+b8mF2UCNQXZ3YZTrnvsJlPdI9CJE3uBY8nGH/u+Rp7VbUBp1rKkV6PcIpS74XArP
+NLWwv2M7TGBD033JIVdfts+CERGI0lj4+OskU/u5qkPWZZzK0oZFRJ667NnixG9H
++TKP17YNpkdqEOj5/c8g3ZIGxfoLtnIo831C1z5NqHu5qLLqLP+vxUeZNXC+Y0Q1
+ZWi6ACS9SNDSRisXBYe2h4lO96dsm/C8BF0SjLS+l8WfiTzxS8MoOhTSh63OGA6i
+SQ5RrV5YGgModQU77CD4AWu01PrXgMHRelaCfrOtMOOCbgx1PU4RYlWU3BLqPsY=
+=PLVJ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/tomahawk-0.4.0.ebuild b/media-sound/tomahawk/tomahawk-0.4.0.ebuild
new file mode 100644
index 000000000000..89e1207d7584
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.4.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.4.0.ebuild,v 1.1 2012/03/19 10:15:27 johu Exp $
+
+EAPI=4
+
+QT_MINIMAL="4.7.0"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-2"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/tomahawk.git"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils qt4-r2 ${GIT_ECLASS}
+
+DESCRIPTION="Qt playdar social music player"
+HOMEPAGE="http://tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="debug fftw jabber libsamplerate +resolver twitter"
+
+DEPEND="
+	app-crypt/qca
+	>=dev-cpp/clucene-2.3.3.4
+	>=dev-libs/boost-1.41
+	>=dev-libs/qjson-0.7.1
+	>=media-libs/libechonest-1.1.10
+	>=media-libs/phonon-4.5.0
+	media-libs/taglib
+	>=x11-libs/qt-core-${QT_MINIMAL}:4
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4
+	>=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite]
+	>=x11-libs/qt-webkit-${QT_MINIMAL}:4
+	>=x11-libs/qt-xmlpatterns-${QT_MINIMAL}:4
+	fftw? ( sci-libs/fftw:3.0 )
+	jabber? ( net-libs/jreen )
+	libsamplerate? ( media-libs/libsamplerate )
+	resolver? (
+		dev-libs/libattica
+		>=dev-libs/quazip-0.4.3
+	)
+	twitter? ( net-libs/qtweetlib )
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca-ossl
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-remove-quazip.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with jabber Jreen)
+		$(cmake-utils_use_with resolver LibAttica)
+		$(cmake-utils_use_with resolver QuaZip)
+		$(cmake-utils_use_with twitter QTweetLib)
+		-DINTERNAL_JREEN=OFF
+	)
+
+	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
+}
+
+pkg_postinst() {
+	if ! use resolver; then
+		echo
+		elog "Information on how to get more resolvers for ${PN}"
+		elog "is available at ${HOMEPAGE}resolvers"
+		echo
+	fi
+}