Update dependencies for Qt 5 build.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index 494f35768a6428d406de54288db0be617c2cd34d..d19324cd7e3c468d052eb84decba139f42f97719 100644 (file)
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/cantata
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.31 2015/03/22 15:22:30 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.32 2015/04/02 17:07:36 kensington Exp $
+
+  02 Apr 2015; Michael Palimaka <kensington@gentoo.org> cantata-1.5.1.ebuild:
+  Update dependencies for Qt 5 build.
 
   22 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -cantata-1.3.3.ebuild,
   -cantata-1.3.4.ebuild:

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 7f8c61e34f4efcff430f5c31212dd66176312941..1a302bcf5dab202c917ffe5e30473609416807ab 100644 (file)
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST cantata-1.5.1.tar.bz2 1986772 SHA256 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78 SHA512 bd41bbe3a9c2fa6a4e653deb62a82b928febe3876a6023d4c9bff4fb71133aca5a8e34ae77b440d10ae42c0d024ebd1c460b367a75cefa29858275d707cf4e38 WHIRLPOOL 55054c1e8d95f1dc9322b7224dfa04fd8e8430b89c5a21883fdecf0829eca60720186e6b549d80216c4035429208e2191d2e5ae31608ede3a6afc8e5046e173f
-EBUILD cantata-1.5.1.ebuild 3023 SHA256 6c940bc670f308886f8aaf4e00930721050e5e2a09e9a6b36a9a7d43efbfa38e SHA512 e730b85dc60fbee506a5a8d7d1bb34480311d68720fef93e9a786b03cd301bbc2ffea5721b420faec5a7d5c4ad3eabbe5c576369d65be0bc9b1c514b083e5e23 WHIRLPOOL b90e6f87e2c9b3e7267d503ed69c0d50e075ba76e1710603907f02d415acda53a330efd88f57ede7c33e0c616d842508382086647b61b798cbbf47d34f318d9a
-MISC ChangeLog 5145 SHA256 50cc1390d938f2b3853b442cb26d484f0d6e1aeaccc6d12934325b0e9a1d5985 SHA512 6ba941a50247a43ecca4608434d29e5ef741ff6f71ea72acbced512e3be600a4d105ead1782c9e6b391ece576351b51b088cb5dfe505a1220ab22e5ed6ee5b34 WHIRLPOOL 96c0a401c66984aef3dd2563dff4b1be165d19e7b11d81428454539d57360a6bd2bbdd95fd1fd652a15d70902eafb22df036de0829b6afbdb0c3b144c4f4ec01
+EBUILD cantata-1.5.1.ebuild 3081 SHA256 06e41c8f0fba7737fb3717aa114de75f614b1111c07343e179c0011819bb501a SHA512 110c59becbe0d2361049611ed347572a964a0f28cd511e1224fd25a5baed2018217a3ac1a698be2fc296009f917cb4ed9001b3281fba8f5e69763c476c18f947 WHIRLPOOL 9607690befbdb172ac982d46b6e54f09b584301abb292f9c63dcfee525e7c780544b37c5bb5515737488ea8ae8baabdb8ced1e0ba9f3e0254e1d78a13a8e7632
+MISC ChangeLog 5267 SHA256 e3b8c69b7855df2f4c9b1ee47edeaa71d14a94f8eb98f012ce4baa1e96c31cb7 SHA512 88823865af67e530c23e016a3e4485e5c1faefe9d188e67d46c01e61ee5041cdd34cecb186f2bcf04998ccec8da3296d9158784e9cd112faa8fdc042a36f5327 WHIRLPOOL 0231867a128228bff70f10bb09466c8df96486bb0b1fb185f5d782aba8f00e57632cc4d5bf4f6a161ff05ec3550590056e9ee6c5c5354d89b41b84bd6d1063ab
 MISC metadata.xml 647 SHA256 c2a0e4d1db640c37173b448d2141c70f7a7ab91d11f3ce2cf915c7e947c0ed24 SHA512 c7184d26e4c0a260c8baa3e4552bafdac72cf0cde99e5797dbe4e325b56a6c72acc1098ae8b8eb29723e5478cd6a9ecda05026ec19a17ef719ed6b171c019e76 WHIRLPOOL b4f65ad0cb4ee54beaf2d6016d4cf8e09c67d6de986b598f89e631f6cd836a6498ed72b837bb64e60abf15f7194505476ed36adcc690977c824468bc00ad0550
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJiBAEBCABMBQJVHXdWRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7HkjD/9xr7auB5NC6qcpoQjpDPbD6mN1Pqps+KIE9xO3qQOit6Y8kEK7u4cRDEz+
+51FOXbwkOL/gmRKTqxBj3CCiWENbvOGSY+cF0Yb/62imf1/vx1geXoJ0NMDYpGGu
+Ga0aaQsYgzbVAPr3BOrKL1ggLmaMid5bIrGGizvv19wbQ7HAUPILREdC517FJQtg
+9rPl5LaYYHOWp42/vBDWiaesv04pjqUZ9iXxk9JH5838ihAGzxTNPow96OeNcOlG
+Y/xhfp56IFw+6wF0FOL6B8sFBeU4tGTbP/k8MqP4xWHHxnE3MqdSnA37bmrry4d4
+0iGr2IqgNQ72M+jCyJv5NKzHwDIOrfWze9EdcX88SVhGV6B0oJgUxIfgOl/Ec0Qz
+3ph4p5sQ235xX1Fda3MvRt5Fedq6kdaWle9TEtAN3iZsBxBSIL4pq7KHXNNXgjqA
+6ounYCP85Y2KFHZoq9hyC/7N0Iln7e20h6DdkZ/Qix3JVoi8L12NIvN/jRkT+H4S
+XNQre17qa037LsoRtMhA4+VprdiCJils/ZPuOuA45X8Mnq2AZaMWDpwc9StA1dB4
+htPoTf0rtIqSODDXKikS4wDkaG5/3DOY1yPqZkiS7bpKBgBkLCIy84VQdZ6y+q2q
+QUMnybyQ8LJ9iEP2fCdM1fYlrG70oNbXw3x9QNTihBbsP3WAhg==
+=iEVG
+-----END PGP SIGNATURE-----

diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild
index baf9f283299a0b0eb6f0adf2177b9d0b53eb61a9..729d004124603352c33896e3bae90c35c7c31074 100644 (file)
--- a/media-sound/cantata/cantata-1.5.1.ebuild
+++ b/media-sound/cantata/cantata-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.5.1.ebuild,v 1.1 2015/02/03 16:23:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.5.1.ebuild,v 1.2 2015/04/02 17:07:36 kensington Exp $
 
 EAPI=5
 
@@ -28,7 +28,6 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-       dev-libs/qjson
        sys-libs/zlib
        x11-libs/libX11
        || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
@@ -40,12 +39,16 @@ RDEPEND="
        musicbrainz? ( media-libs/musicbrainz:5 )
        qt5? (
                dev-qt/qtconcurrent:5
+               dev-qt/qtcore:5
+               dev-qt/qtdbus:5
+               dev-qt/qtgui:5
                dev-qt/qtnetwork:5
                dev-qt/qtsvg:5
                dev-qt/qtwidgets:5
                dev-qt/qtxml:5
        )
        !qt5? (
+               dev-libs/qjson
                dev-qt/qtcore:4
                dev-qt/qtdbus:4
                dev-qt/qtgui:4