Fix depend, port the changes to -9999

Package-Manager: portage-2.1.11.52/cvs/Linux ppc64
Manifest-Sign-Key: 0x7194459F

4 files changed, 41 insertions, 32 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 86735f56e9f4..70f8ce11ca35 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.23 2013/03/27 16:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.24 2013/03/27 17:51:21 ago Exp $
+
+  27 Mar 2013; Agostino Sarubbo <ago@gentoo.org> tomahawk-0.6.1.ebuild,
+  tomahawk-9999.ebuild:
+  Fix depend, port the changes to -9999
 
 *tomahawk-0.6.1 (27 Mar 2013)
 
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 2717feb6ac5b..d326d1a09a13 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -6,24 +6,24 @@ DIST tomahawk-0.6.0.tar.bz2 5238327 SHA256 28ea3b1424a99879bf9457f04b3ce8e63dca9
 DIST tomahawk-0.6.1.tar.bz2 5185714 SHA256 c2b8da0cfb3e9e4653439ee349a2446d5d124a07afa51af6c57e743936ce29fe SHA512 a0612cb62573a22dbb8b47f4d22514cad2fa485bee83d8767fdf139c2a5ec7e380db1d7d7ee807b4632c994738e20d88f9c4875ab9e266007189c3568048f490 WHIRLPOOL f8ec753b8afad14d444bc4b3fd3d236cb90a8512895b90e0618a4cd250d750b2ef7f8b3fa9bee0505259ee94d2065b5d97804844379c419ce3088209c5a28996
 EBUILD tomahawk-0.5.5.ebuild 1516 SHA256 d77df998fb20305e7ec69af6864c3a5d026b1ae521981f857f85228b62f0d7fd SHA512 3d7979fb838c524ed45a21e6aff3a91c03300d11c97f7b681d3da437fe3d14c2587ca87b8dc9ba3959f0a1f287f93e76c9b66487093c8459eb07aa86258d5b02 WHIRLPOOL 6af74805f9c1f8a99846632bebb1399e79f4ed01c1348cbff907d97ffe8ee860f4612818f4e554c8a184590839ae77b773e07aae2dc9d924834df0b1d67f4d76
 EBUILD tomahawk-0.6.0.ebuild 1524 SHA256 ccb03365767424e969c8de90c26ba0c49b30cf74d9dd8dffe4650216a519fcf3 SHA512 e8101fc5faeec5e0f907a2384856e32d432d678a02985061270d8dc9d108a26a48a51278a391144c16631d1ad30ce5e7a6e24368bdae0f96debbc2f76b19f7a9 WHIRLPOOL 7e990220ef2be3a5fb17374b554cbc42e5d6ff4f5c35499abc2b34cca92d5f523386804dbe49a9874e49596b5c934c0626a5bbd4877ee1ce2ee17fa04d9f1940
-EBUILD tomahawk-0.6.1.ebuild 1543 SHA256 d111bad5e70a332f9311c9efa93335ea643a30d27ed90c93c69e51908c0d7b8f SHA512 fd77c4d54e26e73e8231be4830474682762a9706ae4b4b9aaaaae2f887f6d5b64f3b675a43f1fe37821fcb90bb785386af869e01c4ed3b2934fc311786fe064f WHIRLPOOL 695de7a3a909f801d53f7939370b79a85d8b9412bb687881edde19de24af81afc6ae5093ba5d2f6b11fd47b09e0aba1256fbc1e2b8a5c6f5870094d6989dfd99
-EBUILD tomahawk-9999.ebuild 1562 SHA256 569b1640da1028c8d94816a6e8c3a9416df2937d54f49946ce468dd8a6a727ab SHA512 b055d149c872e34e7a080c6110b3072d75720d19ee9ac846fad927002777e35def91fc430e6a0b00408c99be29f2083f69d6e9c838306b4a6ae3d150c741ff16 WHIRLPOOL 483ccc2d95d6d777cac25812fc8d16336b58af553cb610dfb15db85daa5afadb7fd632dfea47f7944b13795038db77b6ae2a9df9ef36116e84d58d67ab29c49f
-MISC ChangeLog 4089 SHA256 0fa27315741d8c0010adc9f9185d4661db87c70f9fb945eb9f3af30a5b7ea04b SHA512 3f5685b0b287eb1ae72ce6ff35d68a59491dcb51282ef61315819955203f64d3555afd70d6929d638331523dbf7c45b0569b61b36bfbfd56645cf08cf67af51d WHIRLPOOL a5eb2445421cd736fc5072c76c7f3d981e3acf7d9b26033b9c73bb5947ba9acddc9852e1a66d3f409577d4a10285ad381c8c84af92746b5020e53c474a58fa84
+EBUILD tomahawk-0.6.1.ebuild 1622 SHA256 38deaf65d789bcc976ddc05b73edc82b5cca3f96ea689d5475a7a38fb74f5bb1 SHA512 e2b452a4af9a921d2fd76e89ee3ad4d836f3ffc44c02ff691009915a8c57bec2d48b4923ffdafbd1fec92394ef8f6419ebd5e268032eb43051582a6e80c8bae1 WHIRLPOOL 93fd4d42ccc9fa8febaedbe45671ffd94bef9f741a797041439f4c58ea36f8ec127fc031ef1b52f79fd3e86e4dbc41a9f72c5c72c126d6d090c29c4818fa49a1
+EBUILD tomahawk-9999.ebuild 1623 SHA256 840f08a7f3f95a7dd8a2426e2fc32dfbf8f8c5f714e20da5c7e62445bf8f5e54 SHA512 5308ce2d54a98e769d4f300192fb652779da75f4ea33c3c363ef9439a44cc0a96b0b6552d1bff974403c33aaa5919a3221735975efd295220c86502d62b4defc WHIRLPOOL 2b463d4d9bb95890eed2bbc4b82c00bea6614616be53fe0406e1bd2efc94199648fd9f465b5ebec40e034bd71310980ca3f1d9e90c24cf6b8288516304f5abd4
+MISC ChangeLog 4226 SHA256 e386e2693f83d3ca85cf42830157857471b8e3d91157a9ab068f6f0ecd45dd6a SHA512 c536e2d53bd18be2d4e45ced44eefc6f818a3e5e31895f9d3176207254e7b53dcbbaa21b3e9b2fa2372cfe625c9a9e575d37a8cdb3751d8fdaa8c7e7dc298e23 WHIRLPOOL 7172de9551bbebb1a99182144d3d482995eeb246fa68038c0505b721e1eb23b6d52170eab553f8116bf985e12a0f2803debcf6af8592df5558a5952efb8f3a32
 MISC metadata.xml 318 SHA256 110c482959e914940abfdf001e224a4b98315d40030aba341ddf0298d1ed0a75 SHA512 761afbcd315fc46b1ad2fe7912ab2e21988760c229a0f2ba62f0851f8c61e6be6408faa17cdaf9cf925e840710610be82904d84759574d40720da576628a0b2e WHIRLPOOL afa87cac470a565a1d20b615a1c17ccb6df2ec82cc06cb3e8d5c96bedd4b364bf55b7da813cfb2efd8df5fd9c087d291ee226a9c74580ecfdba63317fad6ae38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRUx4zAAoJELp701BxlEWfFMQQAKO9BGa/91vc8Km4FXOkpdWg
-KUL3WA64fWjD7MNXb3Ovjb080006X8hhb34lNcph+1KWN/pNhCD/7M3qoUTd3zyz
-kz4yiAw77jiuOChjUD+XOu4+MDr2CLGAEo+Q6vmP/rXgLS1eTiQP8dtfmW+7Z1iJ
-GPNGy9nkMAgemTmCF9zVgwiZ9dv4Hjq04e4F8I1D4K7QEC9i41xFApmuP14DHhd7
-NtmurPg4sZ06neKLc6SMbRXje5qs+uqeiLwfYjZCvpxESYHfWDUeHdM9GzBSJaVZ
-pkIV5wcMmrEDNMlq6aV8EZhiS+QqTH7l0mr96gWBe8m3i/4eMaVkt5Q2+ryQiZK9
-OxO8Kckn/fLDmSvaBL663BXiIJ5Jrh4JkyXLnYX/BMqg/+bNgu4dKKtPDzMCHz6M
-RJv2I+OasDBTT5in4lY0TiZ9D9G68Iaa7amzKGbGYJ7nKRe87aVzjGFR99IrvJPa
-9NlIesyVAeyTqX5V8B4ymT39w5xFtrWkUeAcCQMJ20icp16l6DD2p075WZeSxCTE
-QLw3awYYrnlvWTgjF/y1rIsRKSDUZGKLXrTKREODaicdJaP9tRNo1cbqcUKVC8EM
-iTnFrA2S5I7BbivnYJVuNHsdXQgajEf9bXLATV8hWoDUEays5Pzad8Aw65MX3sit
-dPP9eIAavI7bmzYynynK
-=JGwc
+iQIcBAEBCgAGBQJRUzEGAAoJELp701BxlEWffz4P/ixDacCTLnloJoUaPu9Fwnor
+lw8wmJjxFl8rBtHVzrvExMgqw9YZVLS05L/7/+PMUeS7WI0CDstqy1X2LkK4S7ib
+UvGDD6db36IH3WLf59E7ZeROgQaQUesWl328ZvsQDqPkaqKEGGYO1k9uOkv5TWKJ
+unwVGgEgPLi+hbqmbSZDMGn3Hvo63tOS2EZZabTs/me2SAdIsF75+U8q5nmowf7t
+7VvYCuB0ppjmTkMpNns/O/mWMcFWg9dTXRoeFb69IT7YuU26O1A8/Vbc6SYxFhpt
+h53dZulW73DY/HmKHpsAKRTXLpqxTZbldGSy2hU/GDl1JX5O7MpT/zn/RBYp212S
+W9TvEh+s5SWL7QYeg8h9V2Zoq8ySxrMVxhF9ZtIKqg0G04Dr9WEivgT/+wRgLNjy
+xVPaypstbEAaR4XOH383ROABqfneHSY/3lE8qtzGlbejiD28Vgbme6Tschdt7twS
+MHcfJdISOH7yrKB1cc6+JpLQyon9eiosodSi87kD2j7q888piCDNrmdDAx6ejKc6
+zyUQs75hBcMjJvkesUI22vlgaSek2rIyR305Ly05Nmq5sIrNBrsy2aO8VAdPQy1j
+gkFOZBVzzVPIk8bfVGhiftaDh1YT5NtdRdR6cUMEDRsuo2KCigm0jlcwQbVkHU+5
+a8NnlimOFAmJ7MYWqluc
+=ByPH
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/tomahawk-0.6.1.ebuild b/media-sound/tomahawk/tomahawk-0.6.1.ebuild
index 1cb7b49b0ba7..52356e2597f9 100644
--- a/media-sound/tomahawk/tomahawk-0.6.1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.1 2013/03/27 16:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.2 2013/03/27 17:51:21 ago Exp $
 
 EAPI=5
 
@@ -27,28 +27,30 @@ SLOT="0"
 IUSE="debug jabber twitter"
 
 DEPEND="
-	app-crypt/qca
+	app-crypt/qca:2
 	>=dev-cpp/clucene-2.3.3.4
 	>=dev-libs/boost-1.41
 	>=dev-libs/libattica-0.4.0
 	dev-libs/qjson
 	dev-libs/quazip
-	>=media-libs/liblastfm-1.0.1
-	>=media-libs/libechonest-2.0.1
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	x11-libs/libX11
 	>=dev-qt/qtcore-${QT_MINIMAL}:4
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
 	>=dev-qt/qtgui-${QT_MINIMAL}:4
 	>=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite]
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4
 	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
+	>=media-libs/liblastfm-1.0.1
+	>=media-libs/libechonest-2.0.1
+	>=media-libs/phonon-4.5.0
+	>=media-libs/taglib-1.6.0
+	x11-libs/libX11
 	jabber? ( >=net-libs/jreen-1.1.1 )
 	twitter? ( net-libs/qtweetlib )
 "
 RDEPEND="${DEPEND}
 	app-crypt/qca-ossl
 "
+DOCS=( AUTHORS ChangeLog README.md )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index ae0f7baad094..ec6c5074b2b6 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.11 2013/03/02 22:04:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.12 2013/03/27 17:51:21 ago Exp $
 
 EAPI=5
 
 QT_MINIMAL="4.7.0"
 
+CMAKE_MIN_VERSION="2.8.6"
+
 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"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
 	KEYWORDS=""
 fi
 
@@ -25,22 +27,23 @@ SLOT="0"
 IUSE="debug jabber twitter"
 
 DEPEND="
-	app-crypt/qca
+	app-crypt/qca:2
 	>=dev-cpp/clucene-2.3.3.4
 	>=dev-libs/boost-1.41
 	>=dev-libs/libattica-0.4.0
 	dev-libs/qjson
 	dev-libs/quazip
-	>=media-libs/liblastfm-1.0.1
-	>=media-libs/libechonest-2.0.2
-	>=media-libs/phonon-4.5.0
-	media-libs/taglib
-	x11-libs/libX11
 	>=dev-qt/qtcore-${QT_MINIMAL}:4
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
 	>=dev-qt/qtgui-${QT_MINIMAL}:4
 	>=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite]
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4
 	>=dev-qt/qtwebkit-${QT_MINIMAL}:4
+	>=media-libs/liblastfm-1.0.1
+	>=media-libs/libechonest-2.0.2
+	>=media-libs/phonon-4.5.0
+	>=media-libs/taglib-1.6.0
+	x11-libs/libX11
 	jabber? ( >=net-libs/jreen-1.1.1 )
 	twitter? ( net-libs/qtweetlib )
 "