Move various kde-base packages to kde-apps.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

18 files changed, 68 insertions, 52 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/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/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/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/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/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/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/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