Move various kde-base packages to kde-apps.

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

25 files changed, 188 insertions, 169 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 8e86140d2d09..1f1c1ae4fff8 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.478 2015/02/16 19:46:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.479 2015/06/04 19:04:14 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> amarok-2.8.0-r3.ebuild:
+  Move various kde-base packages to kde-apps.
 
   16 Feb 2015; Johannes Huber <johu@gentoo.org> -amarok-2.8.0.ebuild:
   Remove old.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 6762edcab4ab..fc55574c144a 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -4,23 +4,24 @@ Hash: SHA256
 AUX amarok-2.8.0-gmock-1.7.patch 1205 SHA256 3d780ba18dfda23eb19772dd803969a72b7bb47c5181060bdb18257cd16ce88b SHA512 6bbbdf633f65337523d023decd6b3ca889a2bf9b10e93d12f686e273144a58dd398813a99474adf8d35ad1184658f77626b040be288b44a9ac58424a51d05790 WHIRLPOOL a4c45a1386cd8f5c5b97e4fb6563b3e59de19de61d584669ee62f8884d5cafacdb746e6578b2e2f9adf20779ff059d758cea1686ced9c7392b1f9dd1b6ee5b87
 AUX amarok-2.8.0-mysqld-rpath.patch 602 SHA256 b8a10620877962ecd4fd4b3f466bb2418fdd3a17c4fa5b69a655978557996bfd SHA512 7e2b4581a49424d51b47073bcc45d976eb0195b8a87c02a6e012e85d7e771b9c207f351bf9571038b2d7cb3cecc8118d688e50b7faf4eb176d204b590b17ed2e WHIRLPOOL 8d1d5311b907f982d031ad7083771f7b081af7c1808da337ab0413ca50974dfa8f33b33bd30baa9e09ab3a4aa3996e15622b125de22b7150814a0d35f5b12d33
 DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
-EBUILD amarok-2.8.0-r3.ebuild 3936 SHA256 137c771bd10d759bf53eb6e8624dd9ad360c6ad875daae2770f1bcc4c301c9c3 SHA512 7914e0a51f9f5e7ca556f3ab3bfb243e1579a7f0d6d927de51ed1ff6a08c7491d247f3d0523b6f750c5e963700dde44b879bd6c85c526c53e7532238ea4ca000 WHIRLPOOL 412f202e053d870fd4e95465fb551000cd9afa0ab5fd3a76054d9cf5e2f871cf401cbf4edc23ead0a972de1739f0b0ca25b0626ca684840bebaa549dc6c4a011
-MISC ChangeLog 81169 SHA256 945ff3263205249b5b82acfd2214d2601b02e3f2b46f60f7f3c58665a9d3a629 SHA512 e42712eb4a35f687e49339235c0d317b72674a1e836fc8dfbccc47c8887e4725348aedd911eaa1b6994b3eb91e12712f28b03adab8de22041061b2d3a157244e WHIRLPOOL 2262ef5ddc8a8e73512f24c9903932dfa944886d77688b79448996d753d1f5f327b32c875deb5449b1a46fe5e3c0fc40287f95e4a33f85f9528f4ba4f5ee7688
+EBUILD amarok-2.8.0-r3.ebuild 3793 SHA256 6901c964cb6cd404a2adc0a8a99745282bd3d89447d3cd7b1a1fc9e6167b4e78 SHA512 5fcdedb07aadd3731cd9f286378b8003206e1166c41d60def8ce63e213f696b729483131533e11dbc069ebc68de7a25c09142bbd9fd63a93a683410f781bfb54 WHIRLPOOL 90e6223d93555cdcd206018ffcbe36d8306bb7a890d83a6f21a0a8ad3c102f16ed9334d84339b4bf5026f46943ef931de4c015ca9567ef29588469a05a3a347f
+MISC ChangeLog 81302 SHA256 204f01e0cfbe58ca63651c9e6358716d3e220150bae0a0b484e5f7d0d23f5474 SHA512 44df498f4db3216b5bbf3524607181836078b7df34c8c4fe611f01cbb72988f66f07ed35ef579a80903e6d8a1050106c1c0ffa6350e570d17b2352c2c4a998d4 WHIRLPOOL e9c6f80ccc0ee8afdadbab368d158e460c2e3ee66db4c509e22110cc24b4e6da147d602bd5e7a68957ebf958ba4971a414f73759d696968b6693fdfa21a33d78
 MISC metadata.xml 1064 SHA256 8e46a720b86b83508c2bf4a5a3be43bbdabb1bf8e057b547dc881912fea035e6 SHA512 d576c1e66b3e76e899f4580a908d41a0ad2faaae0346b47fe5e4d925763428e705be2fe7246f4109a4b470c6a75acd445215722fc3b3e82709af765d659e7705 WHIRLPOOL 9b1235b62922630dbb2968c62dda7cac97eddc48a4857232d6a0aa25abdb756dad474281d39f2e342e719adb9f6311a6004e3b629496975e8b82f68d4487f96e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU4kkrAAoJEGVpnaTzz9K96wkP/jKt2jzRgVuDhOM4Lp9McuZB
-bMe7yWaZYile5sRt69Z61XcinwgBGnunYqe+yBAkWoYukFrvgfKCi6vxOBOEoPGv
-dNUMfSKG1uGx+z+yw/YBhC8mSJv019ick6Al1SKRCTlUeReFmSSVV7Wdz9N8EHr/
-Gh5h9MkdIw/M26BC0q6twlBGHqDVOZAGKTtM0TQ4hNzNNZUmRNUptttLZA/v7jVE
-RlFTL6TRvR8JOoK5wWFpXhlbvolMUwsq8PsnJHIUzHNrWZaAuQ2L3tUeI4Tx7sU4
-baoE3iy7o2AecuGdLLthVHu6NVXCH6iMV/osznowvQ/5UI25BqHPTNQLDme7ZOx0
-JlXCCSmpKW+BeKzxKeSlr0MDUZpONh0ND/k1Z4DnZYTKExGJYx+jVrOCW3p32fne
-t563lsedux8tlB1hwdV+my0El3wdiSucUOB5/P6rzOYlmdts8X4C7B9/8tVwOWOe
-g0+cslj653LsIgIXtzWHv0HIXI2n2Hs9kl2HEDRVwS2qxE8GOESbx8s4lmWlhTGq
-15+i/k77mV7jTG7tZwW/IHBbkFDlaKwYevpsN1uZhDJmr7sQ7+GShE/TMAAsDJxd
-YOwUMMD3K5VEnGfHpkSvUFyCDOYAEJw1okKYn+VVynAfhmHphQxuDZu3pJOlthFO
-4ID+tA8ar+nRNo29+50E
-=oLN/
+iQJiBAEBCABMBQJVcKEwRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7ANBEACNzGynMedPbMLMy+TbUHmZLccqRyem9q3gpSt4ZsAXkFIXA8EUWVXFO3Te
+NAQdCHIcnrmh6uLHcvlndy2BinG08zHKid6cpj+he07QuyEA49OUFlrxtA0oqIaJ
+ppQCjoTQNYAtlgXg2sweh672Lcw3yYe0Q694L1UwyUESJVm78vMIgEcB7XbpICnV
+3vVcPKXHGofzqONrUm1yq9JoWnzMyG+UTjNa9DwvNEnpSPNriE/e8x6vVcq82HwT
+5J4/QO9aZuetTWFfU6dtA2665jNlCLh8C5abPLJg+mjj2CF4JQ+JpBkBvHzI/i9X
+cWaS2O8n0V776qCGBjqiixUYmeEAtH4Ucuspn/Oo33uuxenFwx714iTClaIsLTp7
+WRheTV8XN9bBp/3WjAOWc3PuTKEzjaooPMcr5uuiOMJbw6d+tKk3RzVO3YT/AfNy
+INkJAuW3w4Q85BQdCI/uRTdpB3IrlwtYYZxeZDqPs/o0RyIyJSd9ZimkM8fR13pp
+i2ovg3vZ1qTOG4InSiZOJ0ij1z30TbdyPH9jbyK7KEzGy7C17/zeXJHUwH/43+8c
+Mg2sXHUT7yHp2c14XAK2Uon+izaaY6LwHWOCNLSqwbqnsG2jTfP5A5Hx/mbzBKs1
+G5nNDI+jDrb44bGxpgHiNaEdTo3dvudlumzRIU8FrGa2rQFDMg==
+=s3DN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index 9d7fe8ed0f26..5f58dd47c545 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.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/amarok/amarok-2.8.0-r3.ebuild,v 1.7 2015/02/16 08:34:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.8 2015/06/04 19:04:14 kensington Exp $
 
 EAPI=5
 
@@ -39,8 +39,7 @@ fi
 COMMONDEPEND="
 	app-crypt/qca:2[qt4(+)]
 	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
-	|| ( kde-apps/kdebase-kioslaves:4
-		$(add_kdebase_dep kdebase-kioslaves) )
+	$(add_kdeapps_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
@@ -50,16 +49,9 @@ COMMONDEPEND="
 	>=dev-qt/qtscript-4.8:4
 	>=x11-libs/qtscriptgenerator-0.1.0
 	cdda? (
-		|| (
-			(	kde-apps/libkcddb:4
-				kde-apps/libkcompactdisc:4
-				kde-apps/audiocd-kio:4
-			)
-			(	 $(add_kdebase_dep libkcddb)
-				$(add_kdebase_dep libkcompactdisc)
-				$(add_kdebase_dep audiocd-kio)
-			)
-		)
+		$(add_kdeapps_dep libkcddb)
+		$(add_kdeapps_dep libkcompactdisc)
+		$(add_kdeapps_dep audiocd-kio)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 	lastfm? ( >=media-libs/liblastfm-1.0.3 )
@@ -84,7 +76,7 @@ DEPEND="${COMMONDEPEND}
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
 	|| ( kde-apps/phonon-kde:4
-		$(add_kdebase_dep phonon-kde) )
+		$(add_kdeapps_dep phonon-kde) )
 "
 
 PATCHES=(
diff --git a/media-sound/audex/ChangeLog b/media-sound/audex/ChangeLog
index ca92e8992f33..10ebcba87d17 100644
--- a/media-sound/audex/ChangeLog
+++ b/media-sound/audex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/audex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.20 2015/01/31 13:21:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.21 2015/06/04 19:04:15 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> audex-0.79.ebuild:
+  Move various kde-base packages to kde-apps.
 
   31 Jan 2015; Johannes Huber <johu@gentoo.org> -audex-0.78.ebuild:
   Remove old.
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 19e3ba718db6..a0e9a0d85de3 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 DIST audex-0.79.tar.xz 319120 SHA256 b043db6337bc6a0f054ee0a62b9ded5bd1ed391a4f42dd2586c76feed9dc796c SHA512 339461b283056bdb78090561b5be16e7fb0b00df06eb4d575fb8b2881838054f84244dd960ed1b57df5b39c345f670411e9990aa8df322c7e521f253225960e1 WHIRLPOOL 6133607ed6ef3a0e7f71f5efdc4fcbe1bcb0f7846b2a70d59b87d177ed0605df9f253ca8d79f7a46394875f24774bf4d5dad4a159b81634a2b64644a54bd8835
-EBUILD audex-0.79.ebuild 687 SHA256 1fa05006f23a5133f1dc42593313656fc092984a0241e73bef8728605c78838f SHA512 5d3d212e11b71f39ccab1f36e78dbce7fa2d5f3b626c26dfdb16d47d8311a8badbc07a4b0606a92c7cdd58342d974884c943c2826f5e771cf66d1599e0676750 WHIRLPOOL 6d75cc6744eb306b8c043f04d60060c572dce2f5c3a0cfdcdb38af70d3595e9cf2bde9c1087358dc2854069b77520b865d77fccb93747f4e3415b31256fde579
-MISC ChangeLog 3416 SHA256 ffcc5a90dbf49c9f59e7004b8e458b5b260482e38f21eaf39ac2a9e68894c6e9 SHA512 42dc658a35803cdd6da6117318e61c71c36943ff0b06fb3b43a776a88f03fd59fb8072084709df7de54ade5a7fe8a9342d35fc6eb25b9b73cf5ca1eb7a4ceb5b WHIRLPOOL 3a43d93be4a237a016216b3b566fde47d5d6f0884d14491e4ea13396e13685c6c5914b293a131eb8915cef6992db9cfb89b9e6fe1861f373b7ad68319e73d78d
+EBUILD audex-0.79.ebuild 694 SHA256 4d39f08ce62ab9385809c7356618f0e75e463603ee60ae2236ae278da7add99b SHA512 54cc70260db0f9568a77679d12d6d0e718503a544285d66b4d99cabdc65cbab8d6feec23f040f75ae6dd015dea87308ef2a037a59cd12114c7d02c6473d103d4 WHIRLPOOL 8117377af52a7f62f2027eb6c5d334a98e9d104909b6e1bf3b43f03e3423f52f572b99623c8ef701626787f1cfa580a9134059158021b9539321cbc0cb60d4c6
+MISC ChangeLog 3544 SHA256 0c2fd8a2695d34d768d606aeece4156506863e308553e65e43b5ec13967b8af1 SHA512 f65d538baef6fb6da3b3fc9bc1d74fc6298ddd13105c74b4ecdaa1e73d636d8b3d601d3be8f8553e865f317b714142b6cf9b036661eef9aeab367bfd65a5fa9b WHIRLPOOL 296bd09a37a08b9e1abc59804f311f49052b64232ddd71b8957f176f6780c5a715efdbcbc14177f150e928faf1c1efeb56a5fd319cfd1d27c649ed6ac46c03f6
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUzNbnAAoJEGVpnaTzz9K96xQP/2YOofVaFODvxwL6nGK7O7/o
-F+0z+dVj4NqUb+amK7RX4Ijdc1cq8zftrtw89pBcU7Fot7BQl4WJpM4YX4gLzvX+
-f421nP/tIrGSvdEAnPHsofEsR3rtyxrIp0dv+M9O40+J7uWLKHSTgQSS+V72oU4u
-eKJg6rTotGbpWwTKqfawkRgRZf0znvfQhFV3uLKWVynOPU7Hf2rPZt/2uVINEkJX
-gOYi0thg+XRq70lKZ93Ju6vdjhJDGPZSKY9qlqnA6wslVADJYjFGM+/6krALjKmU
-m5/RGHSoGU7Zb18XVOIhUJC5wl0pW2oPDnYzhX3+O87P2hqKxoFcx2R2e+TBVbOC
-aY0bJyjK1S+25guXDiknZOiuKWhH8MR28cSV35c3vrnjVxAfGzftiE8KVLVMsu7g
-l82oqgc/f5a3L5Y+FctN+ojF8xJmyIECExzL/kSP3aJl+h+6XIbhYQyHCmt5r++x
-ah28MTPQ1vL3OFEHOaHXrWqHpK7Dh05vjEX69HaoIySmQIWzZIyxpOFsLNiPlpwV
-Mbmnh+6dZxFrRX0VQCnHy6h32Dg08+mP+TJL3o3Z9vCnoHJGTuLrdrnmSdDvpFdU
-l+JcFAesp6VYpm20WeOIYYvwhHT75pxDafsRxv0CfDJxu5GDh48wwQZ7J/4A1nJq
-4cZeDRj2na9DeLROQ0mU
-=F0LG
+iQJiBAEBCABMBQJVcKExRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7Ny2D/9sN/rO6VMaKrq2TjgMnxLnHeJXlQ8xcfdjhCgG6ozXX3QDaG5e12Dg5LBI
+QSvu+vd1gXn4UsecYMKaKndffpIjjdrtsc3chmMGeYj1Gu5FlopZ3lUOg9K/OgrF
+bSZC6xji5NinZl78P5jVRu8mOvSrt7c63qaSBvbGdiIlX4m10OTx9H1as0YyQS6E
+Fr9qow3JbgEQAw99L7lcXrkx6dVrNiKzEVcrVJJJ7tDiW24lAsBKx+HrEwdA9b5H
+4Hk59Y3dYW7tf+8OrX+LZ2frbb8B3OqVJn9pOhn0c5fGeJGggsb+NR1v4rmgwNVo
+MO0DzK5UPccYDk6AqvKC26PspIA9wDu2Nyqdv1tkEclDTSZsommmDjoCFV8njAoo
+0I5xbAMKc+02aY82yfgRs21g8w5ulSUvmBFHBcJMbTTDs9g4cxQs2S+POxcpvB1h
+m8lff/kn8OwIqAXnzk7Ol1B6B3oCdi9Htc53nTylhOTYZGow5DDKR3m7ijLOnxI7
+tOpMOWWskykrMxWttgWnH+59a7aahbOwPuT00jOEBcdTrmRmCRJsbFmfB9l2XxOb
+KZL3p0RMzehsqnhqGaRBSQDbwEf2M8unT/E8/s2kecEHDglzo1YO4XWYQ7ZEMmRS
+izBE7fsAzrJt7T1XfYiYWJtvoLhEE5ZywBePW3HgZUHhAIy3VA==
+=3Qyw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audex/audex-0.79.ebuild b/media-sound/audex/audex-0.79.ebuild
index c2759e3f50fc..e295672ea9c4 100644
--- a/media-sound/audex/audex-0.79.ebuild
+++ b/media-sound/audex/audex-0.79.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/audex/audex-0.79.ebuild,v 1.2 2015/01/31 13:16:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.79.ebuild,v 1.3 2015/06/04 19:04:15 kensington Exp $
 
 EAPI=5
 
@@ -18,8 +18,8 @@ KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
 	media-sound/cdparanoia
 "
 RDEPEND="${DEPEND}"
diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index d19324cd7e3c..87be5121c517 100644
--- 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.32 2015/04/02 17:07:36 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.33 2015/06/04 19:04:14 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> cantata-1.5.1.ebuild:
+  Move various kde-base packages to kde-apps.
 
   02 Apr 2015; Michael Palimaka <kensington@gentoo.org> cantata-1.5.1.ebuild:
   Update dependencies for Qt 5 build.
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 1a302bcf5dab..ff5aa8080f24 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 DIST cantata-1.5.1.tar.bz2 1986772 SHA256 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78 SHA512 bd41bbe3a9c2fa6a4e653deb62a82b928febe3876a6023d4c9bff4fb71133aca5a8e34ae77b440d10ae42c0d024ebd1c460b367a75cefa29858275d707cf4e38 WHIRLPOOL 55054c1e8d95f1dc9322b7224dfa04fd8e8430b89c5a21883fdecf0829eca60720186e6b549d80216c4035429208e2191d2e5ae31608ede3a6afc8e5046e173f
-EBUILD cantata-1.5.1.ebuild 3081 SHA256 06e41c8f0fba7737fb3717aa114de75f614b1111c07343e179c0011819bb501a SHA512 110c59becbe0d2361049611ed347572a964a0f28cd511e1224fd25a5baed2018217a3ac1a698be2fc296009f917cb4ed9001b3281fba8f5e69763c476c18f947 WHIRLPOOL 9607690befbdb172ac982d46b6e54f09b584301abb292f9c63dcfee525e7c780544b37c5bb5515737488ea8ae8baabdb8ced1e0ba9f3e0254e1d78a13a8e7632
-MISC ChangeLog 5267 SHA256 e3b8c69b7855df2f4c9b1ee47edeaa71d14a94f8eb98f012ce4baa1e96c31cb7 SHA512 88823865af67e530c23e016a3e4485e5c1faefe9d188e67d46c01e61ee5041cdd34cecb186f2bcf04998ccec8da3296d9158784e9cd112faa8fdc042a36f5327 WHIRLPOOL 0231867a128228bff70f10bb09466c8df96486bb0b1fb185f5d782aba8f00e57632cc4d5bf4f6a161ff05ec3550590056e9ee6c5c5354d89b41b84bd6d1063ab
+EBUILD cantata-1.5.1.ebuild 3042 SHA256 7d86395ab339897506df554e2832f688305c748bdfffe04f4bec1e3e7ae1552e SHA512 e0b6fac62c3960bfc66d20096f37391494c49d6416504276fd8dee8c96d66b7546998d4f52244585b114021e14d31e5e6f8e192eaec09ba5101fab3c5bb2eaaf WHIRLPOOL 622ba0ffecdd926b106758fe545fa355d5831a81213f176fe6ef61d9607211729db94c3a47839174713bc6c1929ad3f69eda457059e1a963c9b5912d80a4cf6b
+MISC ChangeLog 5392 SHA256 d04f82fb61665e4beb453d1f91870362f73f973d2919caa534aa41166871de0f SHA512 836f3a617f91892d38157ad106ee66d454d52df0fa626b5c0a43dade3e2520e8d8fcd218a5e6602ebaa13fb11680d5b473e2f3156df983ea6b6e3190400c20d8 WHIRLPOOL d2f809ef8a5cd4efa62aa3229ed2e7535877c6357fb1b69ab3c7c729c600a46ce552e0497a4f7b29fa34d2550703cac56b55c42cdc89ea047652f3da101d3c58
 MISC metadata.xml 647 SHA256 c2a0e4d1db640c37173b448d2141c70f7a7ab91d11f3ce2cf915c7e947c0ed24 SHA512 c7184d26e4c0a260c8baa3e4552bafdac72cf0cde99e5797dbe4e325b56a6c72acc1098ae8b8eb29723e5478cd6a9ecda05026ec19a17ef719ed6b171c019e76 WHIRLPOOL b4f65ad0cb4ee54beaf2d6016d4cf8e09c67d6de986b598f89e631f6cd836a6498ed72b837bb64e60abf15f7194505476ed36adcc690977c824468bc00ad0550
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVHXdWRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVcKExRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 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
+7ALmD/4uvG550wgIk2wlrDFNM1ZMWqqxCkt8leNwyk7yllCG8C7V9vUK7vauZuyN
+Y5Z5IiDbDR6GZVSzVs1I9NPhezWohDp6rnoff6xurDlq6EPlROQkBCx7WsA7VXkq
+hrhDgTQ1c4scB0Cp8PT6NCefI+X/vNfCOiShgXMDrJwllZtuzrndXZafmnHC8F4y
+G+5aStbxG111dxfgvQfUCaXwPHZnY01Lz4wwOVSccGkF2caUJ8x4l+SDs9/2cedD
+Bno0fWPO598Rjht4WxcDnTPVZyrTOBRabUGMmEWuUXVC3rdiAPkvDpMeA4zt64+3
+eHrKLsoUrUmd15VRP2CTGd6XykfoeT5zyXEkLZIrn5dziTmFwLJUYBvfoIqwqfCe
+6dflHsay0hHrh7CqIgfXItfH3kT5E16do/dVLjvtBjjiAxovErSPbq0dR7ci8IC8
+yFzTb2mRTG7+rEaZyRDuqkHhb5DoDalG95n4rQvTmagKvQoE9BxSKiFkiOXBMoMZ
+m3adDRTlbtokSvsc1YAY/kUiJ05fCu16DMiiNrTZ85OXjUU64ePKbJPhi/yChzw1
+N1pU55pMkU1lK4XvSV4jOs2yTJutO2bGztq3bYQH1v3MWgnIDeWJxxpCHq69xfDS
+6MQgVbrKtPvpKry8131SpoGZkdEVu4/6hU57W912NyGW8/iWkw==
+=Akue
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild
index 729d00412460..f5e29759e85e 100644
--- 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.2 2015/04/02 17:07:36 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.5.1.ebuild,v 1.3 2015/06/04 19:04:14 kensington Exp $
 
 EAPI=5
 
@@ -30,10 +30,10 @@ REQUIRED_USE="
 RDEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
-	|| ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )
+	kde-apps/oxygen-icons
 	cdda? ( media-sound/cdparanoia )
 	cddb? ( media-libs/libcddb )
-	kde? ( $(add_kdebase_dep kwalletd) )
+	kde? ( $(add_kdeapps_dep kwalletd) )
 	lame? ( media-sound/lame )
 	mtp? ( media-libs/libmtp )
 	musicbrainz? ( media-libs/musicbrainz:5 )
diff --git a/media-sound/kaudiocreator/ChangeLog b/media-sound/kaudiocreator/ChangeLog
index 3db27e3a3b32..cc820e4c2296 100644
--- a/media-sound/kaudiocreator/ChangeLog
+++ b/media-sound/kaudiocreator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kaudiocreator
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kaudiocreator/ChangeLog,v 1.16 2014/04/27 23:20:02 johu Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaudiocreator/ChangeLog,v 1.17 2015/06/04 19:04:14 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  kaudiocreator-1.3-r2.ebuild:
+  Move various kde-base packages to kde-apps.
 
   27 Apr 2014; Johannes Huber <johu@gentoo.org> -kaudiocreator-1.3-r1.ebuild,
   kaudiocreator-1.3-r2.ebuild:
diff --git a/media-sound/kaudiocreator/Manifest b/media-sound/kaudiocreator/Manifest
index 7af46fc5c58f..7363d76ad053 100644
--- a/media-sound/kaudiocreator/Manifest
+++ b/media-sound/kaudiocreator/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 DIST 107645-kaudiocreator-1.3.tar.bz2 310937 SHA256 f0f13bea35ef5faf3fa3443701c0671f0fc89b5d3478fe286b32435df598ed70 SHA512 41df88f9d5a36fb33b516a6559218412e971ea65cdeff18cfb91acc78cf519a5af15821977e427df99c2d8d1b54f18790112a008097b720cd724d15fa8bcaaa0 WHIRLPOOL 43628ce619ccaa79d56e792287a42c72839c6d56fbc6df3d5aef4a0012b5525f2d6539db4e408c297aa07158733a206b64fcd3d8aa6a677d0f66af21cf6bab0e
-EBUILD kaudiocreator-1.3-r2.ebuild 1084 SHA256 00805243c1160b40f500aa2b716118d19e0b6045756d828a0402f212969c52ae SHA512 ef20f65aab9d6a05b8a84b9a763dda3a9bde943695c2372c16a766b63439d6208fa94effec9ea21673baa1f85157d646b1a51dc3704565725aae0b664aacd531 WHIRLPOOL 57e416773abcc1acddea89f40843069235021893aeec553edaf7f5b836775aad790fc243d46fcc4bbd5be9fa3a0e09e5ce1c2cfad349bda1032bb6a63c1538d1
-MISC ChangeLog 2417 SHA256 e173f6582a329900672cbe93504e0595b6160ea259a6e8d7c6774c00345548fe SHA512 7f3dade27bbe517e0345e206d7b3b8fb99848bd3c27ca28790d4d4075bc0ea81c70989cd6e4555be6d30941c672b47e7ebf0af08b385d4b95d5e09bc5f288293 WHIRLPOOL 1d702156825535362976717e27d9474cd190e88950e8497e917f70446055c899ef19b4e63a51eefc500189f0d7b7ef705ec4c5612bd56ccc52a067b51e3d4031
+EBUILD kaudiocreator-1.3-r2.ebuild 1090 SHA256 c9d097992f594f65c6f99bf971d20cea72632f513dd4d39685dddae59aece9b7 SHA512 fe5eb53fdfa82474682609b4f66b573c5ce1f3d0a825fe0933f4b75aa4366bfc72e0e3997139f3dcacb83d35f133c6bf363db818688fc172db25e8f46f25130b WHIRLPOOL a3175ecc07e9ff0bbd02a5b3ca943080fcc36cb0db1ff7b38bfff96fcc658d2fa69758d722d63a4ee9248773271284e69900ae7566f83c056caf410e82ff3b3c
+MISC ChangeLog 2557 SHA256 de9e61f2cd011bf2605f585be8a0ee2f4df559f11453ef9925e6a2295cd98748 SHA512 5e9557562a17351072ecebcd54cefd3c5bbf4c7f653c5e41c0e46a4e19e129b1472ebbe954f326a72befc78efab801667cee60373ca4b831209dc49ac976de30 WHIRLPOOL a3cd7e4805bf814c9518916180f8c83ce4ea7b351188c1f78a9597e0a37f73761b38e30bceaf495fb71885e887d805bda3d4bf971f07cae15da1d97717cdfc2d
 MISC metadata.xml 175 SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 SHA512 5ff203d1a4c847073ed7db5a7641ba62b038efde6a1c9433c6c22a5aa4e5bc564f185e71bad1e70c9ebbdeaa1dc74860fd7049bddfbfd7bdbb182393b4e8ddbe WHIRLPOOL fbf3b59e31af0074655e65c94c07cb242200fee72eb816bd1ba8725003413b1be87f6c160106542913ec53b5ece21381d570b0aa0d43dee1ba6a580e2f0774d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTXZCoAAoJEGVpnaTzz9K98WMQALRXLdqJJO0NhXOfiwNS6PWb
-QR3jaaeF6qTjVsmLjI32ICy0pWRMR0ggRo5QLEClmuLEchk63PdK5LueL13bkemI
-+wtAhd59VTU3dr57eZNJFYBVacLRBTsksSLKzaBWdsmmEngFQtD2Q59n+m8jtoUm
-Y1tlxLlMd8tdoIsf3eEuMuKnubGjYWATZLx0oubyx+vFgplVT6FKbDfosiaalcoN
-tCXIljEU8iHMh/oPbQtIy6Zig6UGVrqmEVjRBr/TfgQy69J8pkB8YTJmtw7dH8AY
-x1LSfwu2nOawzdxyu6mVPvEaZReXLWKam2s/Iz0yGy6nBncxzmJyMv5wifqc9k7n
-5AYEAaMlFqNiRPvqHrlew4pbzTCrAEOwmiUeOZHzkzqf0HlthukG+zrUj5zTNDpO
-5Y58XSTGF+1hHlNwEhP8oXO3QAifH0UGcfY7b5JKP+JFmh7NGbaiGuKmJVevZM1q
-znGDlvqG3OFzX7qcQmBr8jwNEQn4oX3L3k8LN8Itq9cDmwnrnQceBhBkW+cPmQi1
-EpmnganUwf0TK2naUpM6owrx6Km2dzVvSAeQ+3gVnMdZrj8fvdxP0eslbqUhXcj4
-NU47QlOvgcHPsxTx8qtxSuK7A8xaEARwcK28HIZ5/EEpp0dftFF5IiFCFuoSL8GV
-W6nx8CdFBD46SYCJC++2
-=cBvp
+iQJiBAEBCABMBQJVcKExRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7JOWEACKfZD1k2MznPGOGjtKu7lmxLOqQXH4JAb2qVjSaYLtfy+9tVR35RFYDyh3
+qIgaRIc1DDYFOTU38S4+ilCvNMh09YMtcJB0BySRTem9JzoycpHp5A+wYPpBeFf7
+egYx+u8oVr+EaDtJSz1Gfv4JxkB9ZXkNiM/qP3joK4RU0o5aoo+wgE3ckqXMRrKN
++4hqL1cz4m83cvX23Fs1MtCu3M7sdyxszrDdr7iJkwRVcPetWJXhylt6yCtcAv8u
+0R51C877iQF7xu2xboM4KfqdMl3OP8I/WgCeV7JlJrHleDM7GjsccJ0gmqBy0kyL
+LVNEiSqQ/W1MfMmAe89z8PBYhWEqLHt2rPj/9zBp810PJzCjxMdpsjm+pAI894JS
+ftiloQ2lT9Nrz1mCtg+kaNe41eF01XfjwRUooxUGjNomX4k7xsWt68nMPdx1kTrT
+1OhruLAsDtOkbL/CFT8ALSr8LbXJU3B5s6wj83Bsqpvd2A6FtbOGpAs6ivGDfus0
+wtezAOTpKlre4RS88Af59v3J/y4Qs4wQJBWFuYOvQ1+2p5/JW1fmaOK2BvM0r91T
+eft5FJyqw9qt+H3zPoLdIiU+PBGtrg7P3WDJuIsY61Mq/E4o6iufNtXoaCuLY0Kb
+KGX9lqQJmevNHmibzbIlvxHrw0oEF/evUBQ4ROx7qjY+o5hwew==
+=TbRq
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild
index 552899be5545..cb193be0d4e4 100644
--- a/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild,v 1.2 2014/04/27 23:20:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild,v 1.3 2015/06/04 19:04:14 kensington Exp $
 
 EAPI=5
 
@@ -20,15 +20,15 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 COMMON_DEPEND="
-	$(add_kdebase_dep libkcddb)
-	$(add_kdebase_dep libkcompactdisc)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
 	media-libs/libdiscid
 	>=media-libs/taglib-1.5
 "
 
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
-	$(add_kdebase_dep audiocd-kio)
+	$(add_kdeapps_dep audiocd-kio)
 "
 DEPEND="${COMMON_DEPEND}"
 
diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index 63b2677bb6ce..5334f89ea138 100644
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kwave
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.40 2015/01/10 10:52:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.41 2015/06/04 19:04:15 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org> kwave-0.8.10.ebuild,
+  kwave-0.8.12.ebuild, kwave-0.8.99.ebuild:
+  Move various kde-base packages to kde-apps.
 
 *kwave-0.8.99 (10 Jan 2015)
 
diff --git a/media-sound/kwave/Manifest b/media-sound/kwave/Manifest
index d1b5c024a9e9..910c7b0ec1d1 100644
--- a/media-sound/kwave/Manifest
+++ b/media-sound/kwave/Manifest
@@ -5,25 +5,26 @@ AUX kwave-0.8.12-fr.patch 8186 SHA256 be353001ea0de90f779890e5228451c1e7eb61d333
 DIST kwave-0.8.10-1.tar.bz2 2955781 SHA256 82f6cd2b256fbeb94fadd0b7920671e69a4ba2649b9bcb2bdaab8dc834b757bc SHA512 c6421b9ccb03e198cffd745e7f77553014f9148930dfc09e59a5ff02ba5c36cd17ad2835f76033b3edd517f006bd164fd1def6fa0f7189177c62012acbfc380a WHIRLPOOL f325a160887c33589faf0316adc34740096f67de288d56506c57da74357379ab8866d3b5ee0d31537fbc6ac250f67612f18f6b2d5ea8ec4c28d73c3da5251566
 DIST kwave-0.8.12-1.tar.bz2 3692668 SHA256 88c1fb9fd55b6a7fe230d3257268f8c91d5b6ddd6106b4a1d791bb671e6d4b0b SHA512 1ee182054b2e35aa6e40c8c8a51589eda615a019578f41b001d470bdc1809970e5bd78772c4c87c5a482dbe72e08b5ae5992457e9aa83fbb92225408e9f3f10d WHIRLPOOL 0934e743372a00b92a9fd3ec697d68ea267b41bf491dedbc72a139ed42da7b7db0bd4cfad9355b9498a06865b672cd87b2d8c94959fd45a45a7cf509a0889b2a
 DIST kwave-0.8.99-2.tar.bz2 4111307 SHA256 94ad5d5d526714c5c496cf2f83d4e1aa34081997f574b465cd1972e5cba377f2 SHA512 390c08a2b8e540deb15d59a97dd210c6ce051cb2faa2002f60fb9ba03460978c633050688c16ed6e12442c40eef57710aa4ac7268964a045e35a2ac5c637cbdc WHIRLPOOL 66ade430c4f29934fd41576368fa8ff685c3cae5ebf14a006496641373efdb05aa1b6327522e76b04ba95b847f8bad97390830d13afe72c77b9e6e5ec41f2f5c
-EBUILD kwave-0.8.10.ebuild 1636 SHA256 6b7e9a8a91419ad50ba55d5633390739c0767bce8603b7da13e2969642f1a340 SHA512 0f1f4d9d0f44e83ccaf7386b1919a8d99a7b039a50c00fa34cd748a309e1366b6a940e0f73c58c7372873da66ea6b6f78c74cf6f1598fbc70c5a788d353238aa WHIRLPOOL 06a877290970d87577e368b9976313da40bc85ed883a98a0e24205571f8631615096c4ced9190246d717181a82e3db2fd2de12a4da151e8dfc1af9ce419003a0
-EBUILD kwave-0.8.12.ebuild 1688 SHA256 a63767693e8164319ac47b433961eec3484032796dd4c3bbfec4936f4dead0bf SHA512 9c636775a43302098675976f0e6aea6aabe4f79277b9a14ad6c00af113ef80ae6c092272ea2f5fb49749f6fa729307c5c1478f00a221b48f5e60c12e1b5a471a WHIRLPOOL efe281d10f4e1c7eb4404a9ab9d7d931ef1cabf9e98849dad9d241b4eaf5639af786834418cb3a8e1a8ae12951e3118296ba698045aa6d17f81ce7bbe82b292b
-EBUILD kwave-0.8.99.ebuild 1648 SHA256 da6fb3b797cbc32adbcd8228e5b88a2f228d9e6e1f8cb4ec3fe91a2ca9476c28 SHA512 cfdd35d5a92ce456607159a498cb5a5f6dfddde708a95ee5bef4d5770de6c205c18ed981485038c287780612a3adaab822712f30ffdcd5256e95c4152d0a14c6 WHIRLPOOL 97d4843bdc6ce651d9a7950ea47dda05a0c147d58c08555b37a30a4115a5a82268dc6a03e215fa146f929db7b1deda00f2d8700518fb0a1bd88076c2788f1fab
-MISC ChangeLog 6854 SHA256 47b8de20e29ea47df61964fb06786e5757162a2cf71f7edddbb30726368f4a1b SHA512 cd3f459897164e4d76f97fa8b101366cf308f9d5d241d8d09fc3b5e321fe4d197bc434edaab52745522ec9ceb5992b56682ecb1ec61422a07bcb30bfd85031aa WHIRLPOOL 5908173e4c31961cf07368b0f41e12398775f74ba37fb9f48cf676b05d944e6ae301a5011ba5772fc356f655ba019f3a2a26f1971102e795b22c32f625afc9d3
+EBUILD kwave-0.8.10.ebuild 1642 SHA256 104a9ee9363cf2ded2530227e90d0742e15d774e73d2c676076d9d5177fadad6 SHA512 0c2e89a19d4c9010c97bbc9e023969495d6a4b790b3ba49e9155f889cae9103a7cce5e37eb2e7a49a8a2042dca608ee020b5143cfef18a86544db723059e96d3 WHIRLPOOL 0f4d7fe51943c78aa46fae43286cb8251fda1b02d6f67bb920da436cf3ae95b58c2712da4624d550237d80472b1e510971ba9a92ca770f49b92b943dee282317
+EBUILD kwave-0.8.12.ebuild 1694 SHA256 febabbf2aa88895a82cf7d2babe12a73449dc851aa5ff5fe7c89bbb2f8075fa6 SHA512 b0009da9f6edf154202c86c06fc3fffad39d19904a4932e1a1246f7968fd26c85a2fca7ca245e27d4b9f0efa4f5627b0fb473d2547c33d98f60d85d13e38259e WHIRLPOOL c9434a213b663a6e0749dfeceaa23183a7f2b571f9f8b5f664e1f315c720577a9ed89186bd1924669b8e5b60096f19c3f95ed81b27419b1e1f376df11b50edd2
+EBUILD kwave-0.8.99.ebuild 1654 SHA256 32f99b4cd1aca7c18bacded0797f48a7601cdba73a70344444ada54389fb82c7 SHA512 975647fdc14a2d4dbca34cfcb12a1e74483490c885130e0aa0165177152246391e342fac48329f3773f8deec60cc36d16e0271eb9309f5591f2538f4c7fbe26c WHIRLPOOL ea251d5b74fbf9a70dfb3b4f7d301a9ded24b3ff221a88d26d20ddbbf2464c0272cfda7608068181004b007ad1c2347ca5e907b9d1ef3d3d358486ae0b7207f4
+MISC ChangeLog 7028 SHA256 27038c9d921501b0c6911ccf8cd9c3642b2f2abdba60b908a07a9e2fd6078a31 SHA512 0983abb4731abc1dd6a01b860455e521ff10fbedb90ffcca71e1277842c31a41ba7c753a475951feb9a90552c23767a90fa45299372d8d7e48378ea371b40827 WHIRLPOOL c796794aaa401898004249f8e58709a01638214ebccf06e72f0304b8a93c91e924fae5183d728b2a3b9bbf0f1a0790881737559e15ba306129f6a4d2183e010b
 MISC metadata.xml 791 SHA256 7e04e8d72c6d31f95f915ac3b3cdc01b7f9280f27ea1e185916d355418cc537c SHA512 b529dbe77061ee372bbf1fe6adbcae6086644c8975fb7673026e69b6221bdc3c14bdb4a70e81c1588235799c4986cea0039ec3b939bcd979e452d700aaaa8b9b WHIRLPOOL aca90a2ab6f891e2cffa06e60cf308254a2d2020cd3c3e40ac78d6f482a91448b44218803ceaf3abe6a24d474989be0bf7ddd7fde57bca5375006bca11cb5663
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUsQRdAAoJEGVpnaTzz9K9dvMQAJHXAY56yCZBfRzP+NK+r+rP
-j0ZfEbrov2lR2Ubsdz8HS3lestjmqUKEbmGUFE2oyg5TYo6LGxSsEvKbz++tWkeA
-KZ2ztqWIXs2kEffCbhiq+XM4szCEW6B79y6qJzRqdcurN9fFmYPiv8oNMgVfyrYn
-e9flzlE2wICCbstmfhx8jQ8n3B2LFg9xqmaOTXN7wo48NHQOkJ9bKAmRduzoUGY3
-fFuNz8xLgUPSY5aa5A4Hz03+cnne5iQyvdZNR2iP0sx5ss1GITSezluEvA8lG0AW
-iOTdtPP0WLUXNwb1+KD8JxrQnbva6NU7FSwUCENVAxJkc6mVyxxfPDBz4iWbqevg
-9Brao/eeYomhKQh/irA95oGN1o0D0dP8KbtCCLxlxknLNdGcXOe8AIGZn6CVf8ZN
-h/oc9A1UavOOZvziXwXikM5wb7gO7GLUaqXCF05qvSdlkCUUY+nE5Cc1j/nb153n
-PIbto2o1EhQWcjDoL8nlbixnQy5CWXQ905c070wzvLdGVDFTFDEU28IDqwR2jJIs
-ZGZ/QbyEv/q/dd0T0L7rRhX/R62x7oKh7gzC3s40ig1/9btolZmKwWOlgy1Hl/kc
-rofg46CBPEinfIUaOkN7Ll5eDu5hz5QTROaOD5W/oVM7B05sj5mQJDer3uhleYy2
-frxl5jCrtQxgyfOZhQ+i
-=uSzI
+iQJiBAEBCABMBQJVcKExRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7NrSEACqwf12kj6ITh/Y1ZWM+WQmx5n7HnU4wuuZbKRRFHzcedFFNSYeM3ZsYknJ
+Otez4BjgMX0l6fwzUlM7wpIBaoRT0OEha7bIq2JdEjeUXVeD+n5iV4uJF/maiVXj
+ktu5kb31xl6EKulNaCgOSh8OLnKbmLNs5UKpUl4e3cDcQH0dfrLVil/F85AwdxjI
+6kakWMMWydCJf1QGh68YV68/cnaxnzRX0zV9c8zhQo4H+nNmATl32OjQS896iTd9
+W86APXzemz+zXI+4EAn1TJXanzqea4e2fe+LrqvyE292H7WuOEwYZcs6PxsixDxG
+u4y/VNy/+TUOFRiiVjNEnixkcppIhRvEozVlVW2sDSxNd7SUSfUaD9J2f4s6PRd+
+bIGiOBTMR85T9vGoUuznR38Fx7QDbhClGEMt06ZirIqBjYUv8soVevGG1idcwCXG
+9Rz5IJQiz5rS0Ff6zmBzEUKoM2qLHXUOH/0fpUYJFAPnmZO0S/GIwjZMw2ktdi4k
+8K5U5zvm+hNYGXQyiR9c8c9iS4Ox67hgJBDAbXsZbOUm6BDMKwXoWDINHAA5x32c
+5atMJy+kVVaDy/XmYuhKmq8dj6/SSYEa66jCmP1WtT9wXh3nk1ZFQ3GxOp1jdwoR
+mJVARx1lXM5Bgm1EEq2rqiEP9ReIcRGc6Jm7JzwZv3vdPvZG9g==
+=QvWe
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kwave/kwave-0.8.10.ebuild b/media-sound/kwave/kwave-0.8.10.ebuild
index 2dc0eb9efe02..7ce8f59e48ee 100644
--- a/media-sound/kwave/kwave-0.8.10.ebuild
+++ b/media-sound/kwave/kwave-0.8.10.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/kwave/kwave-0.8.10.ebuild,v 1.7 2015/01/10 10:52:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.10.ebuild,v 1.8 2015/06/04 19:04:15 kensington Exp $
 
 EAPI=5
 
@@ -41,7 +41,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_kdebase_dep poxml extras)
+	$(add_kdeapps_dep poxml extras)
 	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
 "
 
diff --git a/media-sound/kwave/kwave-0.8.12.ebuild b/media-sound/kwave/kwave-0.8.12.ebuild
index b24bb2035d57..4080f85a2c86 100644
--- a/media-sound/kwave/kwave-0.8.12.ebuild
+++ b/media-sound/kwave/kwave-0.8.12.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/kwave/kwave-0.8.12.ebuild,v 1.4 2015/01/10 10:52:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.12.ebuild,v 1.5 2015/06/04 19:04:15 kensington Exp $
 
 EAPI=5
 
@@ -41,7 +41,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_kdebase_dep poxml extras)
+	$(add_kdeapps_dep poxml extras)
 	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
 "
 
diff --git a/media-sound/kwave/kwave-0.8.99.ebuild b/media-sound/kwave/kwave-0.8.99.ebuild
index 32bfe7619c37..9caec047e57c 100644
--- a/media-sound/kwave/kwave-0.8.99.ebuild
+++ b/media-sound/kwave/kwave-0.8.99.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/kwave/kwave-0.8.99.ebuild,v 1.1 2015/01/10 10:52:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.99.ebuild,v 1.2 2015/06/04 19:04:15 kensington Exp $
 
 EAPI=5
 
@@ -41,7 +41,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_kdebase_dep poxml extras)
+	$(add_kdeapps_dep poxml extras)
 	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
 "
 
diff --git a/media-sound/lastfm-desktop/ChangeLog b/media-sound/lastfm-desktop/ChangeLog
index 8cc5829558d5..1015a312f184 100644
--- a/media-sound/lastfm-desktop/ChangeLog
+++ b/media-sound/lastfm-desktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lastfm-desktop
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfm-desktop/ChangeLog,v 1.4 2014/03/27 07:16:01 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfm-desktop/ChangeLog,v 1.5 2015/06/04 19:04:15 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  lastfm-desktop-2.1.35.ebuild, lastfm-desktop-2.1.36.ebuild:
+  Move various kde-base packages to kde-apps.
 
   27 Mar 2014; Justin Lecher <jlec@gentoo.org> lastfm-desktop-2.1.36.ebuild,
   +files/lastfm-desktop-2.1.36-missing-cast.patch:
@@ -21,4 +25,3 @@
   14 Aug 2013; Justin Lecher <jlec@gentoo.org> +lastfm-desktop-2.1.35.ebuild,
   +metadata.xml:
   New version of the lastfm player, #453566
-
diff --git a/media-sound/lastfm-desktop/Manifest b/media-sound/lastfm-desktop/Manifest
index fa05d9dc96fb..2c29a4080f0d 100644
--- a/media-sound/lastfm-desktop/Manifest
+++ b/media-sound/lastfm-desktop/Manifest
@@ -1,29 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX lastfm-desktop-2.1.36-missing-cast.patch 872 SHA256 e4fe322cf02510e7d5a458d440cff40603e124910f8891a904b87fa1f53bd04f SHA512 b06996d0c963212af7df3a0103a93cd791ef1a1fce665a986458d07dc317133337cdbf4fa841deff6b340f0a9534177aca74a3f6d2b5cf7354d11be7542f444f WHIRLPOOL 1387e8d2c9189f37aa164bd66133fdae25918fe593b4c4211b25652cc8958f28d6c4a7362aa320a42b86a389d53d1433825b2c7b20f7e27dbe0841527d77b9f7
 DIST lastfm-desktop-2.1.35.tar.gz 6789600 SHA256 2f96f0bc66c8b87dc3ca7858ef756f1ec4c84eb70eb1c411f840af51830a3075 SHA512 9eb4f750b344b788195b6800dc6fb6962449bcfc8cb2933a5065eb6f45e7d1de0463c7c091da3001a5e09dc116939aa4cf8918138bd749ba8c06c6ceca01684a WHIRLPOOL 5cc85733e8f2f08698aa0e8f124dc55a9ef00beb579e79b2569f14d6aef1ced7c149027353cff38ceaccbfddaf7b6677091b5e489fae24667cab5cb100cfeee2
 DIST lastfm-desktop-2.1.36.tar.gz 4087375 SHA256 2c33e8b8d6442da768bad3fb96e52a67ee17e3e64c5899ad81a893075635b969 SHA512 bc5b50dfa3390df878c0f97064a863b36bfa74a0eeb3130933d628f0837c2ca663b93a42a7a114311976ea44cbbc67439390385bf3e451f64b755c74db88ddb4 WHIRLPOOL 9d40ed82df3a1cd6d550561247f34b4c78c8620a10e0c16129c0c8735aaca2d6cdd90352672146ebe5e4f4096a37d19142d5c66ee60dd0184d57d5d0b1bc8dec
-EBUILD lastfm-desktop-2.1.35.ebuild 870 SHA256 0a2341167e93b8a9e3ead91f650b940062e543e685b5d509f00ea6f2f1a68699 SHA512 02c7c2960553b8dd2514c9e5947504bc0e001bd20a3ceeaa1858e5c95af29bc63a28737a9f2bdc6853a5b942d2ae6cb06a45d76b6c299d7bb26df70100f05823 WHIRLPOOL e2a43ebc1387bce39e444e86834b2b6e14afdbd1b958d6ee0268edd202e5026c8dc9c786ae1e4cc2896f9d00d764fa0034501b4a8bcdd8902c770ce35ec35a0b
-EBUILD lastfm-desktop-2.1.36.ebuild 903 SHA256 91977342504e7e262f4ab48b429528d0c2e19051d0d5ff9c2de327ef8499f749 SHA512 3f0e72aba986a70d292d33073a64eab0d5ecd24f1a8968fbc616a63e850f10f73593dcac445d6ff29a63100736da88488f48413ffa56fc38d100b5acc92d0174 WHIRLPOOL 6dc1f49e0fd0a2feaeb5d9d07c99f908e4576992d14030feb7bf53025fa13a051d7cdfcc4a6789805afcea992c7eb3aed62b974056819f6127eb0dac83f8f72a
-MISC ChangeLog 942 SHA256 6d0c17ece6546d06d758b5ccc5688567d3d95f74ff53882c9c2cd3951782edc0 SHA512 06d30499fb4242edc90d6d26a14fc762f9a83f542ef513c59ff5eeb1801e207f331af14dc742d557fbf2709d9aa269cec7a70c374a5c375740912b396b41a357 WHIRLPOOL 73ae28e9fddd20c39c78a69295922dd4c798b25ca7b2e804b642c86a9daf49e6ca7b3bc8288dffa4a917b8e69e460b208e4206a288974e268916c42ba31b979b
+EBUILD lastfm-desktop-2.1.35.ebuild 876 SHA256 9a1180ae25fe832b2b9c190685d4797aede4d82ad21201197e0ed245a43d7089 SHA512 5d7b70f5924ed983d2a4b86b734d6e1aa71310bae0f710329df2c6c14ee8fad837e7ef22232e36cd8bc2317b928221145a9fb102b5db9f87c24e544875a4be82 WHIRLPOOL 5977bda4c52fa7ccaaf8e5a637d93a1e54fca3c84e067bbce6be38058f3b52911e12fc4ed2feac6f8ab8abe68c8978ef17e3cd279f74e952eb5d5dbef7a4b3ce
+EBUILD lastfm-desktop-2.1.36.ebuild 909 SHA256 3515996fd7bd127504d269429702030a443e1906091e93947af0c9f3a0e669de SHA512 1fffc665f590fbadfbb16896fea8ae67f1d3add81f80bb3fd1570ab21d5bdfb57ec3189059f1982576101191752fc42ce6c3198cdbbe842c9b65fbdfd32cca59 WHIRLPOOL 6a66248f33b11d82f30f1660e12c7704bcedc8b80e60770391f3ec6dab77522c44b736226492a03a598031ff008b9fe9bd2248a4fc6a09f834e1e976099eab87
+MISC ChangeLog 1112 SHA256 a8deb424af62d209fec5819be3cc10994b23735c5c19c9c7fee4c2ca3f7939af SHA512 a17efaec9e08a8f93cb1c2ba7dbed08fdbc03bf72da114c03c4073a2a8cce840b40054b6db2553e81bdc6a4ed0e87a1ca91fd3b5c42556794865cd124f177e71 WHIRLPOOL 0d571453fed4f2e96900f5df8e2c1b868f57b06faf2da9c510126e547e1ab78cccf582af7efcb47e46274c73b5d8a57f694ad0bec49fab4b839be24bee03e0df
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTM9AxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirzTEP/R/zqxes+iAFfJc9Pa5VEa7B
-AXCF/11nTrZYxT5ASZ6UNhayUB93m4MSzXnKkV1reV/OKVx3dIxKO01D2mVKJPRL
-gPbEKKp5R5Y60GJqJNg+BPNsRm/t1hr4h2rYEjuLpGAGFQVTGALaMw8wHfXiQCac
-LEZG83be6s3n/t4Wq8ZMiDmr/bhT8PlBbn6E93D6yge2a9KbO9gVrapPl9oVgUyr
-qRaV4UgDfXnCuyWGStiXx7Vc4OP9hgjiru9ifxtkqnL2PZNTokTxx8yKvmpd3QbL
-MEzA9GH9ND/4D2mHtQg86+A03rTIsO2fovHYYPPc5A8TBnMSxA5rnNmfAhw1j5RM
-gdBsdwKcoxIzcX8rU3WxXI6eg8UvOM+w54pUcCfH1tv5iELCdcl+K9nP5rMaBPP8
-3VixGADhIl/3CQgFVkEBktPK1HiMGeF2J0D9JNqKvmQz18aJD6Qn67RPbs/P+qD/
-U3E45CBMO+wn0TrxWf4BA09qRdv7R3/g9QYkrqe2q6AoJOCbMOpwGqRcBIbD4uDu
-efnPH6ZLQtemPInwjhvkp3C2K3pl2kLvGg4xvbuvpiNWBTrmdgtbYd2ZCbIq/8cj
-AJ4TNigl9FOsbO1GDhy7W1Zjg4V4AFxBtQFkNoq2ikZhW+bJ+1yvIENfaJVESvVg
-SlyBJeUjmN5GxD7nW5yq
-=gzud
+iQJiBAEBCABMBQJVcKExRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7PcXD/499mbHfKjRdQSrTfYlFmPg5z/nEcj2d0UvWhWQa9vdI869cIcxxR1z1KVl
+fMsayIyqoJjtz47L2VlG6X0Y0GNWw5/gQU+JRFHHSblxjQoHp9/zJHCxJYcaVlPM
+lORr51TCIMI/AtQXDoanleXmlUhaUMhNTmSZAMx+FSxkExSHFxvkYmuZCsUjKsi2
+5h7PGLMFo5oiXsLPhGRrHS7N521CaiX1B5duQLTa7TgXQeOStIZxV4Qde3LA0k6a
+oz4Nlaj2iIJPid4dL2ldfakREZQJgiDtYkrVlRG7tkewVj9No1oITBeUR/2YyOOV
+NMQ55bYEZwpU3GEJEI97tIEezht1DsTS7AWVMsahSU213YCrbO687eSc2lFKzB8J
+ZZrikeUYJpVlqXEDXkMGrRTFCNE7Kynl7R30mGpJNhjINC2+9ygmmz5yiGXcZECi
+orlfov4Ncx3/UMo+5X19V3JawsRW4uTIGZKi3OSY46Ft4SUmdnugw1c4IrqjZP2k
+es4z5L4/kWAjq1LBlwBJ0RqT8E4JkVrF5Z9LApAhRqPLCt7fQfS0UZLJ0SpZfhz9
+iu7/CERJAlpkUMPUSMNSOMtShu1KIBJRZEG0hLphlxduaM9o5hOhP998NhZQkgss
+o1z5R9z09qr1fHpOGvI+H6wWJpnjIlCPRO99+fybn7ShMxT8zg==
+=XYLP
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild b/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild
index e11436edd19b..f580c3e66a44 100644
--- a/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild
+++ b/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild,v 1.2 2013/10/08 12:51:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild,v 1.3 2015/06/04 19:04:15 kensington Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ RDEPEND="
 	media-libs/libgpod
 	>=media-libs/liblastfm-1.0.6[fingerprint]
 	sys-libs/zlib
-	|| ( dev-qt/qtphonon:4 kde-base/phonon-kde:4 )"
+	|| ( dev-qt/qtphonon:4 kde-apps/phonon-kde:4 )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild b/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild
index 6103ab2d6a2b..8670d8bb93f0 100644
--- a/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild
+++ b/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild,v 1.3 2014/03/27 07:16:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild,v 1.4 2015/06/04 19:04:15 kensington Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ RDEPEND="
 	media-libs/libgpod
 	media-libs/liblastfm[fingerprint]
 	sys-libs/zlib
-	|| ( dev-qt/qtphonon:4 kde-base/phonon-kde:4 )"
+	|| ( dev-qt/qtphonon:4 kde-apps/phonon-kde:4 )"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-missing-cast.patch )
diff --git a/media-sound/soundkonverter/ChangeLog b/media-sound/soundkonverter/ChangeLog
index 5bcce3ab63ef..db19cef3e3af 100644
--- a/media-sound/soundkonverter/ChangeLog
+++ b/media-sound/soundkonverter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/soundkonverter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/ChangeLog,v 1.47 2015/02/02 15:16:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/ChangeLog,v 1.48 2015/06/04 19:04:14 kensington Exp $
+
+  04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  soundkonverter-2.0.3.ebuild, soundkonverter-2.1.2.ebuild:
+  Move various kde-base packages to kde-apps.
 
 *soundkonverter-2.1.2 (02 Feb 2015)
 
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 0f0cfe611887..530b27c212e3 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -3,25 +3,25 @@ Hash: SHA256
 
 DIST 29024-soundkonverter-2.0.3.tar.gz 591340 SHA256 86e1a62a47433ab446c165c16b8950d3ed00cf73dfb3d411019717e8e5d73f0c SHA512 106620e82162280c96ee809145d7196bec049f2a69c6808dce2528ccda5be1976c5a6aad32e25fb6b5578417e535263f4425edc1ebe4b28f6a2f5fdcb9478c98 WHIRLPOOL 2df0edd1342e63cde2407d8a36484d323304e8bddff89ad9f112e218e5f23a0820c51fb7b03d3303623681348df76a9b5895e243f358c6e3af6115722c8c4139
 DIST 29024-soundkonverter-2.1.2.tar.gz 756039 SHA256 b7b984cfcebb31c5e16fb3e04fc811b58453ef5454ea9e567e8510fcdd498957 SHA512 fdbb782eea4702d1b6bfe0135ed8ca482bd43422bc4c825b8b1afe3226faf315b618b4392223d5b3169e831c8e867ee64a11f22e22c53df7cb6b92dc5f1dda23 WHIRLPOOL 7f19644aff536d1715935b58f3c5bab27f7b967aadf7503ed26d168ba1fe1a92a76ba4bec28709c23053a46f32b593034e4941c2ec0e054e0eb8a79ad6097da2
-EBUILD soundkonverter-2.0.3.ebuild 975 SHA256 805aeddae9221ef052b3b5128c39643b5b2564108b4448165e0020ca58fa70e1 SHA512 8cb7451164b2658496b45ae9d7784e1b01d107091cfd4be26a4144ababd186a3e2b7f2581854227af808342bfbb60757780f2a56608388e061def544816e3950 WHIRLPOOL 2ba31e774e4b0695204e5d6feca80894b9ef9d38bbfc0b5c9858ff5bb6daaf06cfaa93e5535247b04a9a5232152697907a4f2d55d79eab5c90e45e3008b3d15a
-EBUILD soundkonverter-2.1.2.ebuild 1050 SHA256 69ba698f564b2cc21fae5de72a70e7d55999ba027b91992fb7177ad8137ccfa4 SHA512 ebce654ebacbca2fba260c855d5aa79f5ed2ca444e82dab3bddd311cfb743e1e32ac30fa7c39db5849e2c75a624139cbf36cc991b46869fc7ae84534faaaee50 WHIRLPOOL 4d8b7440bfb93521ecff70cb0210bb8fdcdf1f4dd703e5902a5ee1e276d9c07ba6ace6824ca44adf210f8e58eb805e7d45e9bedfb192200dca6c1c74bddd1653
-MISC ChangeLog 8245 SHA256 19f99896a81ac91df1b68b02b239852a5bd0fc7b16070425d89bfd4347e52748 SHA512 967947f0abb0b2c2cba36e3e118854e5f2ff15e1193d532f68af331d6996bffccb0d8ffebb3f275b41f1410e66c50c654929e2da363b611573cd2aad2b6061bc WHIRLPOOL 5c84002a3956ca59a3b5eca13b8638475869d8d52c695187cfcda39d1adcade28a92a973d1a31c958a903d18c9147ba076b8880339f414c0832be2ab471cad95
+EBUILD soundkonverter-2.0.3.ebuild 975 SHA256 b128f2afe9701ab87c03a02ee321a6103c970acdd00b2b4576d0ebf7a7ec0400 SHA512 4cc646e5f58b905eb4965dc7fe3c882ce3a5244c57d3d9e198a1e753e63f27e65374595b07eb04117d6fbc70c0f7bc147f2cbad81a6939717712f23813046b32 WHIRLPOOL a654457ebc0e51d4a5fec2edd30d76dc3bdc03e4a554fcd05d27bade1c5472c36a83465a02b24719ef1ec01123421849ab1ac560f0d4e0eaeebd34ef470af8fb
+EBUILD soundkonverter-2.1.2.ebuild 1050 SHA256 1a2d95f4593ad064f759d2ac503950c15cec096fb205ba2f62d2c9a6986b5966 SHA512 63f81efb5982a1cff05703b6be61c36cc442fed47c7a808c348f064e24670f584bd43d6717a782322a3ee16ad2621af4a262bce9089d53b5198a1c2b7e81e795 WHIRLPOOL 7b815d08dc6f2a80d1bb493a0ca08a20ae812ca43c930065cadfc7404331687ab544f4664b850bfc2336a00d6a94fd675b0c0632fc735b32f991cf61491997bc
+MISC ChangeLog 8408 SHA256 9a70a27906102f0680342b456761e5ceb3acd7b2c6fd4166c8a6078a622b8ef1 SHA512 bd0e1d8055f7c4a966e911fab5a2aac29e71910199bd2ea5f466500616c105c34a6a2bbe6a3030f6a0bf62be4c73c0e8bfb4adf62abf30678e20aca73e88bc5d WHIRLPOOL c8784a5fe53dc768d5226801c3f09cc5c78af48a41d5dd3b786ade2bb39632ecdcd69f8f9ee1d647461a09e179012c37afd89e12e6474176ed88340714f70c22
 MISC metadata.xml 177 SHA256 152e09b8470591919a715c66bf16f28034f65c5326a69f6b0493fe93232840d6 SHA512 9f6d69e1c6b9216f106baa5a508e300f6ac08ad1beceafae973921e9bc28eab3319d0ee773d7e26ac0c0eeac1706ce1593fe4f2de6776b0896365d9fdfa3f90e WHIRLPOOL cea00c3ea4a5277c16bf20be5f2f7464e01639765ccdcc5f438b6b132ad5a9cf79098f26c03c02a05cef306f1580ce7b74426f7b1126c784ac37de4ce4f80d66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUz5S6RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVcKExRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7EGaEACXWCA1rW7TyARI9CKUCSSNdNaq1kBkK/OJEpSZ0aM3wqJUl0gJfeOjfAtv
-VG7JeVMRiF985U2NGfSnewF/rv+vwfpbxaufTIeC1wgTfAdXdWzocwvlyHzdh8/E
-36Iuqz9tA+HFBWPuflmJaFR3sHce6O4KaiKOc1NU37163EpSP0hyQ//WghlJdXmZ
-9op8PGCUlKnUu0KUuHsXfieM1eSjvd42S2tBRFYy0JzJYExJYBVBQys/rUBfEwGK
-YluC4/qgoSCPDi/cby4Y1XgiZQu89AwUwOlmLgaDXGi54ISxK5BmU54KWTrIuG/y
-NseMrIjMCoW/aJuOI/tpe1/p1fuzDa5nMnJdHgbDS11gicVwzshTOIfn7+uy0ZrJ
-2kvJjUsWrfSTyM9G3N+bkDYrGQI1FPj/IE2J/2ul5nn/yvQWQuyzyihAQmvtwIUI
-OBZY33qghH2oYUQwoiPnYdql+zA+WKtjQXJdRcN81YL7dIKKlh1rrhyM3s73JhRx
-J+xUJ6ekF+gkAykWNTy2/E4qIxGJZpf7w7aQjZC5i3G580E533/HS4FFLhVPbnLG
-3MEs5eJSK6BxZjQfAmettAbCkklDLKAwcaFbxbquH+qcAwBl+aIMqEG70C82dO0V
-zGGRVt4NZwjpQSzZB7eRF3ZZZlBXHiwg9/br0jezEYxaAkv0Vg==
-=/vzd
+7CxXD/0Wk2cXoepU4O8jDaJ4MZnENalYCSzK/g+dcmLAB71Xfjbvp7ac4AMXhOyD
+KMS3m4rPUKEjj4O/A8r03I1roOREBIVZIjcsJjkg4ajf25u6pC3QUzITyu9UD74p
+oi4qfzjhyhh0QjoXr9ePk7JusH+Dgg8wLJiYNTZg2Y//l9xzMWd1me/k8y/B1MKJ
+N3ZhRGPlLOo6IL8aR3t86lSMhyBBDC2UXUYnw5lzje90intZkdi7XJhX/o+z8yuR
+uIs9ThmgokkMBtWg0BEETbKMK7fohaf4rg+HXHDqZ25BgI9kldMHvGyJz4qEISOf
+UWwPll2vZ6HzJ9ESIaYN758KEEpDpkGOZtUuXhJ9c/iu2RYA9wW3dHLDQnuQA57e
++FB6eo7nVwt+716exCxLhgFTnR99A9wJNZO5Mpp+zZ6+XsvgQ1Cfw2QmrFf4XHYR
+YMvE7UK9difz73ifIoSbRaoqS2n7FY2UzOA24qiVMuFK6aU5+XPx1yy8NRIksYON
+udBslQ3slWDHYqT80l9DAHX/o9trjpWtD7qLvBNLKQB1bo4KmUFdwsD6ZxupGDXV
+N7aTVDD7QyQNgPUKhK9ycD2tnDeXkbmSUM1MpxhNmZGGFYPp4hjfbvhjaJ+XjlyY
+ywoOGYd3/t/FrPX+TTkigaTonMPA+pyWSRSQ38T/5XaYi3+ZXw==
+=tk0q
 -----END PGP SIGNATURE-----
diff --git a/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild b/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild
index 0d7383634272..4b17a51b6c77 100644
--- a/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild,v 1.4 2014/03/15 07:31:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild,v 1.5 2015/06/04 19:04:14 kensington Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep libkcddb)
+	$(add_kdeapps_dep libkcddb)
 	media-libs/taglib
 	media-sound/cdparanoia
 "
diff --git a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
index 043dc07943c7..8b15dca20289 100644
--- a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-2.1.2.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/soundkonverter/soundkonverter-2.1.2.ebuild,v 1.1 2015/02/02 15:16:09 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild,v 1.2 2015/06/04 19:04:14 kensington Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdebase_dep libkcddb)
+	$(add_kdeapps_dep libkcddb)
 	media-libs/phonon[qt4]
 	media-libs/taglib
 	media-sound/cdparanoia