650 files changed, 448 insertions, 447 deletions

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index f5ca880c..3b69dbbe 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -116,18 +116,18 @@
 =games-puzzle/easysok-0.3.5
 =games-util/agistudio-1.2.2
 =games-util/agistudio-1.2.4
-=kde-base/akregator-3.5.10
-=kde-base/akregator-3.5.10-r1
-=kde-base/amor-3.5.10
-=kde-base/ark-3.5.10
-=kde-base/ark-3.5.10-r1
+=kde-apps/akregator-3.5.10
+=kde-apps/akregator-3.5.10-r1
+=kde-apps/amor-3.5.10
+=kde-apps/ark-3.5.10
+=kde-apps/ark-3.5.10-r1
 =kde-base/arts-3.5.10
 =kde-base/artsplugin-akode-3.5.10
 =kde-base/artsplugin-audiofile-3.5.10
 =kde-base/artsplugin-xine-3.5.10
 =kde-base/atlantik-3.5.10
 =kde-base/atlantikdesigner-3.5.10
-=kde-base/blinken-3.5.10
+=kde-apps/blinken-3.5.10
 =kde-base/certmanager-3.5.10
 =kde-base/certmanager-3.5.10-r1
 =kde-base/cervisia-3.5.10
@@ -178,8 +178,8 @@
 =kde-base/kcheckpass-3.5.10
 =kde-base/kcminit-3.5.10
 =kde-base/kcoloredit-3.5.10
-=kde-base/kcontrol-3.5.10
-=kde-base/kcontrol-3.5.10-r1
+=kde-apps/kcontrol-3.5.10
+=kde-apps/kcontrol-3.5.10-r1
 =kde-base/kcron-3.5.10
 =kde-base/kdat-3.5.10
 =kde-base/kdat-3.5.10-r1
diff --git a/app-antivirus/klamav/klamav-0.46.ebuild b/app-antivirus/klamav/klamav-0.46.ebuild
index 7fbf453d..3c328e1b 100644
--- a/app-antivirus/klamav/klamav-0.46.ebuild
+++ b/app-antivirus/klamav/klamav-0.46.ebuild
@@ -21,7 +21,7 @@ IUSE=""
 
 DEPEND=">=app-antivirus/clamav-0.90"
 RDEPEND="${DEPEND}
-	>=kde-base/kdebase-kioslaves-3.5.9:3.5"
+	>=kde-apps/kdebase-kioslaves-3.5.9:3.5"
 
 need-kde 3.5
 
diff --git a/app-arch/p7zip/p7zip-9.04.ebuild b/app-arch/p7zip/p7zip-9.04.ebuild
index 0edf1c78..bfa83637 100644
--- a/app-arch/p7zip/p7zip-9.04.ebuild
+++ b/app-arch/p7zip/p7zip-9.04.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc kde rar static wxwidgets"
 
-RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-apps/konqueror )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-arch/p7zip/p7zip-9.13-r1.ebuild b/app-arch/p7zip/p7zip-9.13-r1.ebuild
index 56ce1f06..846050a5 100644
--- a/app-arch/p7zip/p7zip-9.13-r1.ebuild
+++ b/app-arch/p7zip/p7zip-9.13-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc kde rar static wxwidgets"
 
-RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-apps/konqueror )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-arch/p7zip/p7zip-9.13-r3.ebuild b/app-arch/p7zip/p7zip-9.13-r3.ebuild
index f7308939..ea945f5a 100644
--- a/app-arch/p7zip/p7zip-9.13-r3.ebuild
+++ b/app-arch/p7zip/p7zip-9.13-r3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc kde rar +pch static wxwidgets"
 
-RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-apps/konqueror )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-arch/p7zip/p7zip-9.13.ebuild b/app-arch/p7zip/p7zip-9.13.ebuild
index 3b9c8ee1..d308ea06 100644
--- a/app-arch/p7zip/p7zip-9.13.ebuild
+++ b/app-arch/p7zip/p7zip-9.13.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc kde rar static wxwidgets"
 
-RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-apps/konqueror )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-arch/p7zip/p7zip-9.20.1.ebuild b/app-arch/p7zip/p7zip-9.20.1.ebuild
index 7cb6420f..695a5700 100644
--- a/app-arch/p7zip/p7zip-9.20.1.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc kde rar +pch static wxwidgets"
 
-RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror )
+RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-apps/konqueror )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}"
 
diff --git a/app-backup/keep/keep-0.4.0-r1.ebuild b/app-backup/keep/keep-0.4.0-r1.ebuild
index b36ae27b..d06e1e66 100644
--- a/app-backup/keep/keep-0.4.0-r1.ebuild
+++ b/app-backup/keep/keep-0.4.0-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="kde-base/kcontrol:3.5
+RDEPEND="kde-apps/kcontrol:3.5
 	>=app-backup/rdiff-backup-1.0.1-r1"
 
 need-kde 3.5
diff --git a/app-cdr/koverartist/koverartist-0.5-r1.ebuild b/app-cdr/koverartist/koverartist-0.5-r1.ebuild
index 70703833..91d27fe5 100644
--- a/app-cdr/koverartist/koverartist-0.5-r1.ebuild
+++ b/app-cdr/koverartist/koverartist-0.5-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="cddb"
 
 RDEPEND="!app-cdr/kover
 	cddb? (
-		kde-base/libkcddb:3.5
+		kde-apps/libkcddb:3.5
 		kde-base/kdemultimedia-kioslaves:3.5
 	)"
 need-kde 3.5
diff --git a/app-editors/kile/kile-2.0.3-r1.ebuild b/app-editors/kile/kile-2.0.3-r1.ebuild
index 138051d5..65ae4c92 100644
--- a/app-editors/kile/kile-2.0.3-r1.ebuild
+++ b/app-editors/kile/kile-2.0.3-r1.ebuild
@@ -68,7 +68,7 @@ pkg_postinst() {
 	elog "- Asymptote                    - media-gfx/asymptote"
 	elog "- Tex4ht (LaTeX to Web)        - dev-tex/tex4ht"
 	elog "- Lilypond (Music Typesetting) - media-sound/lilypond"
-	elog "- Web-Browser (any of)         - kde-base/konqueror"
+	elog "- Web-Browser (any of)         - kde-apps/konqueror"
 	elog "                               - www-client/mozilla-firefox"
 	elog "                               - www-client/seamonkey"
 	elog "For viewing BibTeX files:"
diff --git a/app-office/kformula/kformula-1.6.3_p20090204.ebuild b/app-office/kformula/kformula-1.6.3_p20090204.ebuild
index 3a777a51..40333906 100644
--- a/app-office/kformula/kformula-1.6.3_p20090204.ebuild
+++ b/app-office/kformula/kformula-1.6.3_p20090204.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="~app-office/koffice-libs-1.6.3_p20090204
-	~kde-base/kcontrol-3.5.10:3.5"
+	~kde-apps/kcontrol-3.5.10:3.5"
 RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
diff --git a/app-portage/kuroo/kuroo-0.82.0.ebuild b/app-portage/kuroo/kuroo-0.82.0.ebuild
index 545d5596..44cc8e08 100644
--- a/app-portage/kuroo/kuroo-0.82.0.ebuild
+++ b/app-portage/kuroo/kuroo-0.82.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-db/sqlite"
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
 	kde-misc/kdiff3
-	kde-base/kdesu"
+	kde-apps/kdesu"
 
 need-kde 3.5
 
diff --git a/app-portage/kuroo/kuroo-0.82.1.ebuild b/app-portage/kuroo/kuroo-0.82.1.ebuild
index bd7cba78..95cd1970 100644
--- a/app-portage/kuroo/kuroo-0.82.1.ebuild
+++ b/app-portage/kuroo/kuroo-0.82.1.ebuild
@@ -20,6 +20,6 @@ DEPEND="dev-db/sqlite"
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
 	kde-misc/kdiff3
-	kde-base/kdesu"
+	kde-apps/kdesu"
 
 need-kde 3.5
diff --git a/app-portage/kuroo/kuroo-0.82.2.ebuild b/app-portage/kuroo/kuroo-0.82.2.ebuild
index bcdb568f..531ae68d 100644
--- a/app-portage/kuroo/kuroo-0.82.2.ebuild
+++ b/app-portage/kuroo/kuroo-0.82.2.ebuild
@@ -20,6 +20,6 @@ DEPEND="dev-db/sqlite"
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
 	kde-misc/kdiff3
-	kde-base/kdesu"
+	kde-apps/kdesu"
 
 need-kde 3.5
diff --git a/dev-python/pykde/pykde-3.16.2.ebuild b/dev-python/pykde/pykde-3.16.2.ebuild
index d464da5c..5f64838b 100644
--- a/dev-python/pykde/pykde-3.16.2.ebuild
+++ b/dev-python/pykde/pykde-3.16.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=dev-python/sip-4.7.9
 	>=dev-python/PyQt-3.17.6
 	=kde-base/kdelibs-3.5*
 	!kde-base/pykde"
-DEPEND="${RDEPEND} =kde-base/konsole-3.5*"
+DEPEND="${RDEPEND} =kde-apps/konsole-3.5*"
 
 #src_unpack() {
 #	unpack ${A}
diff --git a/dev-python/pykde/pykde-3.16.7.ebuild b/dev-python/pykde/pykde-3.16.7.ebuild
index b3167d12..81af1363 100644
--- a/dev-python/pykde/pykde-3.16.7.ebuild
+++ b/dev-python/pykde/pykde-3.16.7.ebuild
@@ -21,7 +21,7 @@ IUSE="debug doc examples"
 RDEPEND=">=dev-python/sip-4.2.0
 	>=dev-python/PyQt-3.17.6
 	=kde-base/kdelibs-3.5*"
-DEPEND="${RDEPEND} =kde-base/konsole-3.5*"
+DEPEND="${RDEPEND} =kde-apps/konsole-3.5*"
 
 src_compile() {
 	python_get_version
diff --git a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
index f6f0228b..dcafd8af 100644
--- a/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.5.4-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="!<dev-util/kdevelop-3.5.4-r1
 	cvs? ( kde-base/cervisia:3.5 )"
 
 RDEPEND="${DEPEND}
-	subversion? ( kde-base/kdesdk-kioslaves:3.5 )"
+	subversion? ( kde-apps/kdesdk-kioslaves:3.5 )"
 DEPEND="${DEPEND}
 	>=sys-devel/flex-2.5.33"
 
@@ -102,10 +102,10 @@ pkg_postinst() {
 	elog "kdevelop can use a wide range of apps for extra functionality. This is an"
 	elog "almost complete list. All these packages can be emerged after kdevelop."
 	elog
-	elog "kde-base/konsole:3.5:      (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	elog "kde-apps/konsole:3.5:      (RECOMMENDED) embed konsole kpart in kdevelop ide"
 	elog "dev-util/kdbg:             (RECOMMENDED) kde frontend to gdb"
 	elog "dev-util/valgrind:         (RECOMMENDED) integrates valgrind (memory debugger) commands"
-	elog "kde-base/kompare:3.5:      (RECOMMENDED) show differences between files"
+	elog "kde-apps/kompare:3.5:      (RECOMMENDED) show differences between files"
 	elog "media-gfx/graphviz:        (RECOMMENDED) support the new graphical classbrowser"
 	elog "dev-java/ant:              support projects using the ant build tool"
 	elog "dev-util/ctags:            faster and more powerful code browsing logic"
diff --git a/dev-util/kscope/kscope-1.6.2.ebuild b/dev-util/kscope/kscope-1.6.2.ebuild
index 1a528216..e9cdac82 100644
--- a/dev-util/kscope/kscope-1.6.2.ebuild
+++ b/dev-util/kscope/kscope-1.6.2.ebuild
@@ -15,7 +15,7 @@ SLOT="3.5"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="kde-base/kate:3.5
+RDEPEND="kde-apps/kate:3.5
 	media-gfx/graphviz
 	dev-util/ctags
 	>=dev-util/cscope-15.5-r4"
diff --git a/dev-vcs/kdesvn/kdesvn-1.0.5.ebuild b/dev-vcs/kdesvn/kdesvn-1.0.5.ebuild
index a54e2dee..1e0207e3 100644
--- a/dev-vcs/kdesvn/kdesvn-1.0.5.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-1.0.5.ebuild
@@ -21,7 +21,7 @@ IUSE="debug"
 
 RDEPEND="!<dev-util/kdesvn-1.0.5
 	>=dev-vcs/subversion-1.4
-	kde-base/kdesdk-kioslaves:3.5
+	kde-apps/kdesdk-kioslaves:3.5
 	dev-db/sqlite"
 
 DEPEND="${RDEPEND}
@@ -62,9 +62,9 @@ src_compile() {
 }
 
 pkg_postinst() {
-	if ! has_version 'kde-base/kompare'; then
+	if ! has_version 'kde-apps/kompare'; then
 		echo
-		elog "For nice graphical diffs, install kde-base/kompare."
+		elog "For nice graphical diffs, install kde-apps/kompare."
 		echo
 	fi
 }
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 9b7e5474..ac77d998 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -17,13 +17,13 @@ inherit qt3 eutils
 # map of the monolithic->split ebuild derivation; used to build deps describing
 # the relationships between them
 KDE_DERIVATION_MAP='
-kde-base/kdeaccessibility kde-base/kbstateapplet
-kde-base/kdeaccessibility kde-base/kdeaccessibility-iconthemes
-kde-base/kdeaccessibility kde-base/kmag
-kde-base/kdeaccessibility kde-base/kmousetool
-kde-base/kdeaccessibility kde-base/kmouth
-kde-base/kdeaccessibility kde-base/kttsd
-kde-base/kdeaccessibility kde-base/ksayit
+kde-apps/kdeaccessibility kde-base/kbstateapplet
+kde-apps/kdeaccessibility kde-apps/kdeaccessibility-iconthemes
+kde-apps/kdeaccessibility kde-apps/kmag
+kde-apps/kdeaccessibility kde-apps/kmousetool
+kde-apps/kdeaccessibility kde-apps/kmouth
+kde-apps/kdeaccessibility kde-base/kttsd
+kde-apps/kdeaccessibility kde-base/ksayit
 kde-base/kdeaddons kde-base/atlantikdesigner
 kde-base/kdeaddons kde-base/kaddressbook-plugins
 kde-base/kdeaddons kde-base/kate-plugins
@@ -31,71 +31,71 @@ kde-base/kdeaddons kde-base/kdeaddons-docs-konq-plugins
 kde-base/kdeaddons kde-base/kdeaddons-kfile-plugins
 kde-base/kdeaddons kde-base/kicker-applets
 kde-base/kdeaddons kde-base/knewsticker-scripts
-kde-base/kdeaddons kde-base/konq-plugins
+kde-base/kdeaddons kde-apps/konq-plugins
 kde-base/kdeaddons kde-base/konqueror-akregator
 kde-base/kdeaddons kde-base/ksig
 kde-base/kdeaddons kde-base/noatun-plugins
 kde-base/kdeaddons kde-base/renamedlg-audio
 kde-base/kdeaddons kde-base/renamedlg-images
-kde-base/kdeadmin kde-base/kcron
+kde-base/kdeadmin kde-apps/kcron
 kde-base/kdeadmin kde-base/kdat
 kde-base/kdeadmin kde-base/kdeadmin-kfile-plugins
 kde-base/kdeadmin kde-base/knetworkconf
 kde-base/kdeadmin kde-base/kpackage
 kde-base/kdeadmin kde-base/ksysv
-kde-base/kdeadmin kde-base/kuser
+kde-base/kdeadmin kde-apps/kuser
 kde-base/kdeadmin kde-base/lilo-config
 kde-base/kdeadmin kde-base/secpolicy
-kde-base/kdeartwork kde-base/kdeartwork-emoticons
+kde-base/kdeartwork kde-apps/kdeartwork-emoticons
 kde-base/kdeartwork kde-base/kdeartwork-icewm-themes
-kde-base/kdeartwork kde-base/kdeartwork-iconthemes
-kde-base/kdeartwork kde-base/kdeartwork-kscreensaver
+kde-base/kdeartwork kde-apps/kdeartwork-iconthemes
+kde-base/kdeartwork kde-apps/kdeartwork-kscreensaver
 kde-base/kdeartwork kde-base/kdeartwork-kwin-styles
 kde-base/kdeartwork kde-base/kdeartwork-kworldclock
 kde-base/kdeartwork kde-base/kdeartwork-kworldwatch
 kde-base/kdeartwork kde-base/kdeartwork-sounds
-kde-base/kdeartwork kde-base/kdeartwork-styles
-kde-base/kdeartwork kde-base/kdeartwork-wallpapers
-kde-base/kdebase kde-base/drkonqi
+kde-base/kdeartwork kde-apps/kdeartwork-styles
+kde-base/kdeartwork kde-apps/kdeartwork-wallpapers
+kde-base/kdebase kde-apps/drkonqi
 kde-base/kdebase kde-base/kappfinder
-kde-base/kdebase kde-base/kate
+kde-base/kdebase kde-apps/kate
 kde-base/kdebase kde-base/kcheckpass
 kde-base/kdebase kde-base/kcminit
-kde-base/kdebase kde-base/kcontrol
+kde-base/kdebase kde-apps/kcontrol
 kde-base/kdebase kde-base/kdcop
-kde-base/kdebase kde-base/kdebase-data
-kde-base/kdebase kde-base/kdebase-kioslaves
+kde-base/kdebase kde-apps/kdebase-data
+kde-base/kdebase kde-apps/kdebase-kioslaves
 kde-base/kdebase kde-base/kdebase-startkde
 kde-base/kdebase kde-base/kdebugdialog
-kde-base/kdebase kde-base/kdepasswd
+kde-base/kdebase kde-apps/kdepasswd
 kde-base/kdebase kde-base/kdeprint
 kde-base/kdebase kde-base/kdesktop
-kde-base/kdebase kde-base/kdesu
-kde-base/kdebase kde-base/kdialog
+kde-base/kdebase kde-apps/kdesu
+kde-base/kdebase kde-apps/kdialog
 kde-base/kdebase kde-base/kdm
-kde-base/kdebase kde-base/kfind
+kde-base/kdebase kde-apps/kfind
 kde-base/kdebase kde-base/khelpcenter
 kde-base/kdebase kde-base/khotkeys
 kde-base/kdebase kde-base/kicker
 kde-base/kdebase kde-base/klipper
 kde-base/kdebase kde-base/kmenuedit
-kde-base/kdebase kde-base/knetattach
-kde-base/kdebase kde-base/konqueror
-kde-base/kdebase kde-base/konsole
+kde-base/kdebase kde-apps/knetattach
+kde-base/kdebase kde-apps/konqueror
+kde-base/kdebase kde-apps/konsole
 kde-base/kdebase kde-base/kpager
 kde-base/kdebase kde-base/kpersonalizer
-kde-base/kdebase kde-base/kreadconfig
+kde-base/kdebase kde-apps/kreadconfig
 kde-base/kdebase kde-base/kscreensaver
 kde-base/kdebase kde-base/ksmserver
 kde-base/kdebase kde-base/ksplashml
-kde-base/kdebase kde-base/kstart
+kde-base/kdebase kde-apps/kstart
 kde-base/kdebase kde-base/ksysguard
 kde-base/kdebase kde-base/ksystraycmd
 kde-base/kdebase kde-base/ktip
 kde-base/kdebase kde-base/kwin
 kde-base/kdebase kde-base/kxkb
-kde-base/kdebase kde-base/libkonq
-kde-base/kdebase kde-base/nsplugins
+kde-base/kdebase kde-apps/libkonq
+kde-base/kdebase kde-apps/nsplugins
 kde-base/kdebindings kde-base/dcopc
 kde-base/kdebindings kde-base/dcopjava
 kde-base/kdebindings kde-base/dcopperl
@@ -110,78 +110,78 @@ kde-base/kdebindings kde-base/qtruby
 kde-base/kdebindings kde-base/qtsharp
 kde-base/kdebindings kde-base/smoke
 kde-base/kdebindings kde-base/xparts
-kde-base/kdeedu kde-base/blinken
-kde-base/kdeedu kde-base/kalzium
-kde-base/kdeedu kde-base/kanagram
-kde-base/kdeedu kde-base/kbruch
+kde-base/kdeedu kde-apps/blinken
+kde-base/kdeedu kde-apps/kalzium
+kde-base/kdeedu kde-apps/kanagram
+kde-base/kdeedu kde-apps/kbruch
 kde-base/kdeedu kde-base/kdeedu-applnk
 kde-base/kdeedu kde-base/keduca
-kde-base/kdeedu kde-base/kgeography
-kde-base/kdeedu kde-base/khangman
-kde-base/kdeedu kde-base/kig
-kde-base/kdeedu kde-base/kiten
+kde-base/kdeedu kde-apps/kgeography
+kde-base/kdeedu kde-apps/khangman
+kde-base/kdeedu kde-apps/kig
+kde-base/kdeedu kde-apps/kiten
 kde-base/kdeedu kde-base/klatin
-kde-base/kdeedu kde-base/klettres
+kde-base/kdeedu kde-pass/klettres
 kde-base/kdeedu kde-base/kmathtool
 kde-base/kdeedu kde-base/kmessedwords
-kde-base/kdeedu kde-base/kmplot
+kde-base/kdeedu kde-apps/kmplot
 kde-base/kdeedu kde-base/kpercentage
-kde-base/kdeedu kde-base/kstars
-kde-base/kdeedu kde-base/ktouch
-kde-base/kdeedu kde-base/kturtle
+kde-base/kdeedu kde-apps/kstars
+kde-base/kdeedu kde-apps/ktouch
+kde-base/kdeedu kde-apps/kturtle
 kde-base/kdeedu kde-base/kverbos
 kde-base/kdeedu kde-base/kvoctrain
-kde-base/kdeedu kde-base/kwordquiz
-kde-base/kdeedu kde-base/libkdeedu
+kde-base/kdeedu kde-apps/kwordquiz
+kde-base/kdeedu kde-apps/libkdeedu
 kde-base/kdegames kde-base/atlantik
 kde-base/kdegames kde-base/kasteroids
-kde-base/kdegames kde-base/katomic
+kde-base/kdegames kde-apps/katomic
 kde-base/kdegames kde-base/kbackgammon
 kde-base/kdegames kde-base/kbattleship
-kde-base/kdegames kde-base/kblackbox
-kde-base/kdegames kde-base/kbounce
+kde-base/kdegames kde-apps/kblackbox
+kde-base/kdegames kde-apps/kbounce
 kde-base/kdegames kde-base/kenolaba
 kde-base/kdegames kde-base/kfouleggs
-kde-base/kdegames kde-base/kgoldrunner
-kde-base/kdegames kde-base/kjumpingcube
-kde-base/kdegames kde-base/klickety
-kde-base/kdegames kde-base/klines
-kde-base/kdegames kde-base/kmahjongg
-kde-base/kdegames kde-base/kmines
-kde-base/kdegames kde-base/knetwalk
+kde-base/kdegames kde-apps/kgoldrunner
+kde-base/kdegames kde-apps/kjumpingcube
+kde-base/kdegames kde-apps/klickety
+kde-base/kdegames kde-apps/klines
+kde-base/kdegames kde-apps/kmahjongg
+kde-base/kdegames kde-apps/kmines
+kde-base/kdegames kde-apps/knetwalk
 kde-base/kdegames kde-base/kolf
-kde-base/kdegames kde-base/konquest
-kde-base/kdegames kde-base/kpat
+kde-base/kdegames kde-apps/konquest
+kde-base/kdegames kde-apps/kpat
 kde-base/kdegames kde-base/kpoker
-kde-base/kdegames kde-base/kreversi
+kde-base/kdegames kde-apps/kreversi
 kde-base/kdegames kde-base/ksame
-kde-base/kdegames kde-base/kshisen
+kde-base/kdegames kde-apps/kshisen
 kde-base/kdegames kde-base/ksirtet
 kde-base/kdegames kde-base/ksmiletris
 kde-base/kdegames kde-base/ksnake
 kde-base/kdegames kde-base/ksokoban
-kde-base/kdegames kde-base/kspaceduel
+kde-base/kdegames kde-apps/kspaceduel
 kde-base/kdegames kde-base/ktron
-kde-base/kdegames kde-base/ktuberling
+kde-base/kdegames kde-apps/ktuberling
 kde-base/kdegames kde-base/kwin4
-kde-base/kdegames kde-base/libkdegames
+kde-base/kdegames kde-apps/libkdegames
 kde-base/kdegames kde-base/libksirtet
-kde-base/kdegames kde-base/lskat
-kde-base/kdegraphics kde-base/kamera
+kde-base/kdegames kde-apps/lskat
+kde-base/kdegraphics kde-apps/kamera
 kde-base/kdegraphics kde-base/kcoloredit
 kde-base/kdegraphics kde-base/kdegraphics-kfile-plugins
 kde-base/kdegraphics kde-base/kdvi
 kde-base/kdegraphics kde-base/kfax
-kde-base/kdegraphics kde-base/kgamma
+kde-base/kdegraphics kde-apps/kgamma
 kde-base/kdegraphics kde-base/kghostview
 kde-base/kdegraphics kde-base/kiconedit
 kde-base/kdegraphics kde-base/kmrml
-kde-base/kdegraphics kde-base/kolourpaint
+kde-base/kdegraphics kde-apps/kolourpaint
 kde-base/kdegraphics kde-base/kooka
 kde-base/kdegraphics kde-base/kpdf
 kde-base/kdegraphics kde-base/kpovmodeler
-kde-base/kdegraphics kde-base/kruler
-kde-base/kdegraphics kde-base/ksnapshot
+kde-base/kdegraphics kde-apps/kruler
+kde-base/kdegraphics kde-apps/ksnapshot
 kde-base/kdegraphics kde-base/ksvg
 kde-base/kdegraphics kde-base/kuickshow
 kde-base/kdegraphics kde-base/kview
@@ -193,7 +193,7 @@ kde-base/kdemultimedia kde-base/artsplugin-audiofile
 kde-base/kdemultimedia kde-base/artsplugin-mpeglib
 kde-base/kdemultimedia kde-base/artsplugin-mpg123
 kde-base/kdemultimedia kde-base/artsplugin-xine
-kde-base/kdemultimedia kde-base/juk
+kde-base/kdemultimedia kde-apps/juk
 kde-base/kdemultimedia kde-base/kaboodle
 kde-base/kdemultimedia kde-base/kaudiocreator
 kde-base/kdemultimedia kde-base/kdemultimedia-arts
@@ -201,52 +201,52 @@ kde-base/kdemultimedia kde-base/kdemultimedia-kappfinder-data
 kde-base/kdemultimedia kde-base/kdemultimedia-kfile-plugins
 kde-base/kdemultimedia kde-base/kdemultimedia-kioslaves
 kde-base/kdemultimedia kde-base/kmid
-kde-base/kdemultimedia kde-base/kmix
+kde-base/kdemultimedia kde-apps/kmix
 kde-base/kdemultimedia kde-base/krec
-kde-base/kdemultimedia kde-base/kscd
-kde-base/kdemultimedia kde-base/libkcddb
+kde-base/kdemultimedia kde-apps/kscd
+kde-base/kdemultimedia kde-apps/libkcddb
 kde-base/kdemultimedia kde-base/mpeglib
 kde-base/kdemultimedia kde-base/noatun
 kde-base/kdenetwork kde-base/dcoprss
-kde-base/kdenetwork kde-base/kdenetwork-filesharing
+kde-base/kdenetwork kde-apps/kdenetwork-filesharing
 kde-base/kdenetwork kde-base/kdenetwork-kfile-plugins
 kde-base/kdenetwork kde-base/kdict
 kde-base/kdenetwork kde-base/kdnssd
-kde-base/kdenetwork kde-base/kget
+kde-base/kdenetwork kde-apps/kget
 kde-base/kdenetwork kde-base/knewsticker
-kde-base/kdenetwork kde-base/kopete
+kde-base/kdenetwork kde-apps/kopete
 kde-base/kdenetwork kde-base/kpf
-kde-base/kdenetwork kde-base/kppp
-kde-base/kdenetwork kde-base/krdc
-kde-base/kdenetwork kde-base/krfb
+kde-base/kdenetwork kde-apps/kppp
+kde-base/kdenetwork kde-apps/krdc
+kde-base/kdenetwork kde-apps/krfb
 kde-base/kdenetwork kde-base/ksirc
 kde-base/kdenetwork kde-base/ktalkd
 kde-base/kdenetwork kde-base/kwifimanager
 kde-base/kdenetwork kde-base/librss
 kde-base/kdenetwork kde-base/lisa
-kde-base/kdepim kde-base/akregator
+kde-base/kdepim kde-apps/akregator
 kde-base/kdepim kde-base/certmanager
-kde-base/kdepim kde-base/kaddressbook
-kde-base/kdepim kde-base/kalarm
+kde-base/kdepim kde-apps/kaddressbook
+kde-base/kdepim kde-apps/kalarm
 kde-base/kdepim kde-base/kandy
 kde-base/kdepim kde-base/karm
 kde-base/kdepim kde-base/kdepim-kioslaves
-kde-base/kdepim kde-base/kdepim-kresources
-kde-base/kdepim kde-base/kdepim-wizards
+kde-base/kdepim kde-apps/kdepim-kresources
+kde-base/kdepim kde-apps/kdepim-wizards
 kde-base/kdepim kde-base/kitchensync
-kde-base/kdepim kde-base/kmail
+kde-base/kdepim kde-apps/kmail
 kde-base/kdepim kde-base/kmailcvt
-kde-base/kdepim kde-base/knode
-kde-base/kdepim kde-base/knotes
+kde-base/kdepim kde-apps/knode
+kde-base/kdepim kde-apps/knotes
 kde-base/kdepim kde-base/kode
-kde-base/kdepim kde-base/konsolekalendar
-kde-base/kdepim kde-base/kontact
+kde-base/kdepim kde-apps/konsolekalendar
+kde-base/kdepim kde-apps/kontact
 kde-base/kdepim kde-base/kontact-specialdates
-kde-base/kdepim kde-base/korganizer
+kde-base/kdepim kde-apps/korganizer
 kde-base/kdepim kde-base/korn
 kde-base/kdepim kde-base/kpilot
 kde-base/kdepim kde-base/ksync
-kde-base/kdepim kde-base/ktnef
+kde-base/kdepim kde-apps/ktnef
 kde-base/kdepim kde-base/libkcal
 kde-base/kdepim kde-base/libkdenetwork
 kde-base/kdepim kde-base/libkdepim
@@ -258,51 +258,51 @@ kde-base/kdepim kde-base/libkpimidentities
 kde-base/kdepim kde-base/libksieve
 kde-base/kdepim kde-base/mimelib
 kde-base/kdepim kde-base/networkstatus
-kde-base/kdesdk kde-base/cervisia
-kde-base/kdesdk kde-base/kapptemplate
+kde-base/kdesdk kde-apps/cervisia
+kde-base/kdesdk kde-apps/kapptemplate
 kde-base/kdesdk kde-base/kbabel
 kde-base/kdesdk kde-base/kbugbuster
-kde-base/kdesdk kde-base/kcachegrind
+kde-base/kdesdk kde-apps/kcachegrind
 kde-base/kdesdk kde-base/kdesdk-kfile-plugins
-kde-base/kdesdk kde-base/kdesdk-kioslaves
+kde-base/kdesdk kde-apps/kdesdk-kioslaves
 kde-base/kdesdk kde-base/kdesdk-misc
 kde-base/kdesdk kde-base/kdesdk-scripts
 kde-base/kdesdk kde-base/kmtrace
-kde-base/kdesdk kde-base/kompare
+kde-base/kdesdk kde-apps/kompare
 kde-base/kdesdk kde-base/kspy
 kde-base/kdesdk kde-base/kuiviewer
-kde-base/kdesdk kde-base/umbrello
-kde-base/kdetoys kde-base/amor
+kde-base/kdesdk kde-apps/umbrello
+kde-base/kdetoys kde-apps/amor
 kde-base/kdetoys kde-base/eyesapplet
 kde-base/kdetoys kde-base/fifteenapplet
 kde-base/kdetoys kde-base/kmoon
 kde-base/kdetoys kde-base/kodo
-kde-base/kdetoys kde-base/kteatime
-kde-base/kdetoys kde-base/ktux
+kde-base/kdetoys kde-apps/kteatime
+kde-base/kdetoys kde-apps/ktux
 kde-base/kdetoys kde-base/kweather
 kde-base/kdetoys kde-base/kworldclock
 kde-base/kdetoys kde-base/kworldwatch
-kde-base/kdeutils kde-base/ark
-kde-base/kdeutils kde-base/kcalc
-kde-base/kdeutils kde-base/kcharselect
+kde-base/kdeutils kde-apps/ark
+kde-base/kdeutils kde-apps/kcalc
+kde-base/kdeutils kde-apps/kcharselect
 kde-base/kdeutils kde-base/kdelirc
-kde-base/kdeutils kde-base/kdf
+kde-base/kdeutils kde-apps/kdf
 kde-base/kdeutils kde-base/kedit
-kde-base/kdeutils kde-base/kfloppy
-kde-base/kdeutils kde-base/kgpg
+kde-base/kdeutils kde-apps/kfloppy
+kde-base/kdeutils kde-apps/kgpg
 kde-base/kdeutils kde-base/khexedit
-kde-base/kdeutils kde-base/kjots
+kde-base/kdeutils kde-apps/kjots
 kde-base/kdeutils kde-base/klaptopdaemon
 kde-base/kdeutils kde-base/kmilo
 kde-base/kdeutils kde-base/kregexpeditor
 kde-base/kdeutils kde-base/ksim
-kde-base/kdeutils kde-base/ktimer
-kde-base/kdeutils kde-base/kwalletmanager
+kde-base/kdeutils kde-apps/ktimer
+kde-base/kdeutils kde-apps/kwalletmanager
 kde-base/kdeutils kde-base/superkaramba
 kde-base/kdewebdev kde-base/kfilereplace
-kde-base/kdewebdev kde-base/kimagemapeditor
-kde-base/kdewebdev kde-base/klinkstatus
-kde-base/kdewebdev kde-base/kommander
+kde-base/kdewebdev kde-apps/kimagemapeditor
+kde-base/kdewebdev kde-apps/klinkstatus
+kde-base/kdewebdev kde-apps/kommander
 kde-base/kdewebdev kde-base/kxsldbg
 kde-base/kdewebdev kde-base/quanta
 app-office/koffice app-office/karbon
@@ -662,8 +662,8 @@ postprocess_desktop_entries() {
 	validate_desktop_entries "${PREFIX}"/share/applications
 }
 
-# is this a kde-base ebuid?
-if [[ "${CATEGORY}" == "kde-base" ]]; then
+# is this a kde-base ebuid? CYKER - KLUDGE KLUDGE KLUDGE FUCK YOU kde-apps
+if [[ "${CATEGORY}" == "kde-base" || "${CATEGORY}" == "kde-apps" ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	export KDEBASE="true"
 	export KDEREVISION
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 73d20ad2..d1567669 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -21,8 +21,8 @@ DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://www.kde.org/"
 IUSE="debug elibc_FreeBSD"
 
-
-if [[ ${CATEGORY} == "kde-base" ]]; then
+#CYKER - KLUDGE KLUDGE KLUDGE FUCK YOU kde-apps
+if [[ ${CATEGORY} == "kde-base" || "${CATEGORY}" == "kde-apps" ]]; then
 	if [[ ${PV##*.} -lt 10 ]] ; then
 		# Keep old ebuilds as is
 		IUSE="${IUSE} kdeenablefinal"
diff --git a/kde-base/akregator/ChangeLog b/kde-apps/akregator/ChangeLog
index c44a12ad..c44a12ad 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-apps/akregator/ChangeLog
diff --git a/kde-base/akregator/Manifest b/kde-apps/akregator/Manifest
index f3718929..f3718929 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
diff --git a/kde-base/akregator/akregator-3.5.10-r1.ebuild b/kde-apps/akregator/akregator-3.5.10-r1.ebuild
index 332ef9ed..d81c2e23 100644
--- a/kde-base/akregator/akregator-3.5.10-r1.ebuild
+++ b/kde-apps/akregator/akregator-3.5.10-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	!net-www/akregator"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/akregator/akregator-3.5.10.ebuild b/kde-apps/akregator/akregator-3.5.10.ebuild
index 0d775b35..4475486e 100644
--- a/kde-base/akregator/akregator-3.5.10.ebuild
+++ b/kde-apps/akregator/akregator-3.5.10.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	!net-www/akregator"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/akregator/files/kdepim_akregator-r893152.patch b/kde-apps/akregator/files/kdepim_akregator-r893152.patch
index 692c7974..692c7974 100644
--- a/kde-base/akregator/files/kdepim_akregator-r893152.patch
+++ b/kde-apps/akregator/files/kdepim_akregator-r893152.patch
diff --git a/kde-base/akregator/metadata.xml b/kde-apps/akregator/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/akregator/metadata.xml
+++ b/kde-apps/akregator/metadata.xml
diff --git a/kde-base/amor/ChangeLog b/kde-apps/amor/ChangeLog
index be689e20..be689e20 100644
--- a/kde-base/amor/ChangeLog
+++ b/kde-apps/amor/ChangeLog
diff --git a/kde-base/amor/Manifest b/kde-apps/amor/Manifest
index 9313387a..9313387a 100644
--- a/kde-base/amor/Manifest
+++ b/kde-apps/amor/Manifest
diff --git a/kde-base/amor/amor-3.5.10.ebuild b/kde-apps/amor/amor-3.5.10.ebuild
index 4045b7ee..4045b7ee 100644
--- a/kde-base/amor/amor-3.5.10.ebuild
+++ b/kde-apps/amor/amor-3.5.10.ebuild
diff --git a/kde-base/amor/metadata.xml b/kde-apps/amor/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/amor/metadata.xml
+++ b/kde-apps/amor/metadata.xml
diff --git a/kde-base/ark/ChangeLog b/kde-apps/ark/ChangeLog
index d1794aa1..d1794aa1 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-apps/ark/ChangeLog
diff --git a/kde-base/ark/Manifest b/kde-apps/ark/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/ark/Manifest
+++ b/kde-apps/ark/Manifest
diff --git a/kde-base/ark/ark-3.5.10-r1.ebuild b/kde-apps/ark/ark-3.5.10-r1.ebuild
index 489c7f22..489c7f22 100644
--- a/kde-base/ark/ark-3.5.10-r1.ebuild
+++ b/kde-apps/ark/ark-3.5.10-r1.ebuild
diff --git a/kde-base/ark/ark-3.5.10.ebuild b/kde-apps/ark/ark-3.5.10.ebuild
index 9490fde2..9490fde2 100644
--- a/kde-base/ark/ark-3.5.10.ebuild
+++ b/kde-apps/ark/ark-3.5.10.ebuild
diff --git a/kde-base/ark/files/ark-3.5.10-desktop.patch b/kde-apps/ark/files/ark-3.5.10-desktop.patch
index d95ff15b..d95ff15b 100644
--- a/kde-base/ark/files/ark-3.5.10-desktop.patch
+++ b/kde-apps/ark/files/ark-3.5.10-desktop.patch
diff --git a/kde-base/ark/files/kdeutils_ark-r865133.patch b/kde-apps/ark/files/kdeutils_ark-r865133.patch
index 9d3616fb..9d3616fb 100644
--- a/kde-base/ark/files/kdeutils_ark-r865133.patch
+++ b/kde-apps/ark/files/kdeutils_ark-r865133.patch
diff --git a/kde-base/ark/metadata.xml b/kde-apps/ark/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ark/metadata.xml
+++ b/kde-apps/ark/metadata.xml
diff --git a/kde-base/blinken/ChangeLog b/kde-apps/blinken/ChangeLog
index 97042f95..97042f95 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-apps/blinken/ChangeLog
diff --git a/kde-base/blinken/Manifest b/kde-apps/blinken/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
diff --git a/kde-base/blinken/blinken-3.5.10.ebuild b/kde-apps/blinken/blinken-3.5.10.ebuild
index d2d2710a..d2d2710a 100644
--- a/kde-base/blinken/blinken-3.5.10.ebuild
+++ b/kde-apps/blinken/blinken-3.5.10.ebuild
diff --git a/kde-base/blinken/metadata.xml b/kde-apps/blinken/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/blinken/metadata.xml
+++ b/kde-apps/blinken/metadata.xml
diff --git a/kde-base/drkonqi/ChangeLog b/kde-apps/drkonqi/ChangeLog
index f1faf258..f1faf258 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-apps/drkonqi/ChangeLog
diff --git a/kde-base/drkonqi/Manifest b/kde-apps/drkonqi/Manifest
index 6f890e81..6f890e81 100644
--- a/kde-base/drkonqi/Manifest
+++ b/kde-apps/drkonqi/Manifest
diff --git a/kde-base/drkonqi/drkonqi-3.5.10.ebuild b/kde-apps/drkonqi/drkonqi-3.5.10.ebuild
index 81296440..81296440 100644
--- a/kde-base/drkonqi/drkonqi-3.5.10.ebuild
+++ b/kde-apps/drkonqi/drkonqi-3.5.10.ebuild
diff --git a/kde-base/drkonqi/metadata.xml b/kde-apps/drkonqi/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/drkonqi/metadata.xml
+++ b/kde-apps/drkonqi/metadata.xml
diff --git a/kde-base/juk/ChangeLog b/kde-apps/juk/ChangeLog
index 89cb3960..89cb3960 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-apps/juk/ChangeLog
diff --git a/kde-base/juk/Manifest b/kde-apps/juk/Manifest
index c8231466..c8231466 100644
--- a/kde-base/juk/Manifest
+++ b/kde-apps/juk/Manifest
diff --git a/kde-base/juk/files/kdemultimedia_juk-r988895.patch b/kde-apps/juk/files/kdemultimedia_juk-r988895.patch
index 638de6c2..638de6c2 100644
--- a/kde-base/juk/files/kdemultimedia_juk-r988895.patch
+++ b/kde-apps/juk/files/kdemultimedia_juk-r988895.patch
diff --git a/kde-base/juk/juk-3.5.10-r1.ebuild b/kde-apps/juk/juk-3.5.10-r1.ebuild
index e2b7d770..e2b7d770 100644
--- a/kde-base/juk/juk-3.5.10-r1.ebuild
+++ b/kde-apps/juk/juk-3.5.10-r1.ebuild
diff --git a/kde-base/juk/juk-3.5.10.ebuild b/kde-apps/juk/juk-3.5.10.ebuild
index 17f1471b..17f1471b 100644
--- a/kde-base/juk/juk-3.5.10.ebuild
+++ b/kde-apps/juk/juk-3.5.10.ebuild
diff --git a/kde-base/juk/metadata.xml b/kde-apps/juk/metadata.xml
index 560f6ef2..560f6ef2 100644
--- a/kde-base/juk/metadata.xml
+++ b/kde-apps/juk/metadata.xml
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-apps/kaddressbook/ChangeLog
index 13cff02a..13cff02a 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-apps/kaddressbook/ChangeLog
diff --git a/kde-base/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index f3718929..f3718929 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
diff --git a/kde-base/kaddressbook/files/kaddressbook-3.5-gnokii.patch b/kde-apps/kaddressbook/files/kaddressbook-3.5-gnokii.patch
index e83fc4dc..e83fc4dc 100644
--- a/kde-base/kaddressbook/files/kaddressbook-3.5-gnokii.patch
+++ b/kde-apps/kaddressbook/files/kaddressbook-3.5-gnokii.patch
diff --git a/kde-base/kaddressbook/files/kdepim_kabc-p05-r886802.patch b/kde-apps/kaddressbook/files/kdepim_kabc-p05-r886802.patch
index 5049e147..5049e147 100644
--- a/kde-base/kaddressbook/files/kdepim_kabc-p05-r886802.patch
+++ b/kde-apps/kaddressbook/files/kdepim_kabc-p05-r886802.patch
diff --git a/kde-base/kaddressbook/files/kdepim_kaddressbook-r893152.patch b/kde-apps/kaddressbook/files/kdepim_kaddressbook-r893152.patch
index 3dce08f7..3dce08f7 100644
--- a/kde-base/kaddressbook/files/kdepim_kaddressbook-r893152.patch
+++ b/kde-apps/kaddressbook/files/kdepim_kaddressbook-r893152.patch
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.10-r1.ebuild b/kde-apps/kaddressbook/kaddressbook-3.5.10-r1.ebuild
index 48bbe6e2..85c306d1 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.10-r1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-3.5.10-r1.ebuild
@@ -16,7 +16,7 @@ DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/certmanager-${PV}:${SLOT}
 >=kde-base/libkdenetwork-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}
+>=kde-apps/kontact-${PV}:${SLOT}
 gnokii? ( app-mobilephone/gnokii )"
 
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild b/kde-apps/kaddressbook/kaddressbook-3.5.10.ebuild
index 61ef2b88..65fa0d6e 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-3.5.10.ebuild
@@ -16,7 +16,7 @@ DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/certmanager-${PV}:${SLOT}
 >=kde-base/libkdenetwork-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}
+>=kde-apps/kontact-${PV}:${SLOT}
 gnokii? ( app-mobilephone/gnokii )"
 
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kaddressbook/metadata.xml b/kde-apps/kaddressbook/metadata.xml
index f2a63f19..f2a63f19 100644
--- a/kde-base/kaddressbook/metadata.xml
+++ b/kde-apps/kaddressbook/metadata.xml
diff --git a/kde-base/kalarm/ChangeLog b/kde-apps/kalarm/ChangeLog
index 866d4a02..866d4a02 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-apps/kalarm/ChangeLog
diff --git a/kde-base/kalarm/Manifest b/kde-apps/kalarm/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
diff --git a/kde-base/kalarm/files/kdepim_kalarm-r914790.patch b/kde-apps/kalarm/files/kdepim_kalarm-r914790.patch
index 93d85089..93d85089 100644
--- a/kde-base/kalarm/files/kdepim_kalarm-r914790.patch
+++ b/kde-apps/kalarm/files/kdepim_kalarm-r914790.patch
diff --git a/kde-base/kalarm/kalarm-3.5.10-r1.ebuild b/kde-apps/kalarm/kalarm-3.5.10-r1.ebuild
index 9d36e416..9d36e416 100644
--- a/kde-base/kalarm/kalarm-3.5.10-r1.ebuild
+++ b/kde-apps/kalarm/kalarm-3.5.10-r1.ebuild
diff --git a/kde-base/kalarm/kalarm-3.5.10.ebuild b/kde-apps/kalarm/kalarm-3.5.10.ebuild
index c9448ba8..c9448ba8 100644
--- a/kde-base/kalarm/kalarm-3.5.10.ebuild
+++ b/kde-apps/kalarm/kalarm-3.5.10.ebuild
diff --git a/kde-base/kalarm/metadata.xml b/kde-apps/kalarm/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kalarm/metadata.xml
+++ b/kde-apps/kalarm/metadata.xml
diff --git a/kde-base/kalzium/ChangeLog b/kde-apps/kalzium/ChangeLog
index 2e6c8e45..2e6c8e45 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-apps/kalzium/ChangeLog
diff --git a/kde-base/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
diff --git a/kde-base/kalzium/files/kalzium-3.5.7-copy_string.patch b/kde-apps/kalzium/files/kalzium-3.5.7-copy_string.patch
index 6cdaf6c3..6cdaf6c3 100644
--- a/kde-base/kalzium/files/kalzium-3.5.7-copy_string.patch
+++ b/kde-apps/kalzium/files/kalzium-3.5.7-copy_string.patch
diff --git a/kde-base/kalzium/kalzium-3.5.10.ebuild b/kde-apps/kalzium/kalzium-3.5.10.ebuild
index a3631400..90e20ce2 100644
--- a/kde-base/kalzium/kalzium-3.5.10.ebuild
+++ b/kde-apps/kalzium/kalzium-3.5.10.ebuild
@@ -10,7 +10,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="solver"
 HOMEPAGE="http://edu.kde.org/kalzium/"
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkdeedu-${PV}:${SLOT}
 		solver? ( >=dev-ml/facile-1.1 )"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kalzium/metadata.xml b/kde-apps/kalzium/metadata.xml
index 7e957c56..7e957c56 100644
--- a/kde-base/kalzium/metadata.xml
+++ b/kde-apps/kalzium/metadata.xml
diff --git a/kde-base/kamera/ChangeLog b/kde-apps/kamera/ChangeLog
index 6d6a0c03..6d6a0c03 100644
--- a/kde-base/kamera/ChangeLog
+++ b/kde-apps/kamera/ChangeLog
diff --git a/kde-base/kamera/Manifest b/kde-apps/kamera/Manifest
index cb266102..cb266102 100644
--- a/kde-base/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
diff --git a/kde-base/kamera/kamera-3.5.10.ebuild b/kde-apps/kamera/kamera-3.5.10.ebuild
index 2b288fbe..2b288fbe 100644
--- a/kde-base/kamera/kamera-3.5.10.ebuild
+++ b/kde-apps/kamera/kamera-3.5.10.ebuild
diff --git a/kde-base/kamera/metadata.xml b/kde-apps/kamera/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kamera/metadata.xml
+++ b/kde-apps/kamera/metadata.xml
diff --git a/kde-base/kanagram/ChangeLog b/kde-apps/kanagram/ChangeLog
index 8e54fd2b..8e54fd2b 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-apps/kanagram/ChangeLog
diff --git a/kde-base/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
diff --git a/kde-base/kanagram/kanagram-3.5.10.ebuild b/kde-apps/kanagram/kanagram-3.5.10.ebuild
index c1805110..c1805110 100644
--- a/kde-base/kanagram/kanagram-3.5.10.ebuild
+++ b/kde-apps/kanagram/kanagram-3.5.10.ebuild
diff --git a/kde-base/kanagram/metadata.xml b/kde-apps/kanagram/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kanagram/metadata.xml
+++ b/kde-apps/kanagram/metadata.xml
diff --git a/kde-base/kate/ChangeLog b/kde-apps/kate/ChangeLog
index ae8f3d32..ae8f3d32 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-apps/kate/ChangeLog
diff --git a/kde-base/kate/Manifest b/kde-apps/kate/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/kate/Manifest
+++ b/kde-apps/kate/Manifest
diff --git a/kde-base/kate/kate-3.5.10.ebuild b/kde-apps/kate/kate-3.5.10.ebuild
index 44b52a86..44b52a86 100644
--- a/kde-base/kate/kate-3.5.10.ebuild
+++ b/kde-apps/kate/kate-3.5.10.ebuild
diff --git a/kde-base/kate/metadata.xml b/kde-apps/kate/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
diff --git a/kde-base/katomic/ChangeLog b/kde-apps/katomic/ChangeLog
index c7282838..c7282838 100644
--- a/kde-base/katomic/ChangeLog
+++ b/kde-apps/katomic/ChangeLog
diff --git a/kde-base/katomic/Manifest b/kde-apps/katomic/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
diff --git a/kde-base/katomic/katomic-3.5.10.ebuild b/kde-apps/katomic/katomic-3.5.10.ebuild
index fffeb16f..36514b3e 100644
--- a/kde-base/katomic/katomic-3.5.10.ebuild
+++ b/kde-apps/katomic/katomic-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Atomic Entertainment Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/katomic/metadata.xml b/kde-apps/katomic/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/katomic/metadata.xml
+++ b/kde-apps/katomic/metadata.xml
diff --git a/kde-base/kblackbox/ChangeLog b/kde-apps/kblackbox/ChangeLog
index 6f774a96..6f774a96 100644
--- a/kde-base/kblackbox/ChangeLog
+++ b/kde-apps/kblackbox/ChangeLog
diff --git a/kde-base/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
diff --git a/kde-base/kblackbox/kblackbox-3.5.10.ebuild b/kde-apps/kblackbox/kblackbox-3.5.10.ebuild
index f14b8bff..a4255935 100644
--- a/kde-base/kblackbox/kblackbox-3.5.10.ebuild
+++ b/kde-apps/kblackbox/kblackbox-3.5.10.ebuild
@@ -8,7 +8,7 @@ inherit kde-meta
 DESCRIPTION="KDE Blackbox Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 
 KMEXTRACTONLY=libkdegames
 KMCOPYLIB="libkdegames libkdegames"
diff --git a/kde-base/kblackbox/metadata.xml b/kde-apps/kblackbox/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kblackbox/metadata.xml
+++ b/kde-apps/kblackbox/metadata.xml
diff --git a/kde-base/kbounce/ChangeLog b/kde-apps/kbounce/ChangeLog
index eef1429f..eef1429f 100644
--- a/kde-base/kbounce/ChangeLog
+++ b/kde-apps/kbounce/ChangeLog
diff --git a/kde-base/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
diff --git a/kde-base/kbounce/kbounce-3.5.10.ebuild b/kde-apps/kbounce/kbounce-3.5.10.ebuild
index eddfd4b1..bf968159 100644
--- a/kde-base/kbounce/kbounce-3.5.10.ebuild
+++ b/kde-apps/kbounce/kbounce-3.5.10.ebuild
@@ -9,7 +9,7 @@ inherit kde-meta
 DESCRIPTION="KDE Bounce Ball Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kbounce/metadata.xml b/kde-apps/kbounce/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kbounce/metadata.xml
+++ b/kde-apps/kbounce/metadata.xml
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-apps/kcachegrind/ChangeLog
index a1ae00b3..a1ae00b3 100644
--- a/kde-base/kcachegrind/ChangeLog
+++ b/kde-apps/kcachegrind/ChangeLog
diff --git a/kde-base/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index b752e618..b752e618 100644
--- a/kde-base/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
diff --git a/kde-base/kcachegrind/files/kdesdk_kcachegrind-r957058.patch b/kde-apps/kcachegrind/files/kdesdk_kcachegrind-r957058.patch
index 6c839a25..6c839a25 100644
--- a/kde-base/kcachegrind/files/kdesdk_kcachegrind-r957058.patch
+++ b/kde-apps/kcachegrind/files/kdesdk_kcachegrind-r957058.patch
diff --git a/kde-base/kcachegrind/kcachegrind-3.5.10-r1.ebuild b/kde-apps/kcachegrind/kcachegrind-3.5.10-r1.ebuild
index 13979569..13979569 100644
--- a/kde-base/kcachegrind/kcachegrind-3.5.10-r1.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-3.5.10-r1.ebuild
diff --git a/kde-base/kcachegrind/kcachegrind-3.5.10.ebuild b/kde-apps/kcachegrind/kcachegrind-3.5.10.ebuild
index 7aecd839..7aecd839 100644
--- a/kde-base/kcachegrind/kcachegrind-3.5.10.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-3.5.10.ebuild
diff --git a/kde-base/kcachegrind/metadata.xml b/kde-apps/kcachegrind/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kcachegrind/metadata.xml
+++ b/kde-apps/kcachegrind/metadata.xml
diff --git a/kde-base/kcalc/ChangeLog b/kde-apps/kcalc/ChangeLog
index 8590c6b8..8590c6b8 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-apps/kcalc/ChangeLog
diff --git a/kde-base/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
diff --git a/kde-base/kcalc/files/kdeutils_kcalc-r894668.patch b/kde-apps/kcalc/files/kdeutils_kcalc-r894668.patch
index f40486e1..f40486e1 100644
--- a/kde-base/kcalc/files/kdeutils_kcalc-r894668.patch
+++ b/kde-apps/kcalc/files/kdeutils_kcalc-r894668.patch
diff --git a/kde-base/kcalc/kcalc-3.5.10-r1.ebuild b/kde-apps/kcalc/kcalc-3.5.10-r1.ebuild
index d973e9c7..d973e9c7 100644
--- a/kde-base/kcalc/kcalc-3.5.10-r1.ebuild
+++ b/kde-apps/kcalc/kcalc-3.5.10-r1.ebuild
diff --git a/kde-base/kcalc/kcalc-3.5.10.ebuild b/kde-apps/kcalc/kcalc-3.5.10.ebuild
index 1655e1bf..1655e1bf 100644
--- a/kde-base/kcalc/kcalc-3.5.10.ebuild
+++ b/kde-apps/kcalc/kcalc-3.5.10.ebuild
diff --git a/kde-base/kcalc/metadata.xml b/kde-apps/kcalc/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kcalc/metadata.xml
+++ b/kde-apps/kcalc/metadata.xml
diff --git a/kde-base/kcharselect/ChangeLog b/kde-apps/kcharselect/ChangeLog
index 3e44fe40..3e44fe40 100644
--- a/kde-base/kcharselect/ChangeLog
+++ b/kde-apps/kcharselect/ChangeLog
diff --git a/kde-base/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
diff --git a/kde-base/kcharselect/kcharselect-3.5.10.ebuild b/kde-apps/kcharselect/kcharselect-3.5.10.ebuild
index 2f119102..2f119102 100644
--- a/kde-base/kcharselect/kcharselect-3.5.10.ebuild
+++ b/kde-apps/kcharselect/kcharselect-3.5.10.ebuild
diff --git a/kde-base/kcharselect/metadata.xml b/kde-apps/kcharselect/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kcharselect/metadata.xml
+++ b/kde-apps/kcharselect/metadata.xml
diff --git a/kde-base/kcontrol/ChangeLog b/kde-apps/kcontrol/ChangeLog
index 277720cc..277720cc 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-apps/kcontrol/ChangeLog
diff --git a/kde-base/kcontrol/Manifest b/kde-apps/kcontrol/Manifest
index 6f890e81..6f890e81 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-apps/kcontrol/Manifest
diff --git a/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch b/kde-apps/kcontrol/files/kcontrol-3.5.10-gcc44.patch
index d11a7b91..d11a7b91 100644
--- a/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch
+++ b/kde-apps/kcontrol/files/kcontrol-3.5.10-gcc44.patch
diff --git a/kde-base/kcontrol/files/kcontrol-openssl-1.0.0.patch b/kde-apps/kcontrol/files/kcontrol-openssl-1.0.0.patch
index 125f6bd1..125f6bd1 100644
--- a/kde-base/kcontrol/files/kcontrol-openssl-1.0.0.patch
+++ b/kde-apps/kcontrol/files/kcontrol-openssl-1.0.0.patch
diff --git a/kde-base/kcontrol/files/kdebase_kcontrol-p13-r975372.patch b/kde-apps/kcontrol/files/kdebase_kcontrol-p13-r975372.patch
index fa08186a..fa08186a 100644
--- a/kde-base/kcontrol/files/kdebase_kcontrol-p13-r975372.patch
+++ b/kde-apps/kcontrol/files/kdebase_kcontrol-p13-r975372.patch
diff --git a/kde-base/kcontrol/kcontrol-3.5.10-r1.ebuild b/kde-apps/kcontrol/kcontrol-3.5.10-r1.ebuild
index 4e6a16e3..3e65daaf 100644
--- a/kde-base/kcontrol/kcontrol-3.5.10-r1.ebuild
+++ b/kde-apps/kcontrol/kcontrol-3.5.10-r1.ebuild
@@ -23,13 +23,13 @@ DEPEND="x11-libs/libXext
 	opengl? ( virtual/opengl )
 	ieee1394? ( sys-libs/libraw1394 )
 	logitech-mouse? ( =virtual/libusb-0* )
-	>=kde-base/libkonq-${PV}:${SLOT}
+	>=kde-apps/libkonq-${PV}:${SLOT}
 	>=kde-base/kicker-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	>=kde-base/kcminit-${PV}:${SLOT}
-	>=kde-base/kdebase-data-${PV}:${SLOT}
-	>=kde-base/kdesu-${PV}:${SLOT}
+	>=kde-apps/kdebase-data-${PV}:${SLOT}
+	>=kde-apps/kdesu-${PV}:${SLOT}
 	>=kde-base/khelpcenter-${PV}:${SLOT}
 	>=kde-base/khotkeys-${PV}:${SLOT}"
 
diff --git a/kde-base/kcontrol/kcontrol-3.5.10.ebuild b/kde-apps/kcontrol/kcontrol-3.5.10.ebuild
index 9dca5ba4..a276966f 100644
--- a/kde-base/kcontrol/kcontrol-3.5.10.ebuild
+++ b/kde-apps/kcontrol/kcontrol-3.5.10.ebuild
@@ -23,13 +23,13 @@ DEPEND="x11-libs/libXext
 	opengl? ( virtual/opengl )
 	ieee1394? ( sys-libs/libraw1394 )
 	logitech-mouse? ( =virtual/libusb-0* )
-	>=kde-base/libkonq-${PV}:${SLOT}
+	>=kde-apps/libkonq-${PV}:${SLOT}
 	>=kde-base/kicker-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
 	>=kde-base/kcminit-${PV}:${SLOT}
-	>=kde-base/kdebase-data-${PV}:${SLOT}
-	>=kde-base/kdesu-${PV}:${SLOT}
+	>=kde-apps/kdebase-data-${PV}:${SLOT}
+	>=kde-apps/kdesu-${PV}:${SLOT}
 	>=kde-base/khelpcenter-${PV}:${SLOT}
 	>=kde-base/khotkeys-${PV}:${SLOT}"
 
diff --git a/kde-base/kcontrol/metadata.xml b/kde-apps/kcontrol/metadata.xml
index a7cfe809..a7cfe809 100644
--- a/kde-base/kcontrol/metadata.xml
+++ b/kde-apps/kcontrol/metadata.xml
diff --git a/kde-base/kcron/ChangeLog b/kde-apps/kcron/ChangeLog
index 61e1bf95..61e1bf95 100644
--- a/kde-base/kcron/ChangeLog
+++ b/kde-apps/kcron/ChangeLog
diff --git a/kde-base/kcron/Manifest b/kde-apps/kcron/Manifest
index 18207382..18207382 100644
--- a/kde-base/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
diff --git a/kde-base/kcron/kcron-3.5.10.ebuild b/kde-apps/kcron/kcron-3.5.10.ebuild
index e5af5768..e5af5768 100644
--- a/kde-base/kcron/kcron-3.5.10.ebuild
+++ b/kde-apps/kcron/kcron-3.5.10.ebuild
diff --git a/kde-base/kcron/metadata.xml b/kde-apps/kcron/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kcron/metadata.xml
+++ b/kde-apps/kcron/metadata.xml
diff --git a/kde-base/kde-l10n/Manifest b/kde-apps/kde-l10n/Manifest
index 3582457e..3582457e 100644
--- a/kde-base/kde-l10n/Manifest
+++ b/kde-apps/kde-l10n/Manifest
diff --git a/kde-base/kde-l10n/kde-l10n-4.11.2.ebuild b/kde-apps/kde-l10n/kde-l10n-4.11.2.ebuild
index a572b8f4..62086e6b 100644
--- a/kde-base/kde-l10n/kde-l10n-4.11.2.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-4.11.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://l10n.kde.org"
 DEPEND="
 	sys-devel/gettext
 "
-RDEPEND="!<kde-base/konq-plugins-4.6:4"
+RDEPEND="!<kde-apps/konq-plugins-4.6:4"
 
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+handbook"
diff --git a/kde-base/kdeaccessibility-meta/ChangeLog b/kde-apps/kdeaccessibility-meta/ChangeLog
index 2f26b4e5..2f26b4e5 100644
--- a/kde-base/kdeaccessibility-meta/ChangeLog
+++ b/kde-apps/kdeaccessibility-meta/ChangeLog
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.10.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-3.5.10.ebuild
index de87d573..e1b74d20 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.10.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-3.5.10.ebuild
@@ -15,8 +15,8 @@ IUSE="arts"
 RDEPEND="
 arts? ( >=kde-base/ksayit-${PV}:${SLOT}
 	>=kde-base/kttsd-${PV}:${SLOT} )
->=kde-base/kmag-${PV}:${SLOT}
+>=kde-apps/kmag-${PV}:${SLOT}
 >=kde-base/kdeaccessibility-iconthemes-${PV}:${SLOT}
->=kde-base/kmousetool-${PV}:${SLOT}
+>=kde-apps/kmousetool-${PV}:${SLOT}
 >=kde-base/kbstateapplet-${PV}:${SLOT}
->=kde-base/kmouth-${PV}:${SLOT}"
+>=kde-apps/kmouth-${PV}:${SLOT}"
diff --git a/kde-base/kdeaccessibility-meta/metadata.xml b/kde-apps/kdeaccessibility-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdeaccessibility-meta/metadata.xml
+++ b/kde-apps/kdeaccessibility-meta/metadata.xml
diff --git a/kde-base/kdeadmin-meta/ChangeLog b/kde-apps/kdeadmin-meta/ChangeLog
index e95b4657..e95b4657 100644
--- a/kde-base/kdeadmin-meta/ChangeLog
+++ b/kde-apps/kdeadmin-meta/ChangeLog
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.10.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-3.5.10.ebuild
index 74791654..523617f8 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.10.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-3.5.10.ebuild
@@ -12,9 +12,9 @@ SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=kde-base/kcron-${PV}:${SLOT}
+RDEPEND=">=kde-apps/kcron-${PV}:${SLOT}
 	>=kde-base/kdeadmin-kfile-plugins-${PV}:${SLOT}
-	>=kde-base/kuser-${PV}:${SLOT}
+	>=kde-apps/kuser-${PV}:${SLOT}
 	x86? ( >=kde-base/lilo-config-${PV}:${SLOT} )
 	amd64? ( >=kde-base/lilo-config-${PV}:${SLOT} )
 	>=kde-base/secpolicy-${PV}:${SLOT}
diff --git a/kde-base/kdeadmin-meta/metadata.xml b/kde-apps/kdeadmin-meta/metadata.xml
index edf67f01..edf67f01 100644
--- a/kde-base/kdeadmin-meta/metadata.xml
+++ b/kde-apps/kdeadmin-meta/metadata.xml
diff --git a/kde-base/kdeartwork-emoticons/ChangeLog b/kde-apps/kdeartwork-emoticons/ChangeLog
index a64c6fba..a64c6fba 100644
--- a/kde-base/kdeartwork-emoticons/ChangeLog
+++ b/kde-apps/kdeartwork-emoticons/ChangeLog
diff --git a/kde-base/kdeartwork-emoticons/Manifest b/kde-apps/kdeartwork-emoticons/Manifest
index 32bde4e8..32bde4e8 100644
--- a/kde-base/kdeartwork-emoticons/Manifest
+++ b/kde-apps/kdeartwork-emoticons/Manifest
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.10.ebuild b/kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-3.5.10.ebuild
index 95e601ff..95e601ff 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-3.5.10.ebuild
diff --git a/kde-base/kdeartwork-emoticons/metadata.xml b/kde-apps/kdeartwork-emoticons/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdeartwork-emoticons/metadata.xml
+++ b/kde-apps/kdeartwork-emoticons/metadata.xml
diff --git a/kde-base/kdeartwork-iconthemes/.listing b/kde-apps/kdeartwork-iconthemes/.listing
index e69de29b..e69de29b 100644
--- a/kde-base/kdeartwork-iconthemes/.listing
+++ b/kde-apps/kdeartwork-iconthemes/.listing
diff --git a/kde-base/kdeartwork-iconthemes/ChangeLog b/kde-apps/kdeartwork-iconthemes/ChangeLog
index dbe32fe8..dbe32fe8 100644
--- a/kde-base/kdeartwork-iconthemes/ChangeLog
+++ b/kde-apps/kdeartwork-iconthemes/ChangeLog
diff --git a/kde-base/kdeartwork-iconthemes/Manifest b/kde-apps/kdeartwork-iconthemes/Manifest
index 32bde4e8..32bde4e8 100644
--- a/kde-base/kdeartwork-iconthemes/Manifest
+++ b/kde-apps/kdeartwork-iconthemes/Manifest
diff --git a/kde-base/kdeartwork-iconthemes/files/tab_move_left_16-r889208.png b/kde-apps/kdeartwork-iconthemes/files/tab_move_left_16-r889208.png
index b2a5502d..b2a5502d 100644
--- a/kde-base/kdeartwork-iconthemes/files/tab_move_left_16-r889208.png
+++ b/kde-apps/kdeartwork-iconthemes/files/tab_move_left_16-r889208.png
diff --git a/kde-base/kdeartwork-iconthemes/files/tab_move_left_22-r889208.png b/kde-apps/kdeartwork-iconthemes/files/tab_move_left_22-r889208.png
index 1680031a..1680031a 100644
--- a/kde-base/kdeartwork-iconthemes/files/tab_move_left_22-r889208.png
+++ b/kde-apps/kdeartwork-iconthemes/files/tab_move_left_22-r889208.png
diff --git a/kde-base/kdeartwork-iconthemes/files/tab_move_left_32-r889208.png b/kde-apps/kdeartwork-iconthemes/files/tab_move_left_32-r889208.png
index 7e7f16f5..7e7f16f5 100644
--- a/kde-base/kdeartwork-iconthemes/files/tab_move_left_32-r889208.png
+++ b/kde-apps/kdeartwork-iconthemes/files/tab_move_left_32-r889208.png
diff --git a/kde-base/kdeartwork-iconthemes/files/tab_move_right_16-r889208.png b/kde-apps/kdeartwork-iconthemes/files/tab_move_right_16-r889208.png
index 77d147cf..77d147cf 100644
--- a/kde-base/kdeartwork-iconthemes/files/tab_move_right_16-r889208.png
+++ b/kde-apps/kdeartwork-iconthemes/files/tab_move_right_16-r889208.png
diff --git a/kde-base/kdeartwork-iconthemes/files/tab_move_right_22-r889208.png b/kde-apps/kdeartwork-iconthemes/files/tab_move_right_22-r889208.png
index 7845f269..7845f269 100644
--- a/kde-base/kdeartwork-iconthemes/files/tab_move_right_22-r889208.png
+++ b/kde-apps/kdeartwork-iconthemes/files/tab_move_right_22-r889208.png
diff --git a/kde-base/kdeartwork-iconthemes/files/tab_move_right_32-r889208.png b/kde-apps/kdeartwork-iconthemes/files/tab_move_right_32-r889208.png
index 0d838f68..0d838f68 100644
--- a/kde-base/kdeartwork-iconthemes/files/tab_move_right_32-r889208.png
+++ b/kde-apps/kdeartwork-iconthemes/files/tab_move_right_32-r889208.png
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10-r1.ebuild b/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10-r1.ebuild
index 313b535f..313b535f 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10-r1.ebuild
+++ b/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10-r1.ebuild
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10.ebuild b/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10.ebuild
index 228d9464..228d9464 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.10.ebuild
diff --git a/kde-base/kdeartwork-iconthemes/metadata.xml b/kde-apps/kdeartwork-iconthemes/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdeartwork-iconthemes/metadata.xml
+++ b/kde-apps/kdeartwork-iconthemes/metadata.xml
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-apps/kdeartwork-kscreensaver/ChangeLog
index 4c96b348..4c96b348 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-apps/kdeartwork-kscreensaver/ChangeLog
diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-apps/kdeartwork-kscreensaver/Manifest
index 32bde4e8..32bde4e8 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-apps/kdeartwork-kscreensaver/Manifest
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
index fd2564f8..fd2564f8 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
diff --git a/kde-base/kdeartwork-kscreensaver/metadata.xml b/kde-apps/kdeartwork-kscreensaver/metadata.xml
index f7d2d4ad..f7d2d4ad 100644
--- a/kde-base/kdeartwork-kscreensaver/metadata.xml
+++ b/kde-apps/kdeartwork-kscreensaver/metadata.xml
diff --git a/kde-base/kdeartwork-meta/ChangeLog b/kde-apps/kdeartwork-meta/ChangeLog
index 2d299131..2d299131 100644
--- a/kde-base/kdeartwork-meta/ChangeLog
+++ b/kde-apps/kdeartwork-meta/ChangeLog
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.10.ebuild b/kde-apps/kdeartwork-meta/kdeartwork-meta-3.5.10.ebuild
index 0f752095..f9372df2 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-meta/kdeartwork-meta-3.5.10.ebuild
@@ -13,13 +13,13 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
->=kde-base/kdeartwork-emoticons-${PV}:${SLOT}
->=kde-base/kdeartwork-iconthemes-${PV}:${SLOT}
+>=kde-apps/kdeartwork-emoticons-${PV}:${SLOT}
+>=kde-apps/kdeartwork-iconthemes-${PV}:${SLOT}
 >=kde-base/kdeartwork-icewm-themes-${PV}:${SLOT}
->=kde-base/kdeartwork-kscreensaver-${PV}:${SLOT}
+>=kde-apps/kdeartwork-kscreensaver-${PV}:${SLOT}
 >=kde-base/kdeartwork-kwin-styles-${PV}:${SLOT}
 >=kde-base/kdeartwork-kworldclock-${PV}:${SLOT}
 >=kde-base/kdeartwork-sounds-${PV}:${SLOT}
->=kde-base/kdeartwork-styles-${PV}:${SLOT}
->=kde-base/kdeartwork-wallpapers-${PV}:${SLOT}
+>=kde-apps/kdeartwork-styles-${PV}:${SLOT}
+>=kde-apps/kdeartwork-wallpapers-${PV}:${SLOT}
 "
diff --git a/kde-base/kdeartwork-meta/metadata.xml b/kde-apps/kdeartwork-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdeartwork-meta/metadata.xml
+++ b/kde-apps/kdeartwork-meta/metadata.xml
diff --git a/kde-base/kdeartwork-styles/ChangeLog b/kde-apps/kdeartwork-styles/ChangeLog
index 431214cd..431214cd 100644
--- a/kde-base/kdeartwork-styles/ChangeLog
+++ b/kde-apps/kdeartwork-styles/ChangeLog
diff --git a/kde-base/kdeartwork-styles/Manifest b/kde-apps/kdeartwork-styles/Manifest
index 32bde4e8..32bde4e8 100644
--- a/kde-base/kdeartwork-styles/Manifest
+++ b/kde-apps/kdeartwork-styles/Manifest
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.10.ebuild b/kde-apps/kdeartwork-styles/kdeartwork-styles-3.5.10.ebuild
index 857bab72..857bab72 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-styles/kdeartwork-styles-3.5.10.ebuild
diff --git a/kde-base/kdeartwork-styles/metadata.xml b/kde-apps/kdeartwork-styles/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdeartwork-styles/metadata.xml
+++ b/kde-apps/kdeartwork-styles/metadata.xml
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-apps/kdeartwork-wallpapers/ChangeLog
index f39a97bb..f39a97bb 100644
--- a/kde-base/kdeartwork-wallpapers/ChangeLog
+++ b/kde-apps/kdeartwork-wallpapers/ChangeLog
diff --git a/kde-base/kdeartwork-wallpapers/Manifest b/kde-apps/kdeartwork-wallpapers/Manifest
index 32bde4e8..32bde4e8 100644
--- a/kde-base/kdeartwork-wallpapers/Manifest
+++ b/kde-apps/kdeartwork-wallpapers/Manifest
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.10.ebuild b/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.10.ebuild
index e9e7b3d5..e9e7b3d5 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.10.ebuild
diff --git a/kde-base/kdeartwork-wallpapers/metadata.xml b/kde-apps/kdeartwork-wallpapers/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdeartwork-wallpapers/metadata.xml
+++ b/kde-apps/kdeartwork-wallpapers/metadata.xml
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-apps/kdebase-data/ChangeLog
index 1592cfde..1592cfde 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-apps/kdebase-data/ChangeLog
diff --git a/kde-base/kdebase-data/Manifest b/kde-apps/kdebase-data/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/kdebase-data/Manifest
+++ b/kde-apps/kdebase-data/Manifest
diff --git a/kde-base/kdebase-data/files/kdebase_l10n-r904512.patch b/kde-apps/kdebase-data/files/kdebase_l10n-r904512.patch
index b9d51b25..b9d51b25 100644
--- a/kde-base/kdebase-data/files/kdebase_l10n-r904512.patch
+++ b/kde-apps/kdebase-data/files/kdebase_l10n-r904512.patch
diff --git a/kde-base/kdebase-data/kdebase-data-3.5.10-r1.ebuild b/kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild
index 1ce8fec9..1ce8fec9 100644
--- a/kde-base/kdebase-data/kdebase-data-3.5.10-r1.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-3.5.10-r1.ebuild
diff --git a/kde-base/kdebase-data/kdebase-data-3.5.10.ebuild b/kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild
index ee100197..ee100197 100644
--- a/kde-base/kdebase-data/kdebase-data-3.5.10.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-3.5.10.ebuild
diff --git a/kde-base/kdebase-data/metadata.xml b/kde-apps/kdebase-data/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdebase-data/metadata.xml
+++ b/kde-apps/kdebase-data/metadata.xml
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-apps/kdebase-kioslaves/ChangeLog
index f3ecae9f..f3ecae9f 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-apps/kdebase-kioslaves/ChangeLog
diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-apps/kdebase-kioslaves/Manifest
index 6f890e81..6f890e81 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-apps/kdebase-kioslaves/Manifest
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch b/kde-apps/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch
index c2f62778..c2f62778 100644
--- a/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch
+++ b/kde-apps/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch
diff --git a/kde-base/kdebase-kioslaves/files/kdebase_kioslave-r911492.patch b/kde-apps/kdebase-kioslaves/files/kdebase_kioslave-r911492.patch
index afaeb399..afaeb399 100644
--- a/kde-base/kdebase-kioslaves/files/kdebase_kioslave-r911492.patch
+++ b/kde-apps/kdebase-kioslaves/files/kdebase_kioslave-r911492.patch
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
index 0282c7c5..74e824b8 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="x11-libs/libXcursor
 	!<kde-base/kdesktop-3.5.6-r1"
 RDEPEND="${DEPEND}
 	virtual/ssh
-	>=kde-base/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
+	>=kde-apps/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
 DEPEND="${DEPEND}
 	x11-apps/xhost"
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild
index a431e5a2..752c639e 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="x11-libs/libXcursor
 	!<kde-base/kdesktop-3.5.6-r1"
 RDEPEND="${DEPEND}
 	virtual/ssh
-	>=kde-base/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
+	>=kde-apps/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
 DEPEND="${DEPEND}
 	x11-apps/xhost"
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild
index 683c83a1..cca2e157 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-3.5.10.ebuild
@@ -23,7 +23,7 @@ DEPEND="x11-libs/libXcursor
 	!<kde-base/kdesktop-3.5.6-r1"
 RDEPEND="${DEPEND}
 	virtual/ssh
-	>=kde-base/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
+	>=kde-apps/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
 DEPEND="${DEPEND}
 	x11-apps/xhost"
 
diff --git a/kde-base/kdebase-kioslaves/metadata.xml b/kde-apps/kdebase-kioslaves/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdebase-kioslaves/metadata.xml
+++ b/kde-apps/kdebase-kioslaves/metadata.xml
diff --git a/kde-base/kdemultimedia-meta/ChangeLog b/kde-apps/kdemultimedia-meta/ChangeLog
index 2270bd28..2270bd28 100644
--- a/kde-base/kdemultimedia-meta/ChangeLog
+++ b/kde-apps/kdemultimedia-meta/ChangeLog
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.10.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-3.5.10.ebuild
index cb07efc1..d79df66c 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.10.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-3.5.10.ebuild
@@ -15,7 +15,7 @@ IUSE="arts xine"
 RDEPEND="arts? ( >=kde-base/artsplugin-akode-${PV}:${SLOT}
 		>=kde-base/artsplugin-audiofile-${PV}:${SLOT}
 		xine? ( >=kde-base/artsplugin-xine-${PV}:${SLOT} )
-		>=kde-base/juk-${PV}:${SLOT}
+		>=kde-apps/juk-${PV}:${SLOT}
 		>=kde-base/kaboodle-${PV}:${SLOT}
 		>=kde-base/kaudiocreator-${PV}:${SLOT}
 		>=kde-base/kdemultimedia-arts-${PV}:${SLOT}
@@ -24,9 +24,9 @@ RDEPEND="arts? ( >=kde-base/artsplugin-akode-${PV}:${SLOT}
 	>=kde-base/kdemultimedia-kfile-plugins-${PV}:${SLOT}
 	>=kde-base/kdemultimedia-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmid-${PV}:${SLOT}
-	>=kde-base/kmix-${PV}:${SLOT}
-	>=kde-base/kscd-${PV}:${SLOT}
-	>=kde-base/libkcddb-${PV}:${SLOT}"
+	>=kde-apps/kmix-${PV}:${SLOT}
+	>=kde-apps/kscd-${PV}:${SLOT}
+	>=kde-apps/libkcddb-${PV}:${SLOT}"
 
 # Not really useful, these are scheduled for being removed from KDE soon.
 #>=kde-base/artsplugin-mpeglib-${PV}:${SLOT}
diff --git a/kde-base/kdemultimedia-meta/metadata.xml b/kde-apps/kdemultimedia-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdemultimedia-meta/metadata.xml
+++ b/kde-apps/kdemultimedia-meta/metadata.xml
diff --git a/kde-base/kdenetwork-filesharing/ChangeLog b/kde-apps/kdenetwork-filesharing/ChangeLog
index a69de323..a69de323 100644
--- a/kde-base/kdenetwork-filesharing/ChangeLog
+++ b/kde-apps/kdenetwork-filesharing/ChangeLog
diff --git a/kde-base/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 44a3cc86..44a3cc86 100644
--- a/kde-base/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.10.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-3.5.10.ebuild
index d2dcbad2..d2dcbad2 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.10.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-3.5.10.ebuild
diff --git a/kde-base/kdenetwork-filesharing/metadata.xml b/kde-apps/kdenetwork-filesharing/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdenetwork-filesharing/metadata.xml
+++ b/kde-apps/kdenetwork-filesharing/metadata.xml
diff --git a/kde-base/kdenetwork-meta/ChangeLog b/kde-apps/kdenetwork-meta/ChangeLog
index e205be86..e205be86 100644
--- a/kde-base/kdenetwork-meta/ChangeLog
+++ b/kde-apps/kdenetwork-meta/ChangeLog
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.10.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-3.5.10.ebuild
index 94cd2c27..d469f36e 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.10.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-3.5.10.ebuild
@@ -13,15 +13,15 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="wifi"
 
 RDEPEND=">=kde-base/dcoprss-${PV}:${SLOT}
-	>=kde-base/kdenetwork-filesharing-${PV}:${SLOT}
+	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
 	>=kde-base/kdict-${PV}:${SLOT}
-	>=kde-base/kget-${PV}:${SLOT}
+	>=kde-apps/kget-${PV}:${SLOT}
 	>=kde-base/knewsticker-${PV}:${SLOT}
-	>=kde-base/kopete-${PV}:${SLOT}
+	>=kde-apps/kopete-${PV}:${SLOT}
 	>=kde-base/kpf-${PV}:${SLOT}
-	>=kde-base/kppp-${PV}:${SLOT}
-	>=kde-base/krdc-${PV}:${SLOT}
-	>=kde-base/krfb-${PV}:${SLOT}
+	>=kde-apps/kppp-${PV}:${SLOT}
+	>=kde-apps/krdc-${PV}:${SLOT}
+	>=kde-apps/krfb-${PV}:${SLOT}
 	>=kde-base/ktalkd-${PV}:${SLOT}
 	wifi? ( >=kde-base/kwifimanager-${PV}:${SLOT} )
 	>=kde-base/librss-${PV}:${SLOT}
diff --git a/kde-base/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-apps/kdepasswd/ChangeLog
index 9673886c..9673886c 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-apps/kdepasswd/ChangeLog
diff --git a/kde-base/kdepasswd/Manifest b/kde-apps/kdepasswd/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/kdepasswd/Manifest
+++ b/kde-apps/kdepasswd/Manifest
diff --git a/kde-base/kdepasswd/kdepasswd-3.5.10.ebuild b/kde-apps/kdepasswd/kdepasswd-3.5.10.ebuild
index 522117d7..aa09cc26 100644
--- a/kde-base/kdepasswd/kdepasswd-3.5.10.ebuild
+++ b/kde-apps/kdepasswd/kdepasswd-3.5.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE GUI for passwd"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kdepasswd/metadata.xml b/kde-apps/kdepasswd/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdepasswd/metadata.xml
+++ b/kde-apps/kdepasswd/metadata.xml
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-apps/kdepim-kresources/ChangeLog
index 7ae9b824..7ae9b824 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-apps/kdepim-kresources/ChangeLog
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-apps/kdepim-kresources/Manifest
index 85ffbc76..85ffbc76 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-apps/kdepim-kresources/Manifest
diff --git a/kde-base/kdepim-kresources/files/kdepim_korganizer-r893152.patch b/kde-apps/kdepim-kresources/files/kdepim_korganizer-r893152.patch
index 1a85044c..1a85044c 100644
--- a/kde-base/kdepim-kresources/files/kdepim_korganizer-r893152.patch
+++ b/kde-apps/kdepim-kresources/files/kdepim_korganizer-r893152.patch
diff --git a/kde-base/kdepim-kresources/files/kdepim_kresources-r897910.patch b/kde-apps/kdepim-kresources/files/kdepim_kresources-r897910.patch
index 84adfd40..84adfd40 100644
--- a/kde-base/kdepim-kresources/files/kdepim_kresources-r897910.patch
+++ b/kde-apps/kdepim-kresources/files/kdepim_kresources-r897910.patch
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.5.10-r1.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-3.5.10-r1.ebuild
index 80277e7c..d0e322be 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.5.10-r1.ebuild
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-3.5.10-r1.ebuild
@@ -17,9 +17,9 @@ DEPEND=">=kde-base/libkmime-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}
 	>=kde-base/libkpimexchange-${PV}:${SLOT}
 	>=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
 	>=kde-base/kode-${PV}:${SLOT}
-	>=kde-base/ktnef-${PV}:${SLOT}
+	>=kde-apps/ktnef-${PV}:${SLOT}
 	dev-libs/libical
 	>=app-crypt/gpgme-1.0.2"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.5.10.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-3.5.10.ebuild
index 927c9793..765c9533 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.5.10.ebuild
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-3.5.10.ebuild
@@ -17,7 +17,7 @@ DEPEND=">=kde-base/libkmime-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}
 	>=kde-base/libkpimexchange-${PV}:${SLOT}
 	>=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
 	>=kde-base/kode-${PV}:${SLOT}
 	dev-libs/libical
 	>=app-crypt/gpgme-1.0.2"
diff --git a/kde-base/kdepim-kresources/metadata.xml b/kde-apps/kdepim-kresources/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdepim-kresources/metadata.xml
+++ b/kde-apps/kdepim-kresources/metadata.xml
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-apps/kdepim-meta/ChangeLog
index 4030d8b8..4030d8b8 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-apps/kdepim-meta/ChangeLog
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.5.10.ebuild b/kde-apps/kdepim-meta/kdepim-meta-3.5.10.ebuild
index 44a86296..9770bd69 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.5.10.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-3.5.10.ebuild
@@ -13,28 +13,28 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="pda kitchensync"
 
 RDEPEND="
-	>=kde-base/akregator-${PV}:${SLOT}
+	>=kde-apps/akregator-${PV}:${SLOT}
 	>=kde-base/certmanager-${PV}:${SLOT}
-	>=kde-base/kaddressbook-${PV}:${SLOT}
-	>=kde-base/kalarm-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kalarm-${PV}:${SLOT}
 	>=kde-base/kandy-${PV}:${SLOT}
 	>=kde-base/karm-${PV}:${SLOT}
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
-	>=kde-base/kdepim-kresources-${PV}:${SLOT}
-	>=kde-base/kdepim-wizards-${PV}:${SLOT}
+	>=kde-apps/kdepim-kresources-${PV}:${SLOT}
+	>=kde-apps/kdepim-wizards-${PV}:${SLOT}
 	kitchensync? ( >=kde-base/kitchensync-${PV}:${SLOT} )
-	>=kde-base/kmail-${PV}:${SLOT}
+	>=kde-apps/kmail-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	>=kde-base/knode-${PV}:${SLOT}
-	>=kde-base/knotes-${PV}:${SLOT}
+	>=kde-apps/knode-${PV}:${SLOT}
+	>=kde-apps/knotes-${PV}:${SLOT}
 	>=kde-base/kode-${PV}:${SLOT}
-	>=kde-base/konsolekalendar-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/konsolekalendar-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	>=kde-base/kontact-specialdates-${PV}:${SLOT}
-	>=kde-base/korganizer-${PV}:${SLOT}
+	>=kde-apps/korganizer-${PV}:${SLOT}
 	>=kde-base/korn-${PV}:${SLOT}
 	pda? ( >=kde-base/kpilot-${PV}:${SLOT} )
-	>=kde-base/ktnef-${PV}:${SLOT}
+	>=kde-apps/ktnef-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}
 	>=kde-base/libkdenetwork-${PV}:${SLOT}
 	>=kde-base/libkdepim-${PV}:${SLOT}
diff --git a/kde-base/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index f4fdddf1..f4fdddf1 100644
--- a/kde-base/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-apps/kdepim-wizards/ChangeLog
index c2be854b..c2be854b 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-apps/kdepim-wizards/ChangeLog
diff --git a/kde-base/kdepim-wizards/Manifest b/kde-apps/kdepim-wizards/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/kdepim-wizards/Manifest
+++ b/kde-apps/kdepim-wizards/Manifest
diff --git a/kde-base/kdepim-wizards/files/kdepim_wizards-r893152.patch b/kde-apps/kdepim-wizards/files/kdepim_wizards-r893152.patch
index f29d50b4..f29d50b4 100644
--- a/kde-base/kdepim-wizards/files/kdepim_wizards-r893152.patch
+++ b/kde-apps/kdepim-wizards/files/kdepim_wizards-r893152.patch
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.5.10-r1.ebuild b/kde-apps/kdepim-wizards/kdepim-wizards-3.5.10-r1.ebuild
index b8735870..616bd6ee 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.5.10-r1.ebuild
+++ b/kde-apps/kdepim-wizards/kdepim-wizards-3.5.10-r1.ebuild
@@ -14,9 +14,9 @@ DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/certmanager-${PV}:${SLOT}
->=kde-base/kdepim-kresources-${PV}:${SLOT}
+>=kde-apps/kdepim-kresources-${PV}:${SLOT}
 >=kde-base/libkpimidentities-${PV}:${SLOT}
->=kde-base/kaddressbook-${PV}:${SLOT}"
+>=kde-apps/kaddressbook-${PV}:${SLOT}"
 
 #RESTRICT="test"
 
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.5.10.ebuild b/kde-apps/kdepim-wizards/kdepim-wizards-3.5.10.ebuild
index 3cca1176..37d7557c 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.5.10.ebuild
+++ b/kde-apps/kdepim-wizards/kdepim-wizards-3.5.10.ebuild
@@ -14,9 +14,9 @@ DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/certmanager-${PV}:${SLOT}
->=kde-base/kdepim-kresources-${PV}:${SLOT}
+>=kde-apps/kdepim-kresources-${PV}:${SLOT}
 >=kde-base/libkpimidentities-${PV}:${SLOT}
->=kde-base/kaddressbook-${PV}:${SLOT}"
+>=kde-apps/kaddressbook-${PV}:${SLOT}"
 
 #RESTRICT="test"
 
diff --git a/kde-base/kdepim-wizards/metadata.xml b/kde-apps/kdepim-wizards/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdepim-wizards/metadata.xml
+++ b/kde-apps/kdepim-wizards/metadata.xml
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-apps/kdesdk-kioslaves/ChangeLog
index b8aec07a..b8aec07a 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-apps/kdesdk-kioslaves/ChangeLog
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index b752e618..b752e618 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.10.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-3.5.10.ebuild
index 95072b3b..95072b3b 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.10.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-3.5.10.ebuild
diff --git a/kde-base/kdesdk-kioslaves/metadata.xml b/kde-apps/kdesdk-kioslaves/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdesdk-kioslaves/metadata.xml
+++ b/kde-apps/kdesdk-kioslaves/metadata.xml
diff --git a/kde-base/kdesdk-meta/ChangeLog b/kde-apps/kdesdk-meta/ChangeLog
index 9a7230d1..9a7230d1 100644
--- a/kde-base/kdesdk-meta/ChangeLog
+++ b/kde-apps/kdesdk-meta/ChangeLog
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.5.10.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-3.5.10.ebuild
index 2f179502..2ecd82da 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.5.10.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-3.5.10.ebuild
@@ -17,13 +17,13 @@ RDEPEND="
 	>=kde-base/kapptemplate-${PV}:${SLOT}
 	>=kde-base/kbabel-${PV}:${SLOT}
 	>=kde-base/kbugbuster-${PV}:${SLOT}
-	>=kde-base/kcachegrind-${PV}:${SLOT}
+	>=kde-apps/kcachegrind-${PV}:${SLOT}
 	>=kde-base/kdesdk-kfile-plugins-${PV}:${SLOT}
 	>=kde-base/kdesdk-misc-${PV}:${SLOT}
 	>=kde-base/kdesdk-scripts-${PV}:${SLOT}
 	elibc_glibc? ( >=kde-base/kmtrace-${PV}:${SLOT} )
-	>=kde-base/kompare-${PV}:${SLOT}
+	>=kde-apps/kompare-${PV}:${SLOT}
 	>=kde-base/kspy-${PV}:${SLOT}
 	>=kde-base/kuiviewer-${PV}:${SLOT}
-	subversion? ( >=kde-base/kdesdk-kioslaves-${PV}:${SLOT} )
-	>=kde-base/umbrello-${PV}:${SLOT}"
+	subversion? ( >=kde-apps/kdesdk-kioslaves-${PV}:${SLOT} )
+	>=kde-apps/umbrello-${PV}:${SLOT}"
diff --git a/kde-base/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdesdk-meta/metadata.xml
+++ b/kde-apps/kdesdk-meta/metadata.xml
diff --git a/kde-base/kdesu/ChangeLog b/kde-apps/kdesu/ChangeLog
index 3e21ffc3..3e21ffc3 100644
--- a/kde-base/kdesu/ChangeLog
+++ b/kde-apps/kdesu/ChangeLog
diff --git a/kde-base/kdesu/Manifest b/kde-apps/kdesu/Manifest
index 6f890e81..6f890e81 100644
--- a/kde-base/kdesu/Manifest
+++ b/kde-apps/kdesu/Manifest
diff --git a/kde-base/kdesu/kdesu-3.5.10.ebuild b/kde-apps/kdesu/kdesu-3.5.10.ebuild
index 8175051d..8175051d 100644
--- a/kde-base/kdesu/kdesu-3.5.10.ebuild
+++ b/kde-apps/kdesu/kdesu-3.5.10.ebuild
diff --git a/kde-base/kdesu/metadata.xml b/kde-apps/kdesu/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdesu/metadata.xml
+++ b/kde-apps/kdesu/metadata.xml
diff --git a/kde-base/kdetoys-meta/ChangeLog b/kde-apps/kdetoys-meta/ChangeLog
index ca9da76f..ca9da76f 100644
--- a/kde-base/kdetoys-meta/ChangeLog
+++ b/kde-apps/kdetoys-meta/ChangeLog
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.5.10.ebuild b/kde-apps/kdetoys-meta/kdetoys-meta-3.5.10.ebuild
index 4d864641..b3f9d80e 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.5.10.ebuild
+++ b/kde-apps/kdetoys-meta/kdetoys-meta-3.5.10.ebuild
@@ -13,13 +13,13 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
->=kde-base/amor-${PV}:${SLOT}
+>=kde-apps/amor-${PV}:${SLOT}
 >=kde-base/eyesapplet-${PV}:${SLOT}
 >=kde-base/fifteenapplet-${PV}:${SLOT}
 >=kde-base/kmoon-${PV}:${SLOT}
 >=kde-base/kodo-${PV}:${SLOT}
->=kde-base/kteatime-${PV}:${SLOT}
->=kde-base/ktux-${PV}:${SLOT}
+>=kde-apps/kteatime-${PV}:${SLOT}
+>=kde-apps/ktux-${PV}:${SLOT}
 >=kde-base/kweather-${PV}:${SLOT}
 >=kde-base/kworldclock-${PV}:${SLOT}
 "
diff --git a/kde-base/kdetoys-meta/metadata.xml b/kde-apps/kdetoys-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdetoys-meta/metadata.xml
+++ b/kde-apps/kdetoys-meta/metadata.xml
diff --git a/kde-base/kdeutils-meta/ChangeLog b/kde-apps/kdeutils-meta/ChangeLog
index a353cc73..a353cc73 100644
--- a/kde-base/kdeutils-meta/ChangeLog
+++ b/kde-apps/kdeutils-meta/ChangeLog
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.5.10.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild
index dfca7176..d5e0efd3 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.5.10.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild
@@ -13,20 +13,20 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="crypt lirc"
 
 RDEPEND="
-	>=kde-base/ark-${PV}:${SLOT}
-	>=kde-base/kcalc-${PV}:${SLOT}
-	>=kde-base/kcharselect-${PV}:${SLOT}
+	>=kde-apps/ark-${PV}:${SLOT}
+	>=kde-apps/kcalc-${PV}:${SLOT}
+	>=kde-apps/kcharselect-${PV}:${SLOT}
 	lirc? ( >=kde-base/kdelirc-${PV}:${SLOT} )
-	>=kde-base/kdf-${PV}:${SLOT}
+	>=kde-apps/kdf-${PV}:${SLOT}
 	>=kde-base/kedit-${PV}:${SLOT}
-	>=kde-base/kfloppy-${PV}:${SLOT}
-	crypt? ( >=kde-base/kgpg-${PV}:${SLOT} )
+	>=kde-apps/kfloppy-${PV}:${SLOT}
+	crypt? ( >=kde-apps/kgpg-${PV}:${SLOT} )
 	>=kde-base/khexedit-${PV}:${SLOT}
-	>=kde-base/kjots-${PV}:${SLOT}
+	>=kde-apps/kjots-${PV}:${SLOT}
 	>=kde-base/klaptopdaemon-${PV}:${SLOT}
 	>=kde-base/kmilo-${PV}:${SLOT}
 	>=kde-base/kregexpeditor-${PV}:${SLOT}
 	>=kde-base/ksim-${PV}:${SLOT}
-	>=kde-base/ktimer-${PV}:${SLOT}
-	>=kde-base/kwalletmanager-${PV}:${SLOT}
+	>=kde-apps/ktimer-${PV}:${SLOT}
+	>=kde-apps/kwalletmanager-${PV}:${SLOT}
 	>=kde-base/superkaramba-${PV}:${SLOT}"
diff --git a/kde-base/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml
index 406258b6..406258b6 100644
--- a/kde-base/kdeutils-meta/metadata.xml
+++ b/kde-apps/kdeutils-meta/metadata.xml
diff --git a/kde-base/kdewebdev-meta/ChangeLog b/kde-apps/kdewebdev-meta/ChangeLog
index 72978eb1..72978eb1 100644
--- a/kde-base/kdewebdev-meta/ChangeLog
+++ b/kde-apps/kdewebdev-meta/ChangeLog
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.10.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-3.5.10.ebuild
index a378a9a0..0034d01a 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.10.ebuild
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-3.5.10.ebuild
@@ -14,9 +14,9 @@ IUSE=""
 
 RDEPEND="
 >=kde-base/kfilereplace-${PV}:${SLOT}
->=kde-base/kimagemapeditor-${PV}:${SLOT}
->=kde-base/klinkstatus-${PV}:${SLOT}
->=kde-base/kommander-${PV}:${SLOT}
+>=kde-apps/kimagemapeditor-${PV}:${SLOT}
+>=kde-apps/klinkstatus-${PV}:${SLOT}
+>=kde-apps/kommander-${PV}:${SLOT}
 >=kde-base/kxsldbg-${PV}:${SLOT}
 >=kde-base/quanta-${PV}:${SLOT}
 "
diff --git a/kde-base/kdewebdev-meta/metadata.xml b/kde-apps/kdewebdev-meta/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdewebdev-meta/metadata.xml
+++ b/kde-apps/kdewebdev-meta/metadata.xml
diff --git a/kde-base/kdf/ChangeLog b/kde-apps/kdf/ChangeLog
index 85d105e4..85d105e4 100644
--- a/kde-base/kdf/ChangeLog
+++ b/kde-apps/kdf/ChangeLog
diff --git a/kde-base/kdf/Manifest b/kde-apps/kdf/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
diff --git a/kde-base/kdf/kdf-3.5.10.ebuild b/kde-apps/kdf/kdf-3.5.10.ebuild
index 1efe7ddb..1efe7ddb 100644
--- a/kde-base/kdf/kdf-3.5.10.ebuild
+++ b/kde-apps/kdf/kdf-3.5.10.ebuild
diff --git a/kde-base/kdf/metadata.xml b/kde-apps/kdf/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdf/metadata.xml
+++ b/kde-apps/kdf/metadata.xml
diff --git a/kde-base/kdialog/ChangeLog b/kde-apps/kdialog/ChangeLog
index a5a4a021..a5a4a021 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-apps/kdialog/ChangeLog
diff --git a/kde-base/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 6b7d2597..6b7d2597 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
diff --git a/kde-base/kdialog/kdialog-3.5.10.ebuild b/kde-apps/kdialog/kdialog-3.5.10.ebuild
index 86d46511..86d46511 100644
--- a/kde-base/kdialog/kdialog-3.5.10.ebuild
+++ b/kde-apps/kdialog/kdialog-3.5.10.ebuild
diff --git a/kde-base/kdialog/metadata.xml b/kde-apps/kdialog/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kdialog/metadata.xml
+++ b/kde-apps/kdialog/metadata.xml
diff --git a/kde-base/kfind/ChangeLog b/kde-apps/kfind/ChangeLog
index 25691604..25691604 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-apps/kfind/ChangeLog
diff --git a/kde-base/kfind/Manifest b/kde-apps/kfind/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
diff --git a/kde-base/kfind/kfind-3.5.10.ebuild b/kde-apps/kfind/kfind-3.5.10.ebuild
index 42466364..0a1e925c 100644
--- a/kde-base/kfind/kfind-3.5.10.ebuild
+++ b/kde-apps/kfind/kfind-3.5.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE file find utility"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kfind/metadata.xml b/kde-apps/kfind/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kfind/metadata.xml
+++ b/kde-apps/kfind/metadata.xml
diff --git a/kde-base/kfloppy/ChangeLog b/kde-apps/kfloppy/ChangeLog
index c2a8afbd..c2a8afbd 100644
--- a/kde-base/kfloppy/ChangeLog
+++ b/kde-apps/kfloppy/ChangeLog
diff --git a/kde-base/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
diff --git a/kde-base/kfloppy/kfloppy-3.5.10.ebuild b/kde-apps/kfloppy/kfloppy-3.5.10.ebuild
index f98eb57c..f98eb57c 100644
--- a/kde-base/kfloppy/kfloppy-3.5.10.ebuild
+++ b/kde-apps/kfloppy/kfloppy-3.5.10.ebuild
diff --git a/kde-base/kfloppy/metadata.xml b/kde-apps/kfloppy/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kfloppy/metadata.xml
+++ b/kde-apps/kfloppy/metadata.xml
diff --git a/kde-base/kgamma/ChangeLog b/kde-apps/kgamma/ChangeLog
index 56f4251d..56f4251d 100644
--- a/kde-base/kgamma/ChangeLog
+++ b/kde-apps/kgamma/ChangeLog
diff --git a/kde-base/kgamma/Manifest b/kde-apps/kgamma/Manifest
index cb266102..cb266102 100644
--- a/kde-base/kgamma/Manifest
+++ b/kde-apps/kgamma/Manifest
diff --git a/kde-base/kgamma/kgamma-3.5.10.ebuild b/kde-apps/kgamma/kgamma-3.5.10.ebuild
index 708ff5da..708ff5da 100644
--- a/kde-base/kgamma/kgamma-3.5.10.ebuild
+++ b/kde-apps/kgamma/kgamma-3.5.10.ebuild
diff --git a/kde-base/kgamma/metadata.xml b/kde-apps/kgamma/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kgamma/metadata.xml
+++ b/kde-apps/kgamma/metadata.xml
diff --git a/kde-base/kgeography/ChangeLog b/kde-apps/kgeography/ChangeLog
index 3e6259fd..3e6259fd 100644
--- a/kde-base/kgeography/ChangeLog
+++ b/kde-apps/kgeography/ChangeLog
diff --git a/kde-base/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
diff --git a/kde-base/kgeography/kgeography-3.5.10.ebuild b/kde-apps/kgeography/kgeography-3.5.10.ebuild
index 8fba9e0e..8fba9e0e 100644
--- a/kde-base/kgeography/kgeography-3.5.10.ebuild
+++ b/kde-apps/kgeography/kgeography-3.5.10.ebuild
diff --git a/kde-base/kgeography/metadata.xml b/kde-apps/kgeography/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kgeography/metadata.xml
+++ b/kde-apps/kgeography/metadata.xml
diff --git a/kde-base/kget/ChangeLog b/kde-apps/kget/ChangeLog
index 09734d2f..09734d2f 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-apps/kget/ChangeLog
diff --git a/kde-base/kget/Manifest b/kde-apps/kget/Manifest
index 44a3cc86..44a3cc86 100644
--- a/kde-base/kget/Manifest
+++ b/kde-apps/kget/Manifest
diff --git a/kde-base/kget/kget-3.5.10.ebuild b/kde-apps/kget/kget-3.5.10.ebuild
index 5c18fecb..5c18fecb 100644
--- a/kde-base/kget/kget-3.5.10.ebuild
+++ b/kde-apps/kget/kget-3.5.10.ebuild
diff --git a/kde-base/kget/metadata.xml b/kde-apps/kget/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kget/metadata.xml
+++ b/kde-apps/kget/metadata.xml
diff --git a/kde-base/kgoldrunner/ChangeLog b/kde-apps/kgoldrunner/ChangeLog
index 16a6ec2e..16a6ec2e 100644
--- a/kde-base/kgoldrunner/ChangeLog
+++ b/kde-apps/kgoldrunner/ChangeLog
diff --git a/kde-base/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.5.10.ebuild b/kde-apps/kgoldrunner/kgoldrunner-3.5.10.ebuild
index 94821c28..c5d676e8 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.5.10.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kgoldrunner/metadata.xml b/kde-apps/kgoldrunner/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kgoldrunner/metadata.xml
+++ b/kde-apps/kgoldrunner/metadata.xml
diff --git a/kde-base/kgpg/ChangeLog b/kde-apps/kgpg/ChangeLog
index 94acbcb3..94acbcb3 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-apps/kgpg/ChangeLog
diff --git a/kde-base/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
diff --git a/kde-base/kgpg/files/kdeutils_kgpg-r995144.patch b/kde-apps/kgpg/files/kdeutils_kgpg-r995144.patch
index 206c91a1..206c91a1 100644
--- a/kde-base/kgpg/files/kdeutils_kgpg-r995144.patch
+++ b/kde-apps/kgpg/files/kdeutils_kgpg-r995144.patch
diff --git a/kde-base/kgpg/kgpg-3.5.10-r1.ebuild b/kde-apps/kgpg/kgpg-3.5.10-r1.ebuild
index b8a79dde..b8a79dde 100644
--- a/kde-base/kgpg/kgpg-3.5.10-r1.ebuild
+++ b/kde-apps/kgpg/kgpg-3.5.10-r1.ebuild
diff --git a/kde-base/kgpg/kgpg-3.5.10.ebuild b/kde-apps/kgpg/kgpg-3.5.10.ebuild
index 7dd97d22..7dd97d22 100644
--- a/kde-base/kgpg/kgpg-3.5.10.ebuild
+++ b/kde-apps/kgpg/kgpg-3.5.10.ebuild
diff --git a/kde-base/kgpg/metadata.xml b/kde-apps/kgpg/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kgpg/metadata.xml
+++ b/kde-apps/kgpg/metadata.xml
diff --git a/kde-base/khangman/ChangeLog b/kde-apps/khangman/ChangeLog
index 648c3995..648c3995 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-apps/khangman/ChangeLog
diff --git a/kde-base/khangman/Manifest b/kde-apps/khangman/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
diff --git a/kde-base/khangman/khangman-3.5.10.ebuild b/kde-apps/khangman/khangman-3.5.10.ebuild
index 81d5b169..4a9385fb 100644
--- a/kde-base/khangman/khangman-3.5.10.ebuild
+++ b/kde-apps/khangman/khangman-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Classical hangman game for KDE"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdeedu-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkdeedu/kdeeducore"
diff --git a/kde-base/khangman/metadata.xml b/kde-apps/khangman/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/khangman/metadata.xml
+++ b/kde-apps/khangman/metadata.xml
diff --git a/kde-base/kig/ChangeLog b/kde-apps/kig/ChangeLog
index 6bb0f3e1..6bb0f3e1 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-apps/kig/ChangeLog
diff --git a/kde-base/kig/Manifest b/kde-apps/kig/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kig/Manifest
+++ b/kde-apps/kig/Manifest
diff --git a/kde-base/kig/kig-3.5.10.ebuild b/kde-apps/kig/kig-3.5.10.ebuild
index 852e65a6..852e65a6 100644
--- a/kde-base/kig/kig-3.5.10.ebuild
+++ b/kde-apps/kig/kig-3.5.10.ebuild
diff --git a/kde-base/kig/metadata.xml b/kde-apps/kig/metadata.xml
index 75d68b1c..75d68b1c 100644
--- a/kde-base/kig/metadata.xml
+++ b/kde-apps/kig/metadata.xml
diff --git a/kde-base/kimagemapeditor/ChangeLog b/kde-apps/kimagemapeditor/ChangeLog
index c508d393..c508d393 100644
--- a/kde-base/kimagemapeditor/ChangeLog
+++ b/kde-apps/kimagemapeditor/ChangeLog
diff --git a/kde-base/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index fab83305..fab83305 100644
--- a/kde-base/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.5.10.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-3.5.10.ebuild
index 42cbe76b..42cbe76b 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.5.10.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-3.5.10.ebuild
diff --git a/kde-base/kimagemapeditor/metadata.xml b/kde-apps/kimagemapeditor/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kimagemapeditor/metadata.xml
+++ b/kde-apps/kimagemapeditor/metadata.xml
diff --git a/kde-base/kiten/ChangeLog b/kde-apps/kiten/ChangeLog
index 8b1c98bc..8b1c98bc 100644
--- a/kde-base/kiten/ChangeLog
+++ b/kde-apps/kiten/ChangeLog
diff --git a/kde-base/kiten/Manifest b/kde-apps/kiten/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
diff --git a/kde-base/kiten/kiten-3.5.10.ebuild b/kde-apps/kiten/kiten-3.5.10.ebuild
index 0371b9a1..0371b9a1 100644
--- a/kde-base/kiten/kiten-3.5.10.ebuild
+++ b/kde-apps/kiten/kiten-3.5.10.ebuild
diff --git a/kde-base/kiten/metadata.xml b/kde-apps/kiten/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kiten/metadata.xml
+++ b/kde-apps/kiten/metadata.xml
diff --git a/kde-base/kjots/ChangeLog b/kde-apps/kjots/ChangeLog
index 6bd56bef..6bd56bef 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-apps/kjots/ChangeLog
diff --git a/kde-base/kjots/Manifest b/kde-apps/kjots/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-apps/kjots/Manifest
diff --git a/kde-base/kjots/kjots-3.5.10.ebuild b/kde-apps/kjots/kjots-3.5.10.ebuild
index d44501ce..d44501ce 100644
--- a/kde-base/kjots/kjots-3.5.10.ebuild
+++ b/kde-apps/kjots/kjots-3.5.10.ebuild
diff --git a/kde-base/kjots/metadata.xml b/kde-apps/kjots/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kjots/metadata.xml
+++ b/kde-apps/kjots/metadata.xml
diff --git a/kde-base/kjumpingcube/ChangeLog b/kde-apps/kjumpingcube/ChangeLog
index 213f3479..213f3479 100644
--- a/kde-base/kjumpingcube/ChangeLog
+++ b/kde-apps/kjumpingcube/ChangeLog
diff --git a/kde-base/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.5.10.ebuild b/kde-apps/kjumpingcube/kjumpingcube-3.5.10.ebuild
index 439f712d..c163c9fd 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.5.10.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: Tactical one or two player game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-base/appsdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kjumpingcube/metadata.xml b/kde-apps/kjumpingcube/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kjumpingcube/metadata.xml
+++ b/kde-apps/kjumpingcube/metadata.xml
diff --git a/kde-base/klettres/ChangeLog b/kde-apps/klettres/ChangeLog
index e2a01ba4..e2a01ba4 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-apps/klettres/ChangeLog
diff --git a/kde-base/klettres/Manifest b/kde-apps/klettres/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
diff --git a/kde-base/klettres/klettres-3.5.10.ebuild b/kde-apps/klettres/klettres-3.5.10.ebuild
index f9477371..f9477371 100644
--- a/kde-base/klettres/klettres-3.5.10.ebuild
+++ b/kde-apps/klettres/klettres-3.5.10.ebuild
diff --git a/kde-base/klettres/metadata.xml b/kde-apps/klettres/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/klettres/metadata.xml
+++ b/kde-apps/klettres/metadata.xml
diff --git a/kde-base/klickety/ChangeLog b/kde-apps/klickety/ChangeLog
index 8e211b1b..8e211b1b 100644
--- a/kde-base/klickety/ChangeLog
+++ b/kde-apps/klickety/ChangeLog
diff --git a/kde-base/klickety/Manifest b/kde-apps/klickety/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
diff --git a/kde-base/klickety/klickety-3.5.10.ebuild b/kde-apps/klickety/klickety-3.5.10.ebuild
index 26012000..cf642142 100644
--- a/kde-base/klickety/klickety-3.5.10.ebuild
+++ b/kde-apps/klickety/klickety-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: Klickety is an adaptation of the "clickomania" game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/klickety/metadata.xml b/kde-apps/klickety/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/klickety/metadata.xml
+++ b/kde-apps/klickety/metadata.xml
diff --git a/kde-base/klines/ChangeLog b/kde-apps/klines/ChangeLog
index 33a4de47..33a4de47 100644
--- a/kde-base/klines/ChangeLog
+++ b/kde-apps/klines/ChangeLog
diff --git a/kde-base/klines/Manifest b/kde-apps/klines/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/klines/Manifest
+++ b/kde-apps/klines/Manifest
diff --git a/kde-base/klines/klines-3.5.10.ebuild b/kde-apps/klines/klines-3.5.10.ebuild
index a674d92f..7f8c680b 100644
--- a/kde-base/klines/klines-3.5.10.ebuild
+++ b/kde-apps/klines/klines-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/klines/metadata.xml b/kde-apps/klines/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/klines/metadata.xml
+++ b/kde-apps/klines/metadata.xml
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-apps/klinkstatus/ChangeLog
index 7252cfd5..7252cfd5 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-apps/klinkstatus/ChangeLog
diff --git a/kde-base/klinkstatus/Manifest b/kde-apps/klinkstatus/Manifest
index fab83305..fab83305 100644
--- a/kde-base/klinkstatus/Manifest
+++ b/kde-apps/klinkstatus/Manifest
diff --git a/kde-base/klinkstatus/files/kdewebdev_klinkstatus-r854465.patch b/kde-apps/klinkstatus/files/kdewebdev_klinkstatus-r854465.patch
index 427653a8..427653a8 100644
--- a/kde-base/klinkstatus/files/kdewebdev_klinkstatus-r854465.patch
+++ b/kde-apps/klinkstatus/files/kdewebdev_klinkstatus-r854465.patch
diff --git a/kde-base/klinkstatus/klinkstatus-3.5.10-r1.ebuild b/kde-apps/klinkstatus/klinkstatus-3.5.10-r1.ebuild
index ffd790ca..ffd790ca 100644
--- a/kde-base/klinkstatus/klinkstatus-3.5.10-r1.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-3.5.10-r1.ebuild
diff --git a/kde-base/klinkstatus/klinkstatus-3.5.10.ebuild b/kde-apps/klinkstatus/klinkstatus-3.5.10.ebuild
index 4d1766fc..4d1766fc 100644
--- a/kde-base/klinkstatus/klinkstatus-3.5.10.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-3.5.10.ebuild
diff --git a/kde-base/klinkstatus/metadata.xml b/kde-apps/klinkstatus/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/klinkstatus/metadata.xml
+++ b/kde-apps/klinkstatus/metadata.xml
diff --git a/kde-base/kmag/ChangeLog b/kde-apps/kmag/ChangeLog
index cb848cc0..cb848cc0 100644
--- a/kde-base/kmag/ChangeLog
+++ b/kde-apps/kmag/ChangeLog
diff --git a/kde-base/kmag/Manifest b/kde-apps/kmag/Manifest
index 81c3bfaa..81c3bfaa 100644
--- a/kde-base/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
diff --git a/kde-base/kmag/kmag-3.5.10.ebuild b/kde-apps/kmag/kmag-3.5.10.ebuild
index f14593fe..f14593fe 100644
--- a/kde-base/kmag/kmag-3.5.10.ebuild
+++ b/kde-apps/kmag/kmag-3.5.10.ebuild
diff --git a/kde-base/kmag/metadata.xml b/kde-apps/kmag/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmag/metadata.xml
+++ b/kde-apps/kmag/metadata.xml
diff --git a/kde-base/kmahjongg/ChangeLog b/kde-apps/kmahjongg/ChangeLog
index 9c4e94f1..9c4e94f1 100644
--- a/kde-base/kmahjongg/ChangeLog
+++ b/kde-apps/kmahjongg/ChangeLog
diff --git a/kde-base/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
diff --git a/kde-base/kmahjongg/kmahjongg-3.5.10.ebuild b/kde-apps/kmahjongg/kmahjongg-3.5.10.ebuild
index 3be49887..50749399 100644
--- a/kde-base/kmahjongg/kmahjongg-3.5.10.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Mahjongg for KDE"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kmahjongg/metadata.xml b/kde-apps/kmahjongg/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmahjongg/metadata.xml
+++ b/kde-apps/kmahjongg/metadata.xml
diff --git a/kde-base/kmail/ChangeLog b/kde-apps/kmail/ChangeLog
index ee162148..ee162148 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-apps/kmail/ChangeLog
diff --git a/kde-base/kmail/Manifest b/kde-apps/kmail/Manifest
index f3718929..f3718929 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
diff --git a/kde-base/kmail/files/kdepim_kmail-composer-crash-fix.patch b/kde-apps/kmail/files/kdepim_kmail-composer-crash-fix.patch
index 9b0f752d..9b0f752d 100644
--- a/kde-base/kmail/files/kdepim_kmail-composer-crash-fix.patch
+++ b/kde-apps/kmail/files/kdepim_kmail-composer-crash-fix.patch
diff --git a/kde-base/kmail/files/kdepim_kmail-p05-r1022986.patch b/kde-apps/kmail/files/kdepim_kmail-p05-r1022986.patch
index 7452a8f7..7452a8f7 100644
--- a/kde-base/kmail/files/kdepim_kmail-p05-r1022986.patch
+++ b/kde-apps/kmail/files/kdepim_kmail-p05-r1022986.patch
diff --git a/kde-base/kmail/kmail-3.5.10-r1.ebuild b/kde-apps/kmail/kmail-3.5.10-r1.ebuild
index ecfa6c98..2e86bd98 100644
--- a/kde-base/kmail/kmail-3.5.10-r1.ebuild
+++ b/kde-apps/kmail/kmail-3.5.10-r1.ebuild
@@ -22,15 +22,15 @@ DEPEND=">=kde-base/libkdenetwork-${PV}:${SLOT}
 	>=kde-base/libksieve-${PV}:${SLOT}
 	>=kde-base/certmanager-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	>=kde-base/libkpgp-${PV}:${SLOT}
 	>=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	|| ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
-	|| ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/
diff --git a/kde-base/kmail/kmail-3.5.10-r2.ebuild b/kde-apps/kmail/kmail-3.5.10-r2.ebuild
index 411485b2..441c4be0 100644
--- a/kde-base/kmail/kmail-3.5.10-r2.ebuild
+++ b/kde-apps/kmail/kmail-3.5.10-r2.ebuild
@@ -22,15 +22,15 @@ DEPEND=">=kde-base/libkdenetwork-${PV}:${SLOT}
 	>=kde-base/libksieve-${PV}:${SLOT}
 	>=kde-base/certmanager-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	>=kde-base/libkpgp-${PV}:${SLOT}
 	>=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	|| ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
-	|| ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/
diff --git a/kde-base/kmail/kmail-3.5.10.ebuild b/kde-apps/kmail/kmail-3.5.10.ebuild
index f748cd14..d4b51809 100644
--- a/kde-base/kmail/kmail-3.5.10.ebuild
+++ b/kde-apps/kmail/kmail-3.5.10.ebuild
@@ -22,15 +22,15 @@ DEPEND=">=kde-base/libkdenetwork-${PV}:${SLOT}
 	>=kde-base/libksieve-${PV}:${SLOT}
 	>=kde-base/certmanager-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	>=kde-base/libkpgp-${PV}:${SLOT}
 	>=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/pinentry )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}
 	>=kde-base/kmailcvt-${PV}:${SLOT}
-	|| ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
-	|| ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/
diff --git a/kde-base/kmail/metadata.xml b/kde-apps/kmail/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmail/metadata.xml
+++ b/kde-apps/kmail/metadata.xml
diff --git a/kde-base/kmines/ChangeLog b/kde-apps/kmines/ChangeLog
index 95382952..95382952 100644
--- a/kde-base/kmines/ChangeLog
+++ b/kde-apps/kmines/ChangeLog
diff --git a/kde-base/kmines/Manifest b/kde-apps/kmines/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
diff --git a/kde-base/kmines/kmines-3.5.10.ebuild b/kde-apps/kmines/kmines-3.5.10.ebuild
index fa4ba64b..aefe58ed 100644
--- a/kde-base/kmines/kmines-3.5.10.ebuild
+++ b/kde-apps/kmines/kmines-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KMines is a classic mine sweeper game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-base/appsdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kmines/metadata.xml b/kde-apps/kmines/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmines/metadata.xml
+++ b/kde-apps/kmines/metadata.xml
diff --git a/kde-base/kmix/ChangeLog b/kde-apps/kmix/ChangeLog
index 50d1ba83..50d1ba83 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-apps/kmix/ChangeLog
diff --git a/kde-base/kmix/Manifest b/kde-apps/kmix/Manifest
index c8231466..c8231466 100644
--- a/kde-base/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
diff --git a/kde-base/kmix/files/kdemultimedia_kmix-r893885.patch b/kde-apps/kmix/files/kdemultimedia_kmix-r893885.patch
index 9aaad776..9aaad776 100644
--- a/kde-base/kmix/files/kdemultimedia_kmix-r893885.patch
+++ b/kde-apps/kmix/files/kdemultimedia_kmix-r893885.patch
diff --git a/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch b/kde-apps/kmix/files/kmix-3.5.6-alsa-tests.patch
index 898de445..898de445 100644
--- a/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch
+++ b/kde-apps/kmix/files/kmix-3.5.6-alsa-tests.patch
diff --git a/kde-base/kmix/kmix-3.5.10-r1.ebuild b/kde-apps/kmix/kmix-3.5.10-r1.ebuild
index 99e11f63..99e11f63 100644
--- a/kde-base/kmix/kmix-3.5.10-r1.ebuild
+++ b/kde-apps/kmix/kmix-3.5.10-r1.ebuild
diff --git a/kde-base/kmix/kmix-3.5.10.ebuild b/kde-apps/kmix/kmix-3.5.10.ebuild
index de00fde3..de00fde3 100644
--- a/kde-base/kmix/kmix-3.5.10.ebuild
+++ b/kde-apps/kmix/kmix-3.5.10.ebuild
diff --git a/kde-base/kmix/metadata.xml b/kde-apps/kmix/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmix/metadata.xml
+++ b/kde-apps/kmix/metadata.xml
diff --git a/kde-base/kmousetool/ChangeLog b/kde-apps/kmousetool/ChangeLog
index 618e5aa2..618e5aa2 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-apps/kmousetool/ChangeLog
diff --git a/kde-base/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 81c3bfaa..81c3bfaa 100644
--- a/kde-base/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
diff --git a/kde-base/kmousetool/kmousetool-3.5.10.ebuild b/kde-apps/kmousetool/kmousetool-3.5.10.ebuild
index 5d99fbee..5d99fbee 100644
--- a/kde-base/kmousetool/kmousetool-3.5.10.ebuild
+++ b/kde-apps/kmousetool/kmousetool-3.5.10.ebuild
diff --git a/kde-base/kmousetool/metadata.xml b/kde-apps/kmousetool/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmousetool/metadata.xml
+++ b/kde-apps/kmousetool/metadata.xml
diff --git a/kde-base/kmouth/ChangeLog b/kde-apps/kmouth/ChangeLog
index 719e2e23..719e2e23 100644
--- a/kde-base/kmouth/ChangeLog
+++ b/kde-apps/kmouth/ChangeLog
diff --git a/kde-base/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 81c3bfaa..81c3bfaa 100644
--- a/kde-base/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
diff --git a/kde-base/kmouth/kmouth-3.5.10.ebuild b/kde-apps/kmouth/kmouth-3.5.10.ebuild
index f1d9ef93..f1d9ef93 100644
--- a/kde-base/kmouth/kmouth-3.5.10.ebuild
+++ b/kde-apps/kmouth/kmouth-3.5.10.ebuild
diff --git a/kde-base/kmouth/metadata.xml b/kde-apps/kmouth/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmouth/metadata.xml
+++ b/kde-apps/kmouth/metadata.xml
diff --git a/kde-base/kmplot/ChangeLog b/kde-apps/kmplot/ChangeLog
index 74e4101a..74e4101a 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-apps/kmplot/ChangeLog
diff --git a/kde-base/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
diff --git a/kde-base/kmplot/kmplot-3.5.10.ebuild b/kde-apps/kmplot/kmplot-3.5.10.ebuild
index c6af2add..c6af2add 100644
--- a/kde-base/kmplot/kmplot-3.5.10.ebuild
+++ b/kde-apps/kmplot/kmplot-3.5.10.ebuild
diff --git a/kde-base/kmplot/metadata.xml b/kde-apps/kmplot/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kmplot/metadata.xml
+++ b/kde-apps/kmplot/metadata.xml
diff --git a/kde-base/knetattach/ChangeLog b/kde-apps/knetattach/ChangeLog
index 5ff2b310..5ff2b310 100644
--- a/kde-base/knetattach/ChangeLog
+++ b/kde-apps/knetattach/ChangeLog
diff --git a/kde-base/knetattach/Manifest b/kde-apps/knetattach/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/knetattach/Manifest
+++ b/kde-apps/knetattach/Manifest
diff --git a/kde-base/knetattach/files/kdebase_knetattach-r863267.patch b/kde-apps/knetattach/files/kdebase_knetattach-r863267.patch
index 200dc77e..200dc77e 100644
--- a/kde-base/knetattach/files/kdebase_knetattach-r863267.patch
+++ b/kde-apps/knetattach/files/kdebase_knetattach-r863267.patch
diff --git a/kde-base/knetattach/knetattach-3.5.10-r1.ebuild b/kde-apps/knetattach/knetattach-3.5.10-r1.ebuild
index 98c391ee..98c391ee 100644
--- a/kde-base/knetattach/knetattach-3.5.10-r1.ebuild
+++ b/kde-apps/knetattach/knetattach-3.5.10-r1.ebuild
diff --git a/kde-base/knetattach/knetattach-3.5.10.ebuild b/kde-apps/knetattach/knetattach-3.5.10.ebuild
index a6a69d80..a6a69d80 100644
--- a/kde-base/knetattach/knetattach-3.5.10.ebuild
+++ b/kde-apps/knetattach/knetattach-3.5.10.ebuild
diff --git a/kde-base/knetattach/metadata.xml b/kde-apps/knetattach/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/knetattach/metadata.xml
+++ b/kde-apps/knetattach/metadata.xml
diff --git a/kde-base/knetwalk/ChangeLog b/kde-apps/knetwalk/ChangeLog
index 252113a0..252113a0 100644
--- a/kde-base/knetwalk/ChangeLog
+++ b/kde-apps/knetwalk/ChangeLog
diff --git a/kde-base/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
diff --git a/kde-base/knetwalk/knetwalk-3.5.10.ebuild b/kde-apps/knetwalk/knetwalk-3.5.10.ebuild
index 971f0353..ed2286d2 100644
--- a/kde-base/knetwalk/knetwalk-3.5.10.ebuild
+++ b/kde-apps/knetwalk/knetwalk-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE tron game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/knetwalk/metadata.xml b/kde-apps/knetwalk/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/knetwalk/metadata.xml
+++ b/kde-apps/knetwalk/metadata.xml
diff --git a/kde-base/knode/ChangeLog b/kde-apps/knode/ChangeLog
index 4739a1ef..4739a1ef 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-apps/knode/ChangeLog
diff --git a/kde-base/knode/Manifest b/kde-apps/knode/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/knode/Manifest
+++ b/kde-apps/knode/Manifest
diff --git a/kde-base/knode/knode-3.5.10.ebuild b/kde-apps/knode/knode-3.5.10.ebuild
index ae067fc5..7d9566dd 100644
--- a/kde-base/knode/knode-3.5.10.ebuild
+++ b/kde-apps/knode/knode-3.5.10.ebuild
@@ -12,7 +12,7 @@ IUSE=""
 
 DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkdenetwork-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}
+>=kde-apps/kontact-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}
 >=kde-base/libkpgp-${PV}:${SLOT}"
 
diff --git a/kde-base/knode/metadata.xml b/kde-apps/knode/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/knode/metadata.xml
+++ b/kde-apps/knode/metadata.xml
diff --git a/kde-base/knotes/ChangeLog b/kde-apps/knotes/ChangeLog
index c12847c8..c12847c8 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-apps/knotes/ChangeLog
diff --git a/kde-base/knotes/Manifest b/kde-apps/knotes/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
diff --git a/kde-base/knotes/knotes-3.5.10.ebuild b/kde-apps/knotes/knotes-3.5.10.ebuild
index 8c0c78a8..880d1898 100644
--- a/kde-base/knotes/knotes-3.5.10.ebuild
+++ b/kde-apps/knotes/knotes-3.5.10.ebuild
@@ -12,7 +12,7 @@ IUSE=""
 
 DEPEND=">=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/libkdepim-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}"
+>=kde-apps/kontact-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMCOPYLIB="
diff --git a/kde-base/knotes/metadata.xml b/kde-apps/knotes/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/knotes/metadata.xml
+++ b/kde-apps/knotes/metadata.xml
diff --git a/kde-base/kolourpaint/ChangeLog b/kde-apps/kolourpaint/ChangeLog
index 340d4b29..340d4b29 100644
--- a/kde-base/kolourpaint/ChangeLog
+++ b/kde-apps/kolourpaint/ChangeLog
diff --git a/kde-base/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index cb266102..cb266102 100644
--- a/kde-base/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
diff --git a/kde-base/kolourpaint/kolourpaint-3.5.10.ebuild b/kde-apps/kolourpaint/kolourpaint-3.5.10.ebuild
index 0b41b6c1..0b41b6c1 100644
--- a/kde-base/kolourpaint/kolourpaint-3.5.10.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-3.5.10.ebuild
diff --git a/kde-base/kolourpaint/metadata.xml b/kde-apps/kolourpaint/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kolourpaint/metadata.xml
+++ b/kde-apps/kolourpaint/metadata.xml
diff --git a/kde-base/kommander/ChangeLog b/kde-apps/kommander/ChangeLog
index 9857c9c6..9857c9c6 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-apps/kommander/ChangeLog
diff --git a/kde-base/kommander/Manifest b/kde-apps/kommander/Manifest
index fab83305..fab83305 100644
--- a/kde-base/kommander/Manifest
+++ b/kde-apps/kommander/Manifest
diff --git a/kde-base/kommander/files/kdewebdev_kommander-r1064505.patch b/kde-apps/kommander/files/kdewebdev_kommander-r1064505.patch
index 5f7a3e2e..5f7a3e2e 100644
--- a/kde-base/kommander/files/kdewebdev_kommander-r1064505.patch
+++ b/kde-apps/kommander/files/kdewebdev_kommander-r1064505.patch
diff --git a/kde-base/kommander/files/kommander-3.5.9-visibility.patch b/kde-apps/kommander/files/kommander-3.5.9-visibility.patch
index 9ef23c30..9ef23c30 100644
--- a/kde-base/kommander/files/kommander-3.5.9-visibility.patch
+++ b/kde-apps/kommander/files/kommander-3.5.9-visibility.patch
diff --git a/kde-base/kommander/kommander-3.5.10-r1.ebuild b/kde-apps/kommander/kommander-3.5.10-r1.ebuild
index 1c53fdc5..1c53fdc5 100644
--- a/kde-base/kommander/kommander-3.5.10-r1.ebuild
+++ b/kde-apps/kommander/kommander-3.5.10-r1.ebuild
diff --git a/kde-base/kommander/kommander-3.5.10.ebuild b/kde-apps/kommander/kommander-3.5.10.ebuild
index 9c7c1730..9c7c1730 100644
--- a/kde-base/kommander/kommander-3.5.10.ebuild
+++ b/kde-apps/kommander/kommander-3.5.10.ebuild
diff --git a/kde-base/kommander/metadata.xml b/kde-apps/kommander/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kommander/metadata.xml
+++ b/kde-apps/kommander/metadata.xml
diff --git a/kde-base/kompare/ChangeLog b/kde-apps/kompare/ChangeLog
index d10618f5..d10618f5 100644
--- a/kde-base/kompare/ChangeLog
+++ b/kde-apps/kompare/ChangeLog
diff --git a/kde-base/kompare/Manifest b/kde-apps/kompare/Manifest
index b752e618..b752e618 100644
--- a/kde-base/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
diff --git a/kde-base/kompare/kompare-3.5.10.ebuild b/kde-apps/kompare/kompare-3.5.10.ebuild
index 59736621..59736621 100644
--- a/kde-base/kompare/kompare-3.5.10.ebuild
+++ b/kde-apps/kompare/kompare-3.5.10.ebuild
diff --git a/kde-base/kompare/metadata.xml b/kde-apps/kompare/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kompare/metadata.xml
+++ b/kde-apps/kompare/metadata.xml
diff --git a/kde-base/konq-plugins/ChangeLog b/kde-apps/konq-plugins/ChangeLog
index 5e142eb9..5e142eb9 100644
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-apps/konq-plugins/ChangeLog
diff --git a/kde-base/konq-plugins/Manifest b/kde-apps/konq-plugins/Manifest
index fc400158..fc400158 100644
--- a/kde-base/konq-plugins/Manifest
+++ b/kde-apps/konq-plugins/Manifest
diff --git a/kde-base/konq-plugins/files/konq-plugins-parallel-make.patch b/kde-apps/konq-plugins/files/konq-plugins-parallel-make.patch
index 5d08b286..5d08b286 100644
--- a/kde-base/konq-plugins/files/konq-plugins-parallel-make.patch
+++ b/kde-apps/konq-plugins/files/konq-plugins-parallel-make.patch
diff --git a/kde-base/konq-plugins/konq-plugins-3.5.10.ebuild b/kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild
index e14493d6..b64364e2 100644
--- a/kde-base/konq-plugins/konq-plugins-3.5.10.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-3.5.10.ebuild
@@ -10,7 +10,7 @@ inherit kde-meta
 DESCRIPTION="Various plugins for Konqueror."
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
-DEPEND="|| ( >=kde-base/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+DEPEND="|| ( >=kde-apps/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	!kde-misc/metabar"
 RDEPEND="${DEPEND}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}"
diff --git a/kde-base/konq-plugins/metadata.xml b/kde-apps/konq-plugins/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/konq-plugins/metadata.xml
+++ b/kde-apps/konq-plugins/metadata.xml
diff --git a/kde-base/konqueror/ChangeLog b/kde-apps/konqueror/ChangeLog
index 948a4c40..948a4c40 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-apps/konqueror/ChangeLog
diff --git a/kde-base/konqueror/Manifest b/kde-apps/konqueror/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
diff --git a/kde-base/konqueror/konqueror-3.5.10.ebuild b/kde-apps/konqueror/konqueror-3.5.10.ebuild
index b5e0350b..b32204a9 100644
--- a/kde-base/konqueror/konqueror-3.5.10.ebuild
+++ b/kde-apps/konqueror/konqueror-3.5.10.ebuild
@@ -11,12 +11,12 @@ DESCRIPTION="KDE: Web browser, file manager, ..."
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="branding java kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}
-	>=kde-base/kcontrol-${PV}:${SLOT}
-	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}
-	>=kde-base/kfind-${PV}:${SLOT}
+	>=kde-apps/kcontrol-${PV}:${SLOT}
+	>=kde-apps/kdebase-kioslaves-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
 	java? ( virtual/jre )"
 
 KMCOPYLIB="libkonq libkonq"
diff --git a/kde-base/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 334134cc..334134cc 100644
--- a/kde-base/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
diff --git a/kde-base/konquest/ChangeLog b/kde-apps/konquest/ChangeLog
index ab555af5..ab555af5 100644
--- a/kde-base/konquest/ChangeLog
+++ b/kde-apps/konquest/ChangeLog
diff --git a/kde-base/konquest/Manifest b/kde-apps/konquest/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
diff --git a/kde-base/konquest/konquest-3.5.10.ebuild b/kde-apps/konquest/konquest-3.5.10.ebuild
index 52a7accd..fe1f0286 100644
--- a/kde-base/konquest/konquest-3.5.10.ebuild
+++ b/kde-apps/konquest/konquest-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Galactic Strategy KDE Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/konquest/metadata.xml b/kde-apps/konquest/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/konquest/metadata.xml
+++ b/kde-apps/konquest/metadata.xml
diff --git a/kde-base/konsole/ChangeLog b/kde-apps/konsole/ChangeLog
index bd113ad2..bd113ad2 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-apps/konsole/ChangeLog
diff --git a/kde-base/konsole/Manifest b/kde-apps/konsole/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
diff --git a/kde-base/konsole/konsole-3.5.10.ebuild b/kde-apps/konsole/konsole-3.5.10.ebuild
index 83b1ec2c..de5bf264 100644
--- a/kde-base/konsole/konsole-3.5.10.ebuild
+++ b/kde-apps/konsole/konsole-3.5.10.ebuild
@@ -20,4 +20,4 @@ DEPEND="${RDEPEND}
 
 # For kcm_konsole module
 RDEPEND="${RDEPEND}
-	>=kde-base/kcontrol-${PV}:${SLOT}"
+	>=kde-apps/kcontrol-${PV}:${SLOT}"
diff --git a/kde-base/konsole/metadata.xml b/kde-apps/konsole/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/konsole/metadata.xml
+++ b/kde-apps/konsole/metadata.xml
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-apps/konsolekalendar/ChangeLog
index b8bba4b5..b8bba4b5 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-apps/konsolekalendar/ChangeLog
diff --git a/kde-base/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.5.10.ebuild b/kde-apps/konsolekalendar/konsolekalendar-3.5.10.ebuild
index 727a3ff7..727a3ff7 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.5.10.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-3.5.10.ebuild
diff --git a/kde-base/konsolekalendar/metadata.xml b/kde-apps/konsolekalendar/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/konsolekalendar/metadata.xml
+++ b/kde-apps/konsolekalendar/metadata.xml
diff --git a/kde-base/kontact/ChangeLog b/kde-apps/kontact/ChangeLog
index 959e0080..959e0080 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-apps/kontact/ChangeLog
diff --git a/kde-base/kontact/Manifest b/kde-apps/kontact/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
diff --git a/kde-base/kontact/files/kdepim_kontact-r931963.patch b/kde-apps/kontact/files/kdepim_kontact-r931963.patch
index 9e27e9a5..9e27e9a5 100644
--- a/kde-base/kontact/files/kdepim_kontact-r931963.patch
+++ b/kde-apps/kontact/files/kdepim_kontact-r931963.patch
diff --git a/kde-base/kontact/kontact-3.5.10-r1.ebuild b/kde-apps/kontact/kontact-3.5.10-r1.ebuild
index 8fe455bb..8fe455bb 100644
--- a/kde-base/kontact/kontact-3.5.10-r1.ebuild
+++ b/kde-apps/kontact/kontact-3.5.10-r1.ebuild
diff --git a/kde-base/kontact/kontact-3.5.10.ebuild b/kde-apps/kontact/kontact-3.5.10.ebuild
index 4a2e6316..4a2e6316 100644
--- a/kde-base/kontact/kontact-3.5.10.ebuild
+++ b/kde-apps/kontact/kontact-3.5.10.ebuild
diff --git a/kde-base/kontact/metadata.xml b/kde-apps/kontact/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kontact/metadata.xml
+++ b/kde-apps/kontact/metadata.xml
diff --git a/kde-base/kopete/ChangeLog b/kde-apps/kopete/ChangeLog
index a6c4dfcc..a6c4dfcc 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-apps/kopete/ChangeLog
diff --git a/kde-base/kopete/Manifest b/kde-apps/kopete/Manifest
index dcfadeb0..dcfadeb0 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
diff --git a/kde-base/kopete/files/emoticon-manager.patch b/kde-apps/kopete/files/emoticon-manager.patch
index 890a2e4a..890a2e4a 100644
--- a/kde-base/kopete/files/emoticon-manager.patch
+++ b/kde-apps/kopete/files/emoticon-manager.patch
diff --git a/kde-base/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch b/kde-apps/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
index 30f2ee72..30f2ee72 100644
--- a/kde-base/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
+++ b/kde-apps/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
diff --git a/kde-base/kopete/files/kdenetwork_kopete-r865247.patch b/kde-apps/kopete/files/kdenetwork_kopete-r865247.patch
index 4c65ee92..4c65ee92 100644
--- a/kde-base/kopete/files/kdenetwork_kopete-r865247.patch
+++ b/kde-apps/kopete/files/kdenetwork_kopete-r865247.patch
diff --git a/kde-base/kopete/files/kopete-0.12_alpha1-xscreensaver.patch b/kde-apps/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
index 2052d30c..2052d30c 100644
--- a/kde-base/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
+++ b/kde-apps/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
diff --git a/kde-base/kopete/files/kopete-3.5-rolling_icon.patch b/kde-apps/kopete/files/kopete-3.5-rolling_icon.patch
index 072425e2..072425e2 100644
--- a/kde-base/kopete/files/kopete-3.5-rolling_icon.patch
+++ b/kde-apps/kopete/files/kopete-3.5-rolling_icon.patch
diff --git a/kde-base/kopete/files/kopete-3.5.10-gcc43.patch b/kde-apps/kopete/files/kopete-3.5.10-gcc43.patch
index 814adf66..814adf66 100644
--- a/kde-base/kopete/files/kopete-3.5.10-gcc43.patch
+++ b/kde-apps/kopete/files/kopete-3.5.10-gcc43.patch
diff --git a/kde-base/kopete/files/kopete-3.5.10-glibc210.patch b/kde-apps/kopete/files/kopete-3.5.10-glibc210.patch
index 6caa8f17..6caa8f17 100644
--- a/kde-base/kopete/files/kopete-3.5.10-glibc210.patch
+++ b/kde-apps/kopete/files/kopete-3.5.10-glibc210.patch
diff --git a/kde-base/kopete/files/kopete-3.5.10-groupwise.patch b/kde-apps/kopete/files/kopete-3.5.10-groupwise.patch
index 03fbb931..03fbb931 100644
--- a/kde-base/kopete/files/kopete-3.5.10-groupwise.patch
+++ b/kde-apps/kopete/files/kopete-3.5.10-groupwise.patch
diff --git a/kde-base/kopete/files/kopete-3.5.10-icq-protocol-change2.patch b/kde-apps/kopete/files/kopete-3.5.10-icq-protocol-change2.patch
index 37a4afd4..37a4afd4 100644
--- a/kde-base/kopete/files/kopete-3.5.10-icq-protocol-change2.patch
+++ b/kde-apps/kopete/files/kopete-3.5.10-icq-protocol-change2.patch
diff --git a/kde-base/kopete/files/kopete-3.5.10-jabber-protocol-gtalknickfix.patch b/kde-apps/kopete/files/kopete-3.5.10-jabber-protocol-gtalknickfix.patch
index 01ad284d..01ad284d 100644
--- a/kde-base/kopete/files/kopete-3.5.10-jabber-protocol-gtalknickfix.patch
+++ b/kde-apps/kopete/files/kopete-3.5.10-jabber-protocol-gtalknickfix.patch
diff --git a/kde-base/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch b/kde-apps/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch
index 84ef79bb..84ef79bb 100644
--- a/kde-base/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch
+++ b/kde-apps/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch
diff --git a/kde-base/kopete/files/kopete-3.5.5-icqfix.patch b/kde-apps/kopete/files/kopete-3.5.5-icqfix.patch
index 4aa3f275..4aa3f275 100644
--- a/kde-base/kopete/files/kopete-3.5.5-icqfix.patch
+++ b/kde-apps/kopete/files/kopete-3.5.5-icqfix.patch
diff --git a/kde-base/kopete/kopete-3.5.10-r2.ebuild b/kde-apps/kopete/kopete-3.5.10-r2.ebuild
index 97b02cad..97b02cad 100644
--- a/kde-base/kopete/kopete-3.5.10-r2.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r2.ebuild
diff --git a/kde-base/kopete/kopete-3.5.10-r4.ebuild b/kde-apps/kopete/kopete-3.5.10-r4.ebuild
index e411388a..e411388a 100644
--- a/kde-base/kopete/kopete-3.5.10-r4.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r4.ebuild
diff --git a/kde-base/kopete/kopete-3.5.10-r5.ebuild b/kde-apps/kopete/kopete-3.5.10-r5.ebuild
index 8211418e..8211418e 100644
--- a/kde-base/kopete/kopete-3.5.10-r5.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r5.ebuild
diff --git a/kde-base/kopete/kopete-3.5.10-r6.ebuild b/kde-apps/kopete/kopete-3.5.10-r6.ebuild
index be281b11..be281b11 100644
--- a/kde-base/kopete/kopete-3.5.10-r6.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r6.ebuild
diff --git a/kde-base/kopete/kopete-3.5.10.ebuild b/kde-apps/kopete/kopete-3.5.10.ebuild
index 8e964fd0..8e964fd0 100644
--- a/kde-base/kopete/kopete-3.5.10.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10.ebuild
diff --git a/kde-base/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index b23aedc5..b23aedc5 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
diff --git a/kde-base/korganizer/ChangeLog b/kde-apps/korganizer/ChangeLog
index 8e3959bc..8e3959bc 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-apps/korganizer/ChangeLog
diff --git a/kde-base/korganizer/Manifest b/kde-apps/korganizer/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
diff --git a/kde-base/korganizer/files/kdepim_korganizer-r893152.patch b/kde-apps/korganizer/files/kdepim_korganizer-r893152.patch
index 1a85044c..1a85044c 100644
--- a/kde-base/korganizer/files/kdepim_korganizer-r893152.patch
+++ b/kde-apps/korganizer/files/kdepim_korganizer-r893152.patch
diff --git a/kde-base/korganizer/korganizer-3.5.10-r1.ebuild b/kde-apps/korganizer/korganizer-3.5.10-r1.ebuild
index 05df1e98..478f168b 100644
--- a/kde-base/korganizer/korganizer-3.5.10-r1.ebuild
+++ b/kde-apps/korganizer/korganizer-3.5.10-r1.ebuild
@@ -13,9 +13,9 @@ DEPEND=">=kde-base/libkpimexchange-${PV}:${SLOT}
 >=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/libkpimidentities-${PV}:${SLOT}
->=kde-base/ktnef-${PV}:${SLOT}
->=kde-base/kdepim-kresources-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}
+>=kde-apps/ktnef-${PV}:${SLOT}
+>=kde-apps/kdepim-kresources-${PV}:${SLOT}
+>=kde-apps/kontact-${PV}:${SLOT}
 >=kde-base/libkholidays-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/korganizer/korganizer-3.5.10.ebuild b/kde-apps/korganizer/korganizer-3.5.10.ebuild
index cb3a4f12..a1b0f3fa 100644
--- a/kde-base/korganizer/korganizer-3.5.10.ebuild
+++ b/kde-apps/korganizer/korganizer-3.5.10.ebuild
@@ -13,9 +13,9 @@ DEPEND=">=kde-base/libkpimexchange-${PV}:${SLOT}
 >=kde-base/libkdepim-${PV}:${SLOT}
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/libkpimidentities-${PV}:${SLOT}
->=kde-base/ktnef-${PV}:${SLOT}
->=kde-base/kdepim-kresources-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}
+>=kde-apps/ktnef-${PV}:${SLOT}
+>=kde-apps/kdepim-kresources-${PV}:${SLOT}
+>=kde-apps/kontact-${PV}:${SLOT}
 >=kde-base/libkholidays-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/korganizer/metadata.xml b/kde-apps/korganizer/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/korganizer/metadata.xml
+++ b/kde-apps/korganizer/metadata.xml
diff --git a/kde-base/kpat/ChangeLog b/kde-apps/kpat/ChangeLog
index 85f1c5ef..85f1c5ef 100644
--- a/kde-base/kpat/ChangeLog
+++ b/kde-apps/kpat/ChangeLog
diff --git a/kde-base/kpat/Manifest b/kde-apps/kpat/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
diff --git a/kde-base/kpat/kpat-3.5.10.ebuild b/kde-apps/kpat/kpat-3.5.10.ebuild
index 03e22440..6e850600 100644
--- a/kde-base/kpat/kpat-3.5.10.ebuild
+++ b/kde-apps/kpat/kpat-3.5.10.ebuild
@@ -9,10 +9,10 @@ DESCRIPTION="KDE patience game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdebase-data-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
+	|| ( >=kde-apps/kdebase-data-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 KMEXTRACTONLY=libkdegames
 KMCOPYLIB="libkdegames libkdegames"
diff --git a/kde-base/kpat/metadata.xml b/kde-apps/kpat/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kpat/metadata.xml
+++ b/kde-apps/kpat/metadata.xml
diff --git a/kde-base/kppp/ChangeLog b/kde-apps/kppp/ChangeLog
index 77db2826..77db2826 100644
--- a/kde-base/kppp/ChangeLog
+++ b/kde-apps/kppp/ChangeLog
diff --git a/kde-base/kppp/Manifest b/kde-apps/kppp/Manifest
index fb925a5f..fb925a5f 100644
--- a/kde-base/kppp/Manifest
+++ b/kde-apps/kppp/Manifest
diff --git a/kde-base/kppp/kppp-3.5.10.ebuild b/kde-apps/kppp/kppp-3.5.10.ebuild
index caed882a..caed882a 100644
--- a/kde-base/kppp/kppp-3.5.10.ebuild
+++ b/kde-apps/kppp/kppp-3.5.10.ebuild
diff --git a/kde-base/kppp/metadata.xml b/kde-apps/kppp/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kppp/metadata.xml
+++ b/kde-apps/kppp/metadata.xml
diff --git a/kde-base/krdc/ChangeLog b/kde-apps/krdc/ChangeLog
index 6c50fba8..6c50fba8 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-apps/krdc/ChangeLog
diff --git a/kde-base/krdc/Manifest b/kde-apps/krdc/Manifest
index 44a3cc86..44a3cc86 100644
--- a/kde-base/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
diff --git a/kde-base/krdc/krdc-3.5.10.ebuild b/kde-apps/krdc/krdc-3.5.10.ebuild
index d6111fd8..d6111fd8 100644
--- a/kde-base/krdc/krdc-3.5.10.ebuild
+++ b/kde-apps/krdc/krdc-3.5.10.ebuild
diff --git a/kde-base/krdc/metadata.xml b/kde-apps/krdc/metadata.xml
index fc7a642c..fc7a642c 100644
--- a/kde-base/krdc/metadata.xml
+++ b/kde-apps/krdc/metadata.xml
diff --git a/kde-base/kreadconfig/ChangeLog b/kde-apps/kreadconfig/ChangeLog
index aa0aad2d..aa0aad2d 100644
--- a/kde-base/kreadconfig/ChangeLog
+++ b/kde-apps/kreadconfig/ChangeLog
diff --git a/kde-base/kreadconfig/Manifest b/kde-apps/kreadconfig/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/kreadconfig/Manifest
+++ b/kde-apps/kreadconfig/Manifest
diff --git a/kde-base/kreadconfig/kreadconfig-3.5.10.ebuild b/kde-apps/kreadconfig/kreadconfig-3.5.10.ebuild
index cdc4b0d9..cdc4b0d9 100644
--- a/kde-base/kreadconfig/kreadconfig-3.5.10.ebuild
+++ b/kde-apps/kreadconfig/kreadconfig-3.5.10.ebuild
diff --git a/kde-base/kreadconfig/metadata.xml b/kde-apps/kreadconfig/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kreadconfig/metadata.xml
+++ b/kde-apps/kreadconfig/metadata.xml
diff --git a/kde-base/kreversi/ChangeLog b/kde-apps/kreversi/ChangeLog
index ff7d6586..ff7d6586 100644
--- a/kde-base/kreversi/ChangeLog
+++ b/kde-apps/kreversi/ChangeLog
diff --git a/kde-base/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
diff --git a/kde-base/kreversi/kreversi-3.5.10.ebuild b/kde-apps/kreversi/kreversi-3.5.10.ebuild
index 20ec304e..20c56395 100644
--- a/kde-base/kreversi/kreversi-3.5.10.ebuild
+++ b/kde-apps/kreversi/kreversi-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Board Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kreversi/metadata.xml b/kde-apps/kreversi/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kreversi/metadata.xml
+++ b/kde-apps/kreversi/metadata.xml
diff --git a/kde-base/krfb/ChangeLog b/kde-apps/krfb/ChangeLog
index c780f34f..c780f34f 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-apps/krfb/ChangeLog
diff --git a/kde-base/krfb/Manifest b/kde-apps/krfb/Manifest
index 44a3cc86..44a3cc86 100644
--- a/kde-base/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
diff --git a/kde-base/krfb/krfb-3.5.10.ebuild b/kde-apps/krfb/krfb-3.5.10.ebuild
index 267e3d87..267e3d87 100644
--- a/kde-base/krfb/krfb-3.5.10.ebuild
+++ b/kde-apps/krfb/krfb-3.5.10.ebuild
diff --git a/kde-base/krfb/metadata.xml b/kde-apps/krfb/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/krfb/metadata.xml
+++ b/kde-apps/krfb/metadata.xml
diff --git a/kde-base/kruler/ChangeLog b/kde-apps/kruler/ChangeLog
index 0ed26e57..0ed26e57 100644
--- a/kde-base/kruler/ChangeLog
+++ b/kde-apps/kruler/ChangeLog
diff --git a/kde-base/kruler/Manifest b/kde-apps/kruler/Manifest
index cb266102..cb266102 100644
--- a/kde-base/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
diff --git a/kde-base/kruler/kruler-3.5.10.ebuild b/kde-apps/kruler/kruler-3.5.10.ebuild
index 7705a8a2..7705a8a2 100644
--- a/kde-base/kruler/kruler-3.5.10.ebuild
+++ b/kde-apps/kruler/kruler-3.5.10.ebuild
diff --git a/kde-base/kruler/metadata.xml b/kde-apps/kruler/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kruler/metadata.xml
+++ b/kde-apps/kruler/metadata.xml
diff --git a/kde-base/kscd/ChangeLog b/kde-apps/kscd/ChangeLog
index a7935b1a..a7935b1a 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-apps/kscd/ChangeLog
diff --git a/kde-base/kscd/Manifest b/kde-apps/kscd/Manifest
index c8231466..c8231466 100644
--- a/kde-base/kscd/Manifest
+++ b/kde-apps/kscd/Manifest
diff --git a/kde-base/kscd/files/kscd-3.5-strict-fix.diff b/kde-apps/kscd/files/kscd-3.5-strict-fix.diff
index 353d0a59..353d0a59 100644
--- a/kde-base/kscd/files/kscd-3.5-strict-fix.diff
+++ b/kde-apps/kscd/files/kscd-3.5-strict-fix.diff
diff --git a/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch b/kde-apps/kscd/files/kscd-3.5.6-alsa-tests.patch
index bec0893b..bec0893b 100644
--- a/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch
+++ b/kde-apps/kscd/files/kscd-3.5.6-alsa-tests.patch
diff --git a/kde-base/kscd/files/kscd-3.5.6-arts.patch b/kde-apps/kscd/files/kscd-3.5.6-arts.patch
index fd9c0a58..fd9c0a58 100644
--- a/kde-base/kscd/files/kscd-3.5.6-arts.patch
+++ b/kde-apps/kscd/files/kscd-3.5.6-arts.patch
diff --git a/kde-base/kscd/kscd-3.5.10.ebuild b/kde-apps/kscd/kscd-3.5.10.ebuild
index 26139d25..451a99a8 100644
--- a/kde-base/kscd/kscd-3.5.10.ebuild
+++ b/kde-apps/kscd/kscd-3.5.10.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="x11-libs/libXext
-	>=kde-base/libkcddb-${PV}:${SLOT}"
+	>=kde-apps/libkcddb-${PV}:${SLOT}"
 
 KMCOPYLIB="libkcddb libkcddb"
 KMCOMPILEONLY="libkcddb"
diff --git a/kde-base/kscd/metadata.xml b/kde-apps/kscd/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kscd/metadata.xml
+++ b/kde-apps/kscd/metadata.xml
diff --git a/kde-base/kshisen/ChangeLog b/kde-apps/kshisen/ChangeLog
index 3e70f13a..3e70f13a 100644
--- a/kde-base/kshisen/ChangeLog
+++ b/kde-apps/kshisen/ChangeLog
diff --git a/kde-base/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
diff --git a/kde-base/kshisen/kshisen-3.5.10.ebuild b/kde-apps/kshisen/kshisen-3.5.10.ebuild
index 558d9626..bb388b9f 100644
--- a/kde-base/kshisen/kshisen-3.5.10.ebuild
+++ b/kde-apps/kshisen/kshisen-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A KDE game similiar to Mahjongg"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kshisen/metadata.xml b/kde-apps/kshisen/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kshisen/metadata.xml
+++ b/kde-apps/kshisen/metadata.xml
diff --git a/kde-base/ksnapshot/ChangeLog b/kde-apps/ksnapshot/ChangeLog
index 1fd89013..1fd89013 100644
--- a/kde-base/ksnapshot/ChangeLog
+++ b/kde-apps/ksnapshot/ChangeLog
diff --git a/kde-base/ksnapshot/Manifest b/kde-apps/ksnapshot/Manifest
index cb266102..cb266102 100644
--- a/kde-base/ksnapshot/Manifest
+++ b/kde-apps/ksnapshot/Manifest
diff --git a/kde-base/ksnapshot/ksnapshot-3.5.10.ebuild b/kde-apps/ksnapshot/ksnapshot-3.5.10.ebuild
index 2e42f3ef..2e42f3ef 100644
--- a/kde-base/ksnapshot/ksnapshot-3.5.10.ebuild
+++ b/kde-apps/ksnapshot/ksnapshot-3.5.10.ebuild
diff --git a/kde-base/ksnapshot/metadata.xml b/kde-apps/ksnapshot/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ksnapshot/metadata.xml
+++ b/kde-apps/ksnapshot/metadata.xml
diff --git a/kde-base/kspaceduel/ChangeLog b/kde-apps/kspaceduel/ChangeLog
index 3eda92a1..3eda92a1 100644
--- a/kde-base/kspaceduel/ChangeLog
+++ b/kde-apps/kspaceduel/ChangeLog
diff --git a/kde-base/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
diff --git a/kde-base/kspaceduel/kspaceduel-3.5.10.ebuild b/kde-apps/kspaceduel/kspaceduel-3.5.10.ebuild
index 1eed754c..f3f0a04d 100644
--- a/kde-base/kspaceduel/kspaceduel-3.5.10.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Space Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kspaceduel/metadata.xml b/kde-apps/kspaceduel/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kspaceduel/metadata.xml
+++ b/kde-apps/kspaceduel/metadata.xml
diff --git a/kde-base/kstars/ChangeLog b/kde-apps/kstars/ChangeLog
index 8b980cc4..8b980cc4 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-apps/kstars/ChangeLog
diff --git a/kde-base/kstars/Manifest b/kde-apps/kstars/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-apps/kstars/Manifest
diff --git a/kde-base/kstars/kstars-3.5.10.ebuild b/kde-apps/kstars/kstars-3.5.10.ebuild
index aece3065..bd5c35f2 100644
--- a/kde-base/kstars/kstars-3.5.10.ebuild
+++ b/kde-apps/kstars/kstars-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Desktop Planetarium"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdeedu-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkdeedu/extdate
diff --git a/kde-base/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
diff --git a/kde-base/kstart/ChangeLog b/kde-apps/kstart/ChangeLog
index 635df797..635df797 100644
--- a/kde-base/kstart/ChangeLog
+++ b/kde-apps/kstart/ChangeLog
diff --git a/kde-base/kstart/Manifest b/kde-apps/kstart/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/kstart/Manifest
+++ b/kde-apps/kstart/Manifest
diff --git a/kde-base/kstart/kstart-3.5.10.ebuild b/kde-apps/kstart/kstart-3.5.10.ebuild
index 232a238c..232a238c 100644
--- a/kde-base/kstart/kstart-3.5.10.ebuild
+++ b/kde-apps/kstart/kstart-3.5.10.ebuild
diff --git a/kde-base/kstart/metadata.xml b/kde-apps/kstart/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kstart/metadata.xml
+++ b/kde-apps/kstart/metadata.xml
diff --git a/kde-base/kteatime/ChangeLog b/kde-apps/kteatime/ChangeLog
index 9c1b671e..9c1b671e 100644
--- a/kde-base/kteatime/ChangeLog
+++ b/kde-apps/kteatime/ChangeLog
diff --git a/kde-base/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 9313387a..9313387a 100644
--- a/kde-base/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
diff --git a/kde-base/kteatime/kteatime-3.5.10.ebuild b/kde-apps/kteatime/kteatime-3.5.10.ebuild
index 78b1abe2..78b1abe2 100644
--- a/kde-base/kteatime/kteatime-3.5.10.ebuild
+++ b/kde-apps/kteatime/kteatime-3.5.10.ebuild
diff --git a/kde-base/kteatime/metadata.xml b/kde-apps/kteatime/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kteatime/metadata.xml
+++ b/kde-apps/kteatime/metadata.xml
diff --git a/kde-base/ktimer/ChangeLog b/kde-apps/ktimer/ChangeLog
index c351bc58..c351bc58 100644
--- a/kde-base/ktimer/ChangeLog
+++ b/kde-apps/ktimer/ChangeLog
diff --git a/kde-base/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
diff --git a/kde-base/ktimer/ktimer-3.5.10.ebuild b/kde-apps/ktimer/ktimer-3.5.10.ebuild
index 1da8ffc4..1da8ffc4 100644
--- a/kde-base/ktimer/ktimer-3.5.10.ebuild
+++ b/kde-apps/ktimer/ktimer-3.5.10.ebuild
diff --git a/kde-base/ktimer/metadata.xml b/kde-apps/ktimer/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ktimer/metadata.xml
+++ b/kde-apps/ktimer/metadata.xml
diff --git a/kde-base/ktnef/ChangeLog b/kde-apps/ktnef/ChangeLog
index 0ce5f44b..0ce5f44b 100644
--- a/kde-base/ktnef/ChangeLog
+++ b/kde-apps/ktnef/ChangeLog
diff --git a/kde-base/ktnef/Manifest b/kde-apps/ktnef/Manifest
index c2c05337..c2c05337 100644
--- a/kde-base/ktnef/Manifest
+++ b/kde-apps/ktnef/Manifest
diff --git a/kde-base/ktnef/ktnef-3.5.10.ebuild b/kde-apps/ktnef/ktnef-3.5.10.ebuild
index 6c325bc8..6c325bc8 100644
--- a/kde-base/ktnef/ktnef-3.5.10.ebuild
+++ b/kde-apps/ktnef/ktnef-3.5.10.ebuild
diff --git a/kde-base/ktnef/metadata.xml b/kde-apps/ktnef/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ktnef/metadata.xml
+++ b/kde-apps/ktnef/metadata.xml
diff --git a/kde-base/ktouch/ChangeLog b/kde-apps/ktouch/ChangeLog
index 10b95910..10b95910 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-apps/ktouch/ChangeLog
diff --git a/kde-base/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
diff --git a/kde-base/ktouch/ktouch-3.5.10.ebuild b/kde-apps/ktouch/ktouch-3.5.10.ebuild
index 5230f39a..999a499f 100644
--- a/kde-base/ktouch/ktouch-3.5.10.ebuild
+++ b/kde-apps/ktouch/ktouch-3.5.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://ktouch.sourceforge.net/"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdeedu-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkdeedu/kdeeduplot"
diff --git a/kde-base/ktouch/metadata.xml b/kde-apps/ktouch/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ktouch/metadata.xml
+++ b/kde-apps/ktouch/metadata.xml
diff --git a/kde-base/ktuberling/ChangeLog b/kde-apps/ktuberling/ChangeLog
index 0a303c0d..0a303c0d 100644
--- a/kde-base/ktuberling/ChangeLog
+++ b/kde-apps/ktuberling/ChangeLog
diff --git a/kde-base/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
diff --git a/kde-base/ktuberling/ktuberling-3.5.10.ebuild b/kde-apps/ktuberling/ktuberling-3.5.10.ebuild
index aebf07ba..80387bb8 100644
--- a/kde-base/ktuberling/ktuberling-3.5.10.ebuild
+++ b/kde-apps/ktuberling/ktuberling-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: potato game for kids"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/ktuberling/metadata.xml b/kde-apps/ktuberling/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ktuberling/metadata.xml
+++ b/kde-apps/ktuberling/metadata.xml
diff --git a/kde-base/kturtle/ChangeLog b/kde-apps/kturtle/ChangeLog
index 41c69971..41c69971 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-apps/kturtle/ChangeLog
diff --git a/kde-base/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
diff --git a/kde-base/kturtle/kturtle-3.5.10.ebuild b/kde-apps/kturtle/kturtle-3.5.10.ebuild
index 3d66bf6b..3d66bf6b 100644
--- a/kde-base/kturtle/kturtle-3.5.10.ebuild
+++ b/kde-apps/kturtle/kturtle-3.5.10.ebuild
diff --git a/kde-base/kturtle/metadata.xml b/kde-apps/kturtle/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kturtle/metadata.xml
+++ b/kde-apps/kturtle/metadata.xml
diff --git a/kde-base/ktux/ChangeLog b/kde-apps/ktux/ChangeLog
index fa384c01..fa384c01 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-apps/ktux/ChangeLog
diff --git a/kde-base/ktux/Manifest b/kde-apps/ktux/Manifest
index 9313387a..9313387a 100644
--- a/kde-base/ktux/Manifest
+++ b/kde-apps/ktux/Manifest
diff --git a/kde-base/ktux/ktux-3.5.10.ebuild b/kde-apps/ktux/ktux-3.5.10.ebuild
index 71f2d379..71f2d379 100644
--- a/kde-base/ktux/ktux-3.5.10.ebuild
+++ b/kde-apps/ktux/ktux-3.5.10.ebuild
diff --git a/kde-base/ktux/metadata.xml b/kde-apps/ktux/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/ktux/metadata.xml
+++ b/kde-apps/ktux/metadata.xml
diff --git a/kde-base/kuser/ChangeLog b/kde-apps/kuser/ChangeLog
index 78d52634..78d52634 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-apps/kuser/ChangeLog
diff --git a/kde-base/kuser/Manifest b/kde-apps/kuser/Manifest
index 18207382..18207382 100644
--- a/kde-base/kuser/Manifest
+++ b/kde-apps/kuser/Manifest
diff --git a/kde-base/kuser/kuser-3.5.10.ebuild b/kde-apps/kuser/kuser-3.5.10.ebuild
index 38cf3b06..38cf3b06 100644
--- a/kde-base/kuser/kuser-3.5.10.ebuild
+++ b/kde-apps/kuser/kuser-3.5.10.ebuild
diff --git a/kde-base/kuser/metadata.xml b/kde-apps/kuser/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kuser/metadata.xml
+++ b/kde-apps/kuser/metadata.xml
diff --git a/kde-base/kwalletmanager/ChangeLog b/kde-apps/kwalletmanager/ChangeLog
index e8741eba..e8741eba 100644
--- a/kde-base/kwalletmanager/ChangeLog
+++ b/kde-apps/kwalletmanager/ChangeLog
diff --git a/kde-base/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 4b51353c..4b51353c 100644
--- a/kde-base/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.5.10.ebuild b/kde-apps/kwalletmanager/kwalletmanager-3.5.10.ebuild
index 7f882eee..7f882eee 100644
--- a/kde-base/kwalletmanager/kwalletmanager-3.5.10.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-3.5.10.ebuild
diff --git a/kde-base/kwalletmanager/metadata.xml b/kde-apps/kwalletmanager/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kwalletmanager/metadata.xml
+++ b/kde-apps/kwalletmanager/metadata.xml
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-apps/kwordquiz/ChangeLog
index 2d6150e6..2d6150e6 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-apps/kwordquiz/ChangeLog
diff --git a/kde-base/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
diff --git a/kde-base/kwordquiz/kwordquiz-3.5.10.ebuild b/kde-apps/kwordquiz/kwordquiz-3.5.10.ebuild
index 66f3e6a8..66f3e6a8 100644
--- a/kde-base/kwordquiz/kwordquiz-3.5.10.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-3.5.10.ebuild
diff --git a/kde-base/kwordquiz/metadata.xml b/kde-apps/kwordquiz/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/kwordquiz/metadata.xml
+++ b/kde-apps/kwordquiz/metadata.xml
diff --git a/kde-base/libkcddb/ChangeLog b/kde-apps/libkcddb/ChangeLog
index ae05fdb6..ae05fdb6 100644
--- a/kde-base/libkcddb/ChangeLog
+++ b/kde-apps/libkcddb/ChangeLog
diff --git a/kde-base/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index c8231466..c8231466 100644
--- a/kde-base/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
diff --git a/kde-base/libkcddb/libkcddb-3.5.10.ebuild b/kde-apps/libkcddb/libkcddb-3.5.10.ebuild
index ab06bd77..ab06bd77 100644
--- a/kde-base/libkcddb/libkcddb-3.5.10.ebuild
+++ b/kde-apps/libkcddb/libkcddb-3.5.10.ebuild
diff --git a/kde-base/libkcddb/metadata.xml b/kde-apps/libkcddb/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
diff --git a/kde-base/libkdeedu/ChangeLog b/kde-apps/libkdeedu/ChangeLog
index 3a56a970..3a56a970 100644
--- a/kde-base/libkdeedu/ChangeLog
+++ b/kde-apps/libkdeedu/ChangeLog
diff --git a/kde-base/libkdeedu/Manifest b/kde-apps/libkdeedu/Manifest
index 28c94bf9..28c94bf9 100644
--- a/kde-base/libkdeedu/Manifest
+++ b/kde-apps/libkdeedu/Manifest
diff --git a/kde-base/libkdeedu/libkdeedu-3.5.10.ebuild b/kde-apps/libkdeedu/libkdeedu-3.5.10.ebuild
index 959c63de..959c63de 100644
--- a/kde-base/libkdeedu/libkdeedu-3.5.10.ebuild
+++ b/kde-apps/libkdeedu/libkdeedu-3.5.10.ebuild
diff --git a/kde-base/libkdeedu/metadata.xml b/kde-apps/libkdeedu/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/libkdeedu/metadata.xml
+++ b/kde-apps/libkdeedu/metadata.xml
diff --git a/kde-base/libkdegames/ChangeLog b/kde-apps/libkdegames/ChangeLog
index 152896ad..152896ad 100644
--- a/kde-base/libkdegames/ChangeLog
+++ b/kde-apps/libkdegames/ChangeLog
diff --git a/kde-base/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
diff --git a/kde-base/libkdegames/libkdegames-3.5.10.ebuild b/kde-apps/libkdegames/libkdegames-3.5.10.ebuild
index 6994aeed..6994aeed 100644
--- a/kde-base/libkdegames/libkdegames-3.5.10.ebuild
+++ b/kde-apps/libkdegames/libkdegames-3.5.10.ebuild
diff --git a/kde-base/libkdegames/metadata.xml b/kde-apps/libkdegames/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/libkdegames/metadata.xml
+++ b/kde-apps/libkdegames/metadata.xml
diff --git a/kde-base/libkonq/ChangeLog b/kde-apps/libkonq/ChangeLog
index 0af6b6bf..0af6b6bf 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-apps/libkonq/ChangeLog
diff --git a/kde-base/libkonq/Manifest b/kde-apps/libkonq/Manifest
index c092bb21..c092bb21 100644
--- a/kde-base/libkonq/Manifest
+++ b/kde-apps/libkonq/Manifest
diff --git a/kde-base/libkonq/libkonq-3.5.10.ebuild b/kde-apps/libkonq/libkonq-3.5.10.ebuild
index 11fa9a95..11fa9a95 100644
--- a/kde-base/libkonq/libkonq-3.5.10.ebuild
+++ b/kde-apps/libkonq/libkonq-3.5.10.ebuild
diff --git a/kde-base/libkonq/metadata.xml b/kde-apps/libkonq/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/libkonq/metadata.xml
+++ b/kde-apps/libkonq/metadata.xml
diff --git a/kde-base/lskat/ChangeLog b/kde-apps/lskat/ChangeLog
index 5d175681..5d175681 100644
--- a/kde-base/lskat/ChangeLog
+++ b/kde-apps/lskat/ChangeLog
diff --git a/kde-base/lskat/Manifest b/kde-apps/lskat/Manifest
index 52d5361b..52d5361b 100644
--- a/kde-base/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
diff --git a/kde-base/lskat/lskat-3.5.10.ebuild b/kde-apps/lskat/lskat-3.5.10.ebuild
index 4601554b..52b2bfe8 100644
--- a/kde-base/lskat/lskat-3.5.10.ebuild
+++ b/kde-apps/lskat/lskat-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE card game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/lskat/metadata.xml b/kde-apps/lskat/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/lskat/metadata.xml
+++ b/kde-apps/lskat/metadata.xml
diff --git a/kde-base/nsplugins/ChangeLog b/kde-apps/nsplugins/ChangeLog
index 3e900def..3e900def 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-apps/nsplugins/ChangeLog
diff --git a/kde-base/nsplugins/Manifest b/kde-apps/nsplugins/Manifest
index 6f890e81..6f890e81 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-apps/nsplugins/Manifest
diff --git a/kde-base/nsplugins/files/kdebase_nsplugins-r892605.patch b/kde-apps/nsplugins/files/kdebase_nsplugins-r892605.patch
index 2c6490a8..2c6490a8 100644
--- a/kde-base/nsplugins/files/kdebase_nsplugins-r892605.patch
+++ b/kde-apps/nsplugins/files/kdebase_nsplugins-r892605.patch
diff --git a/kde-base/nsplugins/metadata.xml b/kde-apps/nsplugins/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/nsplugins/metadata.xml
+++ b/kde-apps/nsplugins/metadata.xml
diff --git a/kde-base/nsplugins/nsplugins-3.5.10-r1.ebuild b/kde-apps/nsplugins/nsplugins-3.5.10-r1.ebuild
index 68460540..68460540 100644
--- a/kde-base/nsplugins/nsplugins-3.5.10-r1.ebuild
+++ b/kde-apps/nsplugins/nsplugins-3.5.10-r1.ebuild
diff --git a/kde-base/nsplugins/nsplugins-3.5.10.ebuild b/kde-apps/nsplugins/nsplugins-3.5.10.ebuild
index e1b2d254..e1b2d254 100644
--- a/kde-base/nsplugins/nsplugins-3.5.10.ebuild
+++ b/kde-apps/nsplugins/nsplugins-3.5.10.ebuild
diff --git a/kde-base/umbrello/ChangeLog b/kde-apps/umbrello/ChangeLog
index 432a0ba8..432a0ba8 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-apps/umbrello/ChangeLog
diff --git a/kde-base/umbrello/Manifest b/kde-apps/umbrello/Manifest
index b752e618..b752e618 100644
--- a/kde-base/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
diff --git a/kde-base/umbrello/metadata.xml b/kde-apps/umbrello/metadata.xml
index 8d1e86a9..8d1e86a9 100644
--- a/kde-base/umbrello/metadata.xml
+++ b/kde-apps/umbrello/metadata.xml
diff --git a/kde-base/umbrello/umbrello-3.5.10.ebuild b/kde-apps/umbrello/umbrello-3.5.10.ebuild
index 0519e4aa..0519e4aa 100644
--- a/kde-base/umbrello/umbrello-3.5.10.ebuild
+++ b/kde-apps/umbrello/umbrello-3.5.10.ebuild
diff --git a/kde-base/atlantik/atlantik-3.5.10.ebuild b/kde-base/atlantik/atlantik-3.5.10.ebuild
index f2c1a848..e064527f 100644
--- a/kde-base/atlantik/atlantik-3.5.10.ebuild
+++ b/kde-base/atlantik/atlantik-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The Atlantic board game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.10.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.10.ebuild
index a870f81c..292bc2d4 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.10.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.10.ebuild
@@ -10,6 +10,6 @@ inherit kde-meta
 DESCRIPTION="Plugins for KAB"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
-DEPEND="|| ( >=kde-base/kaddressbook-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/kaddressbook-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"
diff --git a/kde-base/karm/karm-3.5.10.ebuild b/kde-base/karm/karm-3.5.10.ebuild
index a796b83b..fc830846 100644
--- a/kde-base/karm/karm-3.5.10.ebuild
+++ b/kde-base/karm/karm-3.5.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Time tracker tool"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 RDEPEND=">=kde-base/libkcal-${PV}:${SLOT}
-	>=kde-base/kdepim-kresources-${PV}:${SLOT}
+	>=kde-apps/kdepim-kresources-${PV}:${SLOT}
 	>=kde-base/libkdepim-${PV}:${SLOT}
 	x11-libs/libXScrnSaver"
 
diff --git a/kde-base/kasteroids/kasteroids-3.5.10.ebuild b/kde-base/kasteroids/kasteroids-3.5.10.ebuild
index 873b4cbc..2e7233af 100644
--- a/kde-base/kasteroids/kasteroids-3.5.10.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.5.10.ebuild
@@ -9,7 +9,7 @@ inherit kde-meta
 DESCRIPTION="KDE Space Game"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild b/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild
index f7ebeb08..5af75239 100644
--- a/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5.10.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="kate plugins and docs"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( >=kde-base/kate-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/kate-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.5.10.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.5.10.ebuild
index 09084628..2770b85d 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.5.10.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.5.10.ebuild
@@ -9,7 +9,7 @@ inherit kde-meta eutils
 DESCRIPTION="KDE CD ripper and audio encoder frontend"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="encode flac mp3 vorbis"
-DEPEND=">=kde-base/libkcddb-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkcddb-${PV}:${SLOT}
 	media-sound/cdparanoia"
 
 # External encoders used - no optional compile-time support
diff --git a/kde-base/kbackgammon/kbackgammon-3.5.10.ebuild b/kde-base/kbackgammon/kbackgammon-3.5.10.ebuild
index 21058d43..b60eb2f8 100644
--- a/kde-base/kbackgammon/kbackgammon-3.5.10.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.5.10.ebuild
@@ -8,7 +8,7 @@ inherit kde-meta
 DESCRIPTION="A Backgammon program for KDE"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kbattleship/kbattleship-3.5.10.ebuild b/kde-base/kbattleship/kbattleship-3.5.10.ebuild
index 3654f9f0..9a13d476 100644
--- a/kde-base/kbattleship/kbattleship-3.5.10.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.5.10.ebuild
@@ -8,7 +8,7 @@ inherit kde-meta
 DESCRIPTION="The KDE Battleship clone"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild
index d3526f37..3f2eb9e3 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5.10.ebuild
@@ -8,6 +8,6 @@ inherit kde-meta
 DESCRIPTION="KDE panel applet that displays the keyboard status"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="|| ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kde-meta/kde-meta-3.5.10.ebuild b/kde-base/kde-meta/kde-meta-3.5.10.ebuild
index afa85e60..748eeac3 100644
--- a/kde-base/kde-meta/kde-meta-3.5.10.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.5.10.ebuild
@@ -14,18 +14,18 @@ IUSE="accessibility nls"
 
 RDEPEND="~kde-base/kdelibs-${PV}
 >=kde-base/kdeaddons-meta-${PV}:${SLOT}
->=kde-base/kdeadmin-meta-${PV}:${SLOT}
+>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
 >=kde-base/kdebase-meta-${PV}:${SLOT}
 >=kde-base/kdeedu-meta-${PV}:${SLOT}
 >=kde-base/kdegames-meta-${PV}:${SLOT}
 >=kde-base/kdegraphics-meta-${PV}:${SLOT}
->=kde-base/kdemultimedia-meta-${PV}:${SLOT}
->=kde-base/kdenetwork-meta-${PV}:${SLOT}
->=kde-base/kdepim-meta-${PV}:${SLOT}
->=kde-base/kdetoys-meta-${PV}:${SLOT}
->=kde-base/kdeutils-meta-${PV}:${SLOT}
->=kde-base/kdeartwork-meta-${PV}:${SLOT}
->=kde-base/kdewebdev-meta-${PV}:${SLOT}
-accessibility? ( >=kde-base/kdeaccessibility-meta-${PV}:${SLOT} )
+>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
+>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
+>=kde-apps/kdepim-meta-${PV}:${SLOT}
+>=kde-apps/kdetoys-meta-${PV}:${SLOT}
+>=kde-apps/kdeutils-meta-${PV}:${SLOT}
+>=kde-apps/kdeartwork-meta-${PV}:${SLOT}
+>=kde-apps/kdewebdev-meta-${PV}:${SLOT}
+accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
 nls? ( >=kde-base/kde-i18n-${PV}:${SLOT} )
 !kde-base/kde:3.5"
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.10.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.10.ebuild
index c92c0660..c59e5d38 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.10.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.10.ebuild
@@ -16,11 +16,11 @@ RDEPEND="
 >=kde-base/atlantikdesigner-${PV}:${SLOT}
 >=kde-base/knewsticker-scripts-${PV}:${SLOT}
 >=kde-base/ksig-${PV}:${SLOT}
->=kde-base/kaddressbook-plugins-${PV}:${SLOT}
+>=kde-apps/kaddressbook-plugins-${PV}:${SLOT}
 >=kde-base/kate-plugins-${PV}:${SLOT}
 >=kde-base/kicker-applets-${PV}:${SLOT}
 >=kde-base/kdeaddons-kfile-plugins-${PV}:${SLOT}
->=kde-base/konq-plugins-${PV}:${SLOT}
+>=kde-apps/konq-plugins-${PV}:${SLOT}
 >=kde-base/konqueror-akregator-${PV}:${SLOT}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}
 >=kde-base/renamedlg-audio-${PV}:${SLOT}
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
index 731ac174..6d3f71d4 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
@@ -13,42 +13,42 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=kde-base/kdebase-startkde-${PV}:${SLOT}
->=kde-base/drkonqi-${PV}:${SLOT}
+>=kde-apps/drkonqi-${PV}:${SLOT}
 >=kde-base/kappfinder-${PV}:${SLOT}
->=kde-base/kate-${PV}:${SLOT}
+>=kde-apps/kate-${PV}:${SLOT}
 >=kde-base/kcheckpass-${PV}:${SLOT}
 >=kde-base/kcminit-${PV}:${SLOT}
->=kde-base/kcontrol-${PV}:${SLOT}
+>=kde-apps/kcontrol-${PV}:${SLOT}
 >=kde-base/kdcop-${PV}:${SLOT}
 >=kde-base/kdebugdialog-${PV}:${SLOT}
->=kde-base/kdepasswd-${PV}:${SLOT}
+>=kde-apps/kdepasswd-${PV}:${SLOT}
 >=kde-base/kdeprint-${PV}:${SLOT}
 >=kde-base/kdesktop-${PV}:${SLOT}
->=kde-base/kdesu-${PV}:${SLOT}
->=kde-base/kdialog-${PV}:${SLOT}
+>=kde-apps/kdesu-${PV}:${SLOT}
+>=kde-apps/kdialog-${PV}:${SLOT}
 >=kde-base/kdm-${PV}:${SLOT}
->=kde-base/kfind-${PV}:${SLOT}
+>=kde-apps/kfind-${PV}:${SLOT}
 >=kde-base/khelpcenter-${PV}:${SLOT}
 >=kde-base/khotkeys-${PV}:${SLOT}
 >=kde-base/kicker-${PV}:${SLOT}
->=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+>=kde-apps/kdebase-kioslaves-${PV}:${SLOT}
 >=kde-base/klipper-${PV}:${SLOT}
 >=kde-base/kmenuedit-${PV}:${SLOT}
->=kde-base/konqueror-${PV}:${SLOT}
->=kde-base/konsole-${PV}:${SLOT}
+>=kde-apps/konqueror-${PV}:${SLOT}
+>=kde-apps/konsole-${PV}:${SLOT}
 >=kde-base/kpager-${PV}:${SLOT}
 >=kde-base/kpersonalizer-${PV}:${SLOT}
->=kde-base/kreadconfig-${PV}:${SLOT}
+>=kde-apps/kreadconfig-${PV}:${SLOT}
 >=kde-base/kscreensaver-${PV}:${SLOT}
 >=kde-base/ksmserver-${PV}:${SLOT}
 >=kde-base/ksplashml-${PV}:${SLOT}
->=kde-base/kstart-${PV}:${SLOT}
+>=kde-apps/kstart-${PV}:${SLOT}
 >=kde-base/ksysguard-${PV}:${SLOT}
 >=kde-base/ksystraycmd-${PV}:${SLOT}
 >=kde-base/ktip-${PV}:${SLOT}
 >=kde-base/kwin-${PV}:${SLOT}
 >=kde-base/kxkb-${PV}:${SLOT}
->=kde-base/libkonq-${PV}:${SLOT}
->=kde-base/nsplugins-${PV}:${SLOT}
->=kde-base/knetattach-${PV}:${SLOT}
->=kde-base/kdebase-data-${PV}:${SLOT}"
+>=kde-apps/libkonq-${PV}:${SLOT}
+>=kde-apps/nsplugins-${PV}:${SLOT}
+>=kde-apps/knetattach-${PV}:${SLOT}
+>=kde-apps/kdebase-data-${PV}:${SLOT}"
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
index 358bf3ec..49008280 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r5.ebuild
@@ -26,7 +26,7 @@ RDEPEND="x11-apps/xmessage
 	>=kde-base/ksmserver-${PV}:${SLOT}
 	>=kde-base/kwin-${PV}:${SLOT}
 	>=kde-base/kpersonalizer-${PV}:${SLOT}
-	>=kde-base/kreadconfig-${PV}:${SLOT}
+	>=kde-apps/kreadconfig-${PV}:${SLOT}
 	>=kde-base/ksplashml-${PV}:${SLOT}"
 
 PATCHES=( "${FILESDIR}/${PN}-3.5-gentoo.patch" )
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.5.10.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.5.10.ebuild
index 757a521e..a25d3dfa 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.5.10.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.5.10.ebuild
@@ -13,24 +13,24 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
->=kde-base/blinken-${PV}:${SLOT}
->=kde-base/kanagram-${PV}:${SLOT}
->=kde-base/kalzium-${PV}:${SLOT}
->=kde-base/kgeography-${PV}:${SLOT}
->=kde-base/khangman-${PV}:${SLOT}
->=kde-base/kig-${PV}:${SLOT}
+>=kde-apps/blinken-${PV}:${SLOT}
+>=kde-apps/kanagram-${PV}:${SLOT}
+>=kde-apps/kalzium-${PV}:${SLOT}
+>=kde-apps/kgeography-${PV}:${SLOT}
+>=kde-apps/khangman-${PV}:${SLOT}
+>=kde-apps/kig-${PV}:${SLOT}
 >=kde-base/kpercentage-${PV}:${SLOT}
->=kde-base/kiten-${PV}:${SLOT}
+>=kde-apps/kiten-${PV}:${SLOT}
 >=kde-base/kvoctrain-${PV}:${SLOT}
->=kde-base/kturtle-${PV}:${SLOT}
+>=kde-apps/kturtle-${PV}:${SLOT}
 >=kde-base/kverbos-${PV}:${SLOT}
 >=kde-base/kdeedu-applnk-${PV}:${SLOT}
 >=kde-base/kbruch-${PV}:${SLOT}
 >=kde-base/keduca-${PV}:${SLOT}
 >=kde-base/klatin-${PV}:${SLOT}
->=kde-base/kmplot-${PV}:${SLOT}
->=kde-base/kstars-${PV}:${SLOT}
->=kde-base/ktouch-${PV}:${SLOT}
->=kde-base/klettres-${PV}:${SLOT}
->=kde-base/kwordquiz-${PV}:${SLOT}
+>=kde-apps/kmplot-${PV}:${SLOT}
+>=kde-apps/kstars-${PV}:${SLOT}
+>=kde-apps/ktouch-${PV}:${SLOT}
+>=kde-apps/klettres-${PV}:${SLOT}
+>=kde-apps/kwordquiz-${PV}:${SLOT}
 "
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.5.10.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.5.10.ebuild
index e8d113e1..778c5036 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.5.10.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.5.10.ebuild
@@ -16,33 +16,33 @@ RDEPEND="
 arts? ( >=kde-base/kasteroids-${PV}:${SLOT}
 	>=kde-base/kolf-${PV}:${SLOT} )
 >=kde-base/atlantik-${PV}:${SLOT}
->=kde-base/katomic-${PV}:${SLOT}
+>=kde-apps/katomic-${PV}:${SLOT}
 >=kde-base/kbackgammon-${PV}:${SLOT}
 >=kde-base/kbattleship-${PV}:${SLOT}
->=kde-base/kblackbox-${PV}:${SLOT}
->=kde-base/kbounce-${PV}:${SLOT}
+>=kde-apps/kblackbox-${PV}:${SLOT}
+>=kde-apps/kbounce-${PV}:${SLOT}
 >=kde-base/kenolaba-${PV}:${SLOT}
 >=kde-base/kfouleggs-${PV}:${SLOT}
->=kde-base/kgoldrunner-${PV}:${SLOT}
->=kde-base/kjumpingcube-${PV}:${SLOT}
->=kde-base/klickety-${PV}:${SLOT}
->=kde-base/klines-${PV}:${SLOT}
->=kde-base/kmahjongg-${PV}:${SLOT}
->=kde-base/kmines-${PV}:${SLOT}
->=kde-base/knetwalk-${PV}:${SLOT}
->=kde-base/konquest-${PV}:${SLOT}
->=kde-base/kpat-${PV}:${SLOT}
+>=kde-apps/kgoldrunner-${PV}:${SLOT}
+>=kde-apps/kjumpingcube-${PV}:${SLOT}
+>=kde-apps/klickety-${PV}:${SLOT}
+>=kde-apps/klines-${PV}:${SLOT}
+>=kde-apps/kmahjongg-${PV}:${SLOT}
+>=kde-apps/kmines-${PV}:${SLOT}
+>=kde-apps/knetwalk-${PV}:${SLOT}
+>=kde-apps/konquest-${PV}:${SLOT}
+>=kde-apps/kpat-${PV}:${SLOT}
 >=kde-base/kpoker-${PV}:${SLOT}
 >=kde-base/ktron-${PV}:${SLOT}
->=kde-base/ktuberling-${PV}:${SLOT}
+>=kde-apps/ktuberling-${PV}:${SLOT}
 >=kde-base/ksame-${PV}:${SLOT}
->=kde-base/kshisen-${PV}:${SLOT}
+>=kde-apps/kshisen-${PV}:${SLOT}
 >=kde-base/ksirtet-${PV}:${SLOT}
 >=kde-base/ksmiletris-${PV}:${SLOT}
 >=kde-base/ksnake-${PV}:${SLOT}
 >=kde-base/ksokoban-${PV}:${SLOT}
->=kde-base/kspaceduel-${PV}:${SLOT}
->=kde-base/kreversi-${PV}:${SLOT}
+>=kde-apps/kspaceduel-${PV}:${SLOT}
+>=kde-apps/kreversi-${PV}:${SLOT}
 >=kde-base/kwin4-${PV}:${SLOT}
->=kde-base/lskat-${PV}:${SLOT}
+>=kde-apps/lskat-${PV}:${SLOT}
 "
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.10.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.10.ebuild
index 34df0418..d35e0fcf 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.10.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.10.ebuild
@@ -12,20 +12,20 @@ SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="gphoto2 scanner povray imlib"
 
-RDEPEND="gphoto2? ( >=kde-base/kamera-${PV}:${SLOT} )
+RDEPEND="gphoto2? ( >=kde-apps/kamera-${PV}:${SLOT} )
 	>=kde-base/kcoloredit-${PV}:${SLOT}
 	>=kde-base/kdegraphics-kfile-plugins-${PV}:${SLOT}
 	>=kde-base/kdvi-${PV}:${SLOT}
 	>=kde-base/kfax-${PV}:${SLOT}
-	>=kde-base/kgamma-${PV}:${SLOT}
+	>=kde-apps/kgamma-${PV}:${SLOT}
 	>=kde-base/kghostview-${PV}:${SLOT}
 	>=kde-base/kiconedit-${PV}:${SLOT}
-	>=kde-base/kolourpaint-${PV}:${SLOT}
+	>=kde-apps/kolourpaint-${PV}:${SLOT}
 	scanner? ( >=kde-base/kooka-${PV}:${SLOT}
 			>=kde-base/libkscan-${PV}:${SLOT} )
 	povray? ( >=kde-base/kpovmodeler-${PV}:${SLOT} )
-	>=kde-base/kruler-${PV}:${SLOT}
-	>=kde-base/ksnapshot-${PV}:${SLOT}
+	>=kde-apps/kruler-${PV}:${SLOT}
+	>=kde-apps/ksnapshot-${PV}:${SLOT}
 	>=kde-base/ksvg-${PV}:${SLOT}
 	imlib? ( >=kde-base/kuickshow-${PV}:${SLOT} )
 	>=kde-base/kview-${PV}:${SLOT}
diff --git a/kde-base/kdejava/kdejava-3.5.10.ebuild b/kde-base/kdejava/kdejava-3.5.10.ebuild
index c293919e..a4675b78 100644
--- a/kde-base/kdejava/kdejava-3.5.10.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.10.ebuild
@@ -12,11 +12,11 @@ inherit java-pkg-2 kde-meta
 DESCRIPTION="KDE java bindings"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
-COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kcontrol-${PV}:${SLOT} ) >=kde-base/kdebase-${PV}:${SLOT} )
+COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-apps/kcontrol-${PV}:${SLOT} ) >=kde-base/kdebase-${PV}:${SLOT} )
 	>=kde-base/qtjava-${PV}:${SLOT}"
 DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
 RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
-OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
+OLDDEPEND="~kde-base/kwin-$PV ~kde-apps/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
 
 # libhpi for bug #209631
 PATCHES=( "${FILESDIR}/no-gtk-glib-check.diff"
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild
index 0cdc7c21..f41b05e3 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild
@@ -10,7 +10,7 @@ inherit kde-meta eutils
 DESCRIPTION="kioslaves from kdemultimedia package"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="encode flac mp3 vorbis"
-DEPEND=">=kde-base/libkcddb-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkcddb-${PV}:${SLOT}
 	media-sound/cdparanoia
 	media-libs/taglib
 	encode? ( vorbis? ( media-libs/libvorbis )
diff --git a/kde-base/kdesktop/kdesktop-3.5.10.ebuild b/kde-base/kdesktop/kdesktop-3.5.10.ebuild
index 1f1ba9af..1f62f7fc 100644
--- a/kde-base/kdesktop/kdesktop-3.5.10.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.10.ebuild
@@ -15,16 +15,16 @@ IUSE="kdehiddenvisibility xscreensaver"
 
 DEPEND="x11-libs/libXext
 	x11-libs/libXcursor
-	>=kde-base/libkonq-${PV}:${SLOT}
-	>=kde-base/kcontrol-${PV}:${SLOT}
+	>=kde-apps/libkonq-${PV}:${SLOT}
+	>=kde-apps/kcontrol-${PV}:${SLOT}
 	xscreensaver? ( x11-proto/scrnsaverproto )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
 RDEPEND="${DEPEND}
 	>=kde-base/kcheckpass-${PV}:${SLOT}
-	>=kde-base/kdialog-${PV}:${SLOT}
-	>=kde-base/konqueror-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/konqueror-${PV}:${SLOT}
 	xscreensaver? ( x11-libs/libXScrnSaver )"
 
 KMCOPYLIB="libkonq libkonq/"
diff --git a/kde-base/kdm/kdm-3.5.10.ebuild b/kde-base/kdm/kdm-3.5.10.ebuild
index 4dd1faa4..ec229d72 100644
--- a/kde-base/kdm/kdm-3.5.10.ebuild
+++ b/kde-base/kdm/kdm-3.5.10.ebuild
@@ -20,10 +20,10 @@ KMCOMPILEONLY="kcontrol/background"
 DEPEND="pam? ( kde-base/kdebase-pam )
 	x11-libs/libXau
 	x11-libs/libXtst
-	>=kde-base/kcontrol-${PV}:${SLOT}"
+	>=kde-apps/kcontrol-${PV}:${SLOT}"
 	# Requires the desktop background settings and kdm kcontrol modules
 RDEPEND="${DEPEND}
-	>=kde-base/kdepasswd-${PV}:${SLOT}
+	>=kde-apps/kdepasswd-${PV}:${SLOT}
 	x11-apps/xinit
 	x11-apps/xmessage"
 PDEPEND=">=kde-base/kdesktop-${PV}:${SLOT}"
diff --git a/kde-base/kenolaba/kenolaba-3.5.10.ebuild b/kde-base/kenolaba/kenolaba-3.5.10.ebuild
index 90bd107d..28457d70 100644
--- a/kde-base/kenolaba/kenolaba-3.5.10.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: Board game inspired by Abalone"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kfouleggs/kfouleggs-3.5.10.ebuild b/kde-base/kfouleggs/kfouleggs-3.5.10.ebuild
index 9d518028..645d1e0b 100644
--- a/kde-base/kfouleggs/kfouleggs-3.5.10.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE games: KFoulEggs is an adaptation of the well-known (at least i
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/khelpcenter/khelpcenter-3.5.10.ebuild b/kde-base/khelpcenter/khelpcenter-3.5.10.ebuild
index 6bde6070..fa2644df 100644
--- a/kde-base/khelpcenter/khelpcenter-3.5.10.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.5.10.ebuild
@@ -19,5 +19,5 @@ KMEXTRA="doc/faq
 	doc/userguide
 	doc/visualdict"
 
-RDEPEND=">=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+RDEPEND=">=kde-apps/kdebase-kioslaves-${PV}:${SLOT}
 		>=www-misc/htdig-3.2.0_beta6-r1"
diff --git a/kde-base/kicker/kicker-3.5.10-r1.ebuild b/kde-base/kicker/kicker-3.5.10-r1.ebuild
index c65ef7c2..53b6eb74 100644
--- a/kde-base/kicker/kicker-3.5.10-r1.ebuild
+++ b/kde-base/kicker/kicker-3.5.10-r1.ebuild
@@ -13,8 +13,8 @@ DESCRIPTION="Kicker is the KDE application starter panel, also capable of some u
 KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}
-	>=kde-base/kdebase-data-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}
+	>=kde-apps/kdebase-data-${PV}:${SLOT}
 	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXtst
diff --git a/kde-base/kicker/kicker-3.5.10-r2.ebuild b/kde-base/kicker/kicker-3.5.10-r2.ebuild
index 91e7e669..6ff58361 100644
--- a/kde-base/kicker/kicker-3.5.10-r2.ebuild
+++ b/kde-base/kicker/kicker-3.5.10-r2.ebuild
@@ -13,8 +13,8 @@ DESCRIPTION="Kicker is the KDE application starter panel, also capable of some u
 KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}
-	>=kde-base/kdebase-data-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}
+	>=kde-apps/kdebase-data-${PV}:${SLOT}
 	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXtst
diff --git a/kde-base/kicker/kicker-3.5.10-r3.ebuild b/kde-base/kicker/kicker-3.5.10-r3.ebuild
index 648c917d..7563f57e 100644
--- a/kde-base/kicker/kicker-3.5.10-r3.ebuild
+++ b/kde-base/kicker/kicker-3.5.10-r3.ebuild
@@ -13,8 +13,8 @@ DESCRIPTION="Kicker is the KDE application starter panel, also capable of some u
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}
-	>=kde-base/kdebase-data-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}
+	>=kde-apps/kdebase-data-${PV}:${SLOT}
 	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXtst
diff --git a/kde-base/kicker/kicker-3.5.10.ebuild b/kde-base/kicker/kicker-3.5.10.ebuild
index ec3c4c81..7e51eb5a 100644
--- a/kde-base/kicker/kicker-3.5.10.ebuild
+++ b/kde-base/kicker/kicker-3.5.10.ebuild
@@ -13,8 +13,8 @@ DESCRIPTION="Kicker is the KDE application starter panel, also capable of some u
 KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility xcomposite"
 
-DEPEND=">=kde-base/libkonq-${PV}:${SLOT}
-	>=kde-base/kdebase-data-${PV}:${SLOT}
+DEPEND=">=kde-apps/libkonq-${PV}:${SLOT}
+	>=kde-apps/kdebase-data-${PV}:${SLOT}
 	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXtst
diff --git a/kde-base/kitchensync/kitchensync-3.5.10-r1.ebuild b/kde-base/kitchensync/kitchensync-3.5.10-r1.ebuild
index a52cd0e2..e03727ec 100644
--- a/kde-base/kitchensync/kitchensync-3.5.10-r1.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.5.10-r1.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 # See #262397 about libopensync dependency -- MvG
 DEPEND="=app-pda/libopensync-0.36*
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kitchensync/kitchensync-3.5.10.ebuild b/kde-base/kitchensync/kitchensync-3.5.10.ebuild
index ebe9ce4a..8b7fa7d9 100644
--- a/kde-base/kitchensync/kitchensync-3.5.10.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.5.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Synchronize Data with KDE"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="<=app-pda/libopensync-0.30
-	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
 	>=kde-base/libkcal-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
diff --git a/kde-base/klatin/klatin-3.5.10.ebuild b/kde-base/klatin/klatin-3.5.10.ebuild
index 5d0c7508..1d023db8 100644
--- a/kde-base/klatin/klatin-3.5.10.ebuild
+++ b/kde-base/klatin/klatin-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: KLatin - a program to help revise Latin"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/libkdeedu-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdeedu-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libkdeedu/kdeeducore"
diff --git a/kde-base/kolf/kolf-3.5.10.ebuild b/kde-base/kolf/kolf-3.5.10.ebuild
index e97a951e..6d500ee5 100644
--- a/kde-base/kolf/kolf-3.5.10.ebuild
+++ b/kde-base/kolf/kolf-3.5.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Minigolf Game"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild
index 0cd49da4..62c3fb30 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="konqueror's akregator plugin"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="|| ( >=kde-base/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
+DEPEND="|| ( >=kde-apps/konqueror-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
 RDEPEND="${DEPEND}
 >=kde-base/kdeaddons-docs-konq-plugins-${PV}:${SLOT}
 || ( >=kde-base/akregator-${PV}:${SLOT} >=kde-base/kdepim-${PV}:${SLOT} )"
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.5.10.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.5.10.ebuild
index ef36fa25..4a33eb38 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.5.10.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.5.10.ebuild
@@ -12,9 +12,9 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=kde-base/libkdepim-${PV}:${SLOT}
-	>=kde-base/kontact-${PV}:${SLOT}
-	>=kde-base/kaddressbook-${PV}:${SLOT}
-	>=kde-base/korganizer-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/korganizer-${PV}:${SLOT}
 	>=kde-base/libkholidays-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
 	>=kde-base/libkdepim-3.5.6-r1:${SLOT}" # Force this version temporarily, #136810.
diff --git a/kde-base/korn/korn-3.5.10.ebuild b/kde-base/korn/korn-3.5.10.ebuild
index da8eae64..228ea40b 100644
--- a/kde-base/korn/korn-3.5.10.ebuild
+++ b/kde-base/korn/korn-3.5.10.ebuild
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND=">=kde-base/mimelib-${PV}:${SLOT}
 >=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}
-	|| ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	>=kde-base/kdepim-kioslaves-${PV}:${SLOT}"
 
 KMCOPYLIB="libmimelib mimelib
diff --git a/kde-base/kpilot/kpilot-3.5.10.ebuild b/kde-base/kpilot/kpilot-3.5.10.ebuild
index 92e7fc63..1499ba88 100644
--- a/kde-base/kpilot/kpilot-3.5.10.ebuild
+++ b/kde-base/kpilot/kpilot-3.5.10.ebuild
@@ -14,7 +14,7 @@ DEPEND=">=app-pda/pilot-link-0.12.0
 		>=dev-libs/libmal-0.44
 >=kde-base/libkcal-${PV}:${SLOT}
 >=kde-base/libkdepim-${PV}:${SLOT}
->=kde-base/kontact-${PV}:${SLOT}"
+>=kde-apps/kontact-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kpoker/kpoker-3.5.10.ebuild b/kde-base/kpoker/kpoker-3.5.10.ebuild
index 74627e44..981712b0 100644
--- a/kde-base/kpoker/kpoker-3.5.10.ebuild
+++ b/kde-base/kpoker/kpoker-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE poker game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/ksame/ksame-3.5.10.ebuild b/kde-base/ksame/ksame-3.5.10.ebuild
index a4cfc13e..d9122e13 100644
--- a/kde-base/ksame/ksame-3.5.10.ebuild
+++ b/kde-base/ksame/ksame-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of th
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/ksirtet/ksirtet-3.5.10.ebuild b/kde-base/ksirtet/ksirtet-3.5.10.ebuild
index fc32a8af..5baa4474 100644
--- a/kde-base/ksirtet/ksirtet-3.5.10.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/ksmiletris/ksmiletris-3.5.10.ebuild b/kde-base/ksmiletris/ksmiletris-3.5.10.ebuild
index 7de1807e..4d4e5fb5 100644
--- a/kde-base/ksmiletris/ksmiletris-3.5.10.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE SmileTris"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/ksnake/ksnake-3.5.10.ebuild b/kde-base/ksnake/ksnake-3.5.10.ebuild
index adf57fbf..b5c69b1e 100644
--- a/kde-base/ksnake/ksnake-3.5.10.ebuild
+++ b/kde-base/ksnake/ksnake-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE Snake Race Game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/ksokoban/ksokoban-3.5.10.ebuild b/kde-base/ksokoban/ksokoban-3.5.10.ebuild
index cf706525..b5f82416 100644
--- a/kde-base/ksokoban/ksokoban-3.5.10.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The japanese warehouse keeper game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/ktron/ktron-3.5.10.ebuild b/kde-base/ktron/ktron-3.5.10.ebuild
index a812b3af..67ecb4dd 100644
--- a/kde-base/ktron/ktron-3.5.10.ebuild
+++ b/kde-base/ktron/ktron-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="KDE tron game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/kttsd/kttsd-3.5.10.ebuild b/kde-base/kttsd/kttsd-3.5.10.ebuild
index 6ec7e874..4bc7e56c 100644
--- a/kde-base/kttsd/kttsd-3.5.10.ebuild
+++ b/kde-base/kttsd/kttsd-3.5.10.ebuild
@@ -11,7 +11,7 @@ IUSE="akode alsa"
 
 DEPEND="akode? ( media-libs/akode )
 	alsa? ( media-libs/alsa-lib )
-	|| ( >=kde-base/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+	|| ( >=kde-apps/kcontrol-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
 	!arts? ( !alsa? ( media-libs/akode ) )"
 RDEPEND="${DEPEND}
 	|| ( app-accessibility/festival
diff --git a/kde-base/kviewshell/kviewshell-3.5.10.ebuild b/kde-base/kviewshell/kviewshell-3.5.10.ebuild
index b7207170..8ae31bc3 100644
--- a/kde-base/kviewshell/kviewshell-3.5.10.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5.10.ebuild
@@ -11,4 +11,4 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( >=kde-base/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
+RDEPEND="|| ( >=kde-apps/kdebase-kioslaves-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )"
diff --git a/kde-base/kwin4/kwin4-3.5.10.ebuild b/kde-base/kwin4/kwin4-3.5.10.ebuild
index 57e37f50..c9615398 100644
--- a/kde-base/kwin4/kwin4-3.5.10.ebuild
+++ b/kde-base/kwin4/kwin4-3.5.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="kde four-in-a-row game"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="kdehiddenvisibility"
 
-DEPEND=">=kde-base/libkdegames-${PV}:${SLOT}"
+DEPEND=">=kde-apps/libkdegames-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY=libkdegames
diff --git a/kde-base/libkcal/libkcal-3.5.10-r1.ebuild b/kde-base/libkcal/libkcal-3.5.10-r1.ebuild
index d5cab786..c8e30787 100644
--- a/kde-base/libkcal/libkcal-3.5.10-r1.ebuild
+++ b/kde-base/libkcal/libkcal-3.5.10-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE kcal library for KOrganizer etc"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/ktnef-${PV}:${SLOT}
+DEPEND=">=kde-apps/ktnef-${PV}:${SLOT}
 	>=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/libkcal/libkcal-3.5.10.ebuild b/kde-base/libkcal/libkcal-3.5.10.ebuild
index b9918906..15e735a8 100644
--- a/kde-base/libkcal/libkcal-3.5.10.ebuild
+++ b/kde-base/libkcal/libkcal-3.5.10.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE kcal library for KOrganizer etc"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=kde-base/ktnef-${PV}:${SLOT}
+DEPEND=">=kde-apps/ktnef-${PV}:${SLOT}
 	>=kde-base/libkmime-${PV}:${SLOT}"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/libkdepim/libkdepim-3.5.10.ebuild b/kde-base/libkdepim/libkdepim-3.5.10.ebuild
index 20d90136..2628cd7b 100644
--- a/kde-base/libkdepim/libkdepim-3.5.10.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5.10.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND=">=kde-base/libkcal-${PV}:${SLOT}
 	>=kde-base/libkmime-${PV}:${SLOT}
-		!<=kde-base/kmail-3.5.6-r1"
+		!<=kde-apps/kmail-3.5.6-r1"
 
 DEPEND="${RDEPEND}
 		x11-apps/xhost"
diff --git a/kde-base/quanta/quanta-3.5.10-r1.ebuild b/kde-base/quanta/quanta-3.5.10-r1.ebuild
index 8f28ce21..886c026e 100644
--- a/kde-base/quanta/quanta-3.5.10-r1.ebuild
+++ b/kde-base/quanta/quanta-3.5.10-r1.ebuild
@@ -32,12 +32,12 @@ pkg_postinst() {
 	elog "${P} has some optional dependencies which you might want to emerge:"
 	elog "- app-text/htmltidy for HTML syntax checking."
 	elog "- app-crypt/gnupg for previewing browser configuration."
-	elog "- kde-base/kompare for comparing files by content."
+	elog "- kde-apps/kompare for comparing files by content."
 	elog "- kde-base/cervisia for enabling the CVS management plugin."
 	elog "- kde-base/kfilereplace for searching and replacing in files."
-	elog "- kde-base/kimagemapeditor for editing HTML image maps."
-	elog "- kde-base/klinkstatus for link validity checking."
+	elog "- kde-apps/kimagemapeditor for editing HTML image maps."
+	elog "- kde-apps/klinkstatus for link validity checking."
 	elog "- kde-base/kxsldbg for XSLT debugging."
-	elog "- kde-base/kommander for the QuickStart dialogue and other scripted dialogues."
+	elog "- kde-apps/kommander for the QuickStart dialogue and other scripted dialogues."
 	echo
 }
diff --git a/kde-base/quanta/quanta-3.5.10.ebuild b/kde-base/quanta/quanta-3.5.10.ebuild
index 036be1c1..6e5d051a 100644
--- a/kde-base/quanta/quanta-3.5.10.ebuild
+++ b/kde-base/quanta/quanta-3.5.10.ebuild
@@ -29,12 +29,12 @@ pkg_postinst() {
 	elog "${P} has some optional dependencies which you might want to emerge:"
 	elog "- app-text/htmltidy for HTML syntax checking."
 	elog "- app-crypt/gnupg for previewing browser configuration."
-	elog "- kde-base/kompare for comparing files by content."
+	elog "- kde-apps/kompare for comparing files by content."
 	elog "- kde-base/cervisia for enabling the CVS management plugin."
 	elog "- kde-base/kfilereplace for searching and replacing in files."
-	elog "- kde-base/kimagemapeditor for editing HTML image maps."
-	elog "- kde-base/klinkstatus for link validity checking."
+	elog "- kde-apps/kimagemapeditor for editing HTML image maps."
+	elog "- kde-apps/klinkstatus for link validity checking."
 	elog "- kde-base/kxsldbg for XSLT debugging."
-	elog "- kde-base/kommander for the QuickStart dialogue and other scripted dialogues."
+	elog "- kde-apps/kommander for the QuickStart dialogue and other scripted dialogues."
 	echo
 }
diff --git a/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.10.0.ebuild b/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.10.0.ebuild
index a088216b..b09a510b 100644
--- a/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.10.0.ebuild
+++ b/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.10.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="=kde-base/kate-3.5*"
+DEPEND="=kde-apps/kate-3.5*"
 RDEPEND="${DEPEND}"
 
 need-kde 3.5
diff --git a/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.11.0.ebuild b/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.11.0.ebuild
index 007c0811..25a8046b 100644
--- a/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.11.0.ebuild
+++ b/kde-misc/kate-symbolviewer-plugin/kate-symbolviewer-plugin-1.11.0.ebuild
@@ -20,6 +20,6 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="kde-base/kate:3.5"
+DEPEND="kde-apps/kate:3.5"
 
 need-kde 3.5
diff --git a/kde-misc/kerry/kerry-0.2.1.ebuild b/kde-misc/kerry/kerry-0.2.1.ebuild
index 92fc7930..8522b744 100644
--- a/kde-misc/kerry/kerry-0.2.1.ebuild
+++ b/kde-misc/kerry/kerry-0.2.1.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND=">=app-misc/beagle-0.2.5"
 DEPEND="${RDEPEND}
-	=kde-base/libkonq-3.5*
+	=kde-apps/libkonq-3.5*
 	virtual/pkgconfig"
 
 need-kde 3.4
diff --git a/kde-misc/kopete-antispam-kde3/kopete-antispam-kde3-0.5.ebuild b/kde-misc/kopete-antispam-kde3/kopete-antispam-kde3-0.5.ebuild
index 11618f14..60ec36df 100644
--- a/kde-misc/kopete-antispam-kde3/kopete-antispam-kde3-0.5.ebuild
+++ b/kde-misc/kopete-antispam-kde3/kopete-antispam-kde3-0.5.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
-DEPEND="kde-base/kopete:3.5"
+DEPEND="kde-apps/kopete:3.5"
 RDEPEND="${DEPEND}"
 need-kde 3.5
 
diff --git a/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild b/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild
index 0d961961..c1f449bc 100644
--- a/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild
+++ b/kde-misc/kopete-ktts/kopete-ktts-1.3.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="=kde-base/kttsd-3.5*
-		=kde-base/kopete-3.5*"
+		=kde-apps/kopete-3.5*"
 RDEPEND="${DEPEND}"
 
 need-kde 3.5
diff --git a/kde-misc/koppermine/koppermine-1.1.ebuild b/kde-misc/koppermine/koppermine-1.1.ebuild
index b0a28332..0fb4fad3 100644
--- a/kde-misc/koppermine/koppermine-1.1.ebuild
+++ b/kde-misc/koppermine/koppermine-1.1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="=kde-base/kcontrol-3.5*
-	=kde-base/kdialog-3.5*"
+RDEPEND="=kde-apps/kcontrol-3.5*
+	=kde-apps/kdialog-3.5*"
 
 need-kde 3
diff --git a/kde-misc/krusader/files/external-tools b/kde-misc/krusader/files/external-tools
index 3d7da1c1..571fec75 100644
--- a/kde-misc/krusader/files/external-tools
+++ b/kde-misc/krusader/files/external-tools
@@ -11,7 +11,7 @@ xxdiff  - dev-util/xxdiff
 krename - kde-misc/krename
 kmail   - kde-base/kmail
 kget    - kde-base/kget
-kdesu   - kde-base/kdesu
+kdesu   - kde-apps/kdesu
 
 Packers
 arj     - app-arch/arj
diff --git a/kde-misc/krusader/krusader-1.90.0-r1.ebuild b/kde-misc/krusader/krusader-1.90.0-r1.ebuild
index 6cd53c0c..8a22409a 100644
--- a/kde-misc/krusader/krusader-1.90.0-r1.ebuild
+++ b/kde-misc/krusader/krusader-1.90.0-r1.ebuild
@@ -20,8 +20,8 @@ IUSE="javascript kde"
 
 DEPEND="
 	kde? (
-		kde-base/libkonq:3.5
-		kde-base/kdebase-kioslaves:3.5
+		kde-apps/libkonq:3.5
+		kde-apps/kdebase-kioslaves:3.5
 	)
 	javascript? ( kde-base/kjsembed:3.5 )"
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/krusader/krusader-1.90.0-r2.ebuild b/kde-misc/krusader/krusader-1.90.0-r2.ebuild
index a5bf8031..f182293e 100644
--- a/kde-misc/krusader/krusader-1.90.0-r2.ebuild
+++ b/kde-misc/krusader/krusader-1.90.0-r2.ebuild
@@ -20,8 +20,8 @@ IUSE="javascript kde"
 
 DEPEND="
 	kde? (
-		kde-base/libkonq:3.5
-		kde-base/kdebase-kioslaves:3.5
+		kde-apps/libkonq:3.5
+		kde-apps/kdebase-kioslaves:3.5
 	)
 	javascript? ( kde-base/kjsembed:3.5 )"
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/kshutdown/kshutdown-0.8.2.ebuild b/kde-misc/kshutdown/kshutdown-0.8.2.ebuild
index 3b595443..22cdb85c 100644
--- a/kde-misc/kshutdown/kshutdown-0.8.2.ebuild
+++ b/kde-misc/kshutdown/kshutdown-0.8.2.ebuild
@@ -13,8 +13,8 @@ IUSE=""
 KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 
-RDEPEND="=kde-base/kdesu-3.5*
-	=kde-base/kcontrol-3.5*
-	=kde-base/kdialog-3.5*"
+RDEPEND="=kde-apps/kdesu-3.5*
+	=kde-apps/kcontrol-3.5*
+	=kde-apps/kdialog-3.5*"
 
 need-kde 3.4
diff --git a/kde-misc/kshutdown/kshutdown-1.0.4.ebuild b/kde-misc/kshutdown/kshutdown-1.0.4.ebuild
index b4426f98..5fc7e046 100644
--- a/kde-misc/kshutdown/kshutdown-1.0.4.ebuild
+++ b/kde-misc/kshutdown/kshutdown-1.0.4.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 
 RDEPEND="
-	kde-base/kdesu:3.5
-	kde-base/kcontrol:3.5
-	kde-base/kdialog:3.5
+	kde-apps/kdesu:3.5
+	kde-apps/kcontrol:3.5
+	kde-apps/kdialog:3.5
 "
 
 need-kde 3.5
diff --git a/kde-misc/kshutdown/kshutdown-1.0.ebuild b/kde-misc/kshutdown/kshutdown-1.0.ebuild
index 7cdc3135..dcbbbebe 100644
--- a/kde-misc/kshutdown/kshutdown-1.0.ebuild
+++ b/kde-misc/kshutdown/kshutdown-1.0.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ppc ~x86"
 SLOT="0"
 
 RDEPEND="
-	=kde-base/kdesu-3.5*
-	=kde-base/kcontrol-3.5*
-	=kde-base/kdialog-3.5*"
+	=kde-apps/kdesu-3.5*
+	=kde-apps/kcontrol-3.5*
+	=kde-apps/kdialog-3.5*"
 
 need-kde 3.4
diff --git a/kde-misc/kvkbd/kvkbd-0.5.ebuild b/kde-misc/kvkbd/kvkbd-0.5.ebuild
index c9828664..c939e95d 100644
--- a/kde-misc/kvkbd/kvkbd-0.5.ebuild
+++ b/kde-misc/kvkbd/kvkbd-0.5.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="kde-base/kate:3.5"
+DEPEND="kde-apps/kate:3.5"
 RDEPEND="${DEPEND}"
 
 need-kde 3.5
diff --git a/kde-misc/quadkonsole/quadkonsole-2.0.3.ebuild b/kde-misc/quadkonsole/quadkonsole-2.0.3.ebuild
index abbe5cff..83e1d06b 100644
--- a/kde-misc/quadkonsole/quadkonsole-2.0.3.ebuild
+++ b/kde-misc/quadkonsole/quadkonsole-2.0.3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="=kde-base/konsole-3.5*"
+RDEPEND="=kde-apps/konsole-3.5*"
 DEPEND="${RDEPEND}"
 
 need-kde 3.3
diff --git a/kde-misc/tellico/tellico-1.2.14.ebuild b/kde-misc/tellico/tellico-1.2.14.ebuild
index 40ab1921..1c134f00 100644
--- a/kde-misc/tellico/tellico-1.2.14.ebuild
+++ b/kde-misc/tellico/tellico-1.2.14.ebuild
@@ -19,9 +19,9 @@ IUSE="calendar cddb yaz"
 
 RDEPEND=">=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.0.19
-	cddb?  ( =kde-base/libkcddb-3.5* )
+	cddb?  ( =kde-apps/libkcddb-3.5* )
 	calendar? (
-		=kde-base/ktnef-3.5*
+		=kde-apps/ktnef-3.5*
 		=kde-base/libkcal-3.5*
 	)
 	media-libs/taglib
diff --git a/kde-misc/tellico/tellico-1.3.5.ebuild b/kde-misc/tellico/tellico-1.3.5.ebuild
index fab79e8c..49a316dc 100644
--- a/kde-misc/tellico/tellico-1.3.5.ebuild
+++ b/kde-misc/tellico/tellico-1.3.5.ebuild
@@ -23,9 +23,9 @@ IUSE="calendar cddb yaz"
 
 DEPEND=">=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.0.19
-	cddb?  ( kde-base/libkcddb:3.5 )
+	cddb?  ( kde-apps/libkcddb:3.5 )
 	calendar? (
-		kde-base/ktnef:3.5
+		kde-apps/ktnef:3.5
 		kde-base/libkcal:3.5
 	)
 	media-libs/taglib
diff --git a/kde-misc/tork/tork-0.23.ebuild b/kde-misc/tork/tork-0.23.ebuild
index 6cb9b38e..09cc35d7 100644
--- a/kde-misc/tork/tork-0.23.ebuild
+++ b/kde-misc/tork/tork-0.23.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="dev-libs/openssl
 	>=dev-libs/geoip-1.4.0
-	=kde-base/libkonq-3.5*"
+	=kde-apps/libkonq-3.5*"
 
 RDEPEND="${DEPEND}
 	>=net-misc/tor-0.1.2.14
diff --git a/kde-misc/tork/tork-0.27.ebuild b/kde-misc/tork/tork-0.27.ebuild
index 08367e6d..773b247a 100644
--- a/kde-misc/tork/tork-0.27.ebuild
+++ b/kde-misc/tork/tork-0.27.ebuild
@@ -19,7 +19,7 @@ DEPEND="dev-libs/openssl
 	>=dev-libs/geoip-1.4.0
 	gnutls? ( >=net-libs/gnutls-2.2.2 )
 	!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	=kde-base/libkonq-3.5*"
+	=kde-apps/libkonq-3.5*"
 
 RDEPEND="${DEPEND}
 	>=net-misc/tor-0.1.2.14
diff --git a/kde-misc/tork/tork-0.31.ebuild b/kde-misc/tork/tork-0.31.ebuild
index a258fa29..ab301943 100644
--- a/kde-misc/tork/tork-0.31.ebuild
+++ b/kde-misc/tork/tork-0.31.ebuild
@@ -21,7 +21,7 @@ DEPEND="dev-libs/openssl
 	>=dev-libs/geoip-1.4.0
 	gnutls? ( >=net-libs/gnutls-2.2.2 )
 	!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	=kde-base/libkonq-3.5*"
+	=kde-apps/libkonq-3.5*"
 
 RDEPEND="${DEPEND}
 	>=net-misc/tor-0.1.2.14
diff --git a/kde-misc/yakuake/yakuake-2.8.1-r1.ebuild b/kde-misc/yakuake/yakuake-2.8.1-r1.ebuild
index fdd6d62c..a00b22bf 100644
--- a/kde-misc/yakuake/yakuake-2.8.1-r1.ebuild
+++ b/kde-misc/yakuake/yakuake-2.8.1-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="3.5"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="kde-base/konsole:3.5"
+DEPEND="kde-apps/konsole:3.5"
 RDEPEND="${DEPEND}
 	!kde-misc/yakuake:0
 "
diff --git a/kde-misc/yakuake/yakuake-2.8.1.ebuild b/kde-misc/yakuake/yakuake-2.8.1.ebuild
index 31b1be80..93498968 100644
--- a/kde-misc/yakuake/yakuake-2.8.1.ebuild
+++ b/kde-misc/yakuake/yakuake-2.8.1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="=kde-base/konsole-3.5*"
+DEPEND="=kde-apps/konsole-3.5*"
 RDEPEND="${DEPEND}"
 
 need-kde 3.5
diff --git a/kde-misc/yakuake/yakuake-2.8.ebuild b/kde-misc/yakuake/yakuake-2.8.ebuild
index 4a51b546..f2b1c15c 100644
--- a/kde-misc/yakuake/yakuake-2.8.ebuild
+++ b/kde-misc/yakuake/yakuake-2.8.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="=kde-base/konsole-3.5*"
+DEPEND="=kde-apps/konsole-3.5*"
 RDEPEND=""
 
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/youtube-servicemenu/youtube-servicemenu-1.5.ebuild b/kde-misc/youtube-servicemenu/youtube-servicemenu-1.5.ebuild
index 4e6a4d08..dfc53bc0 100644
--- a/kde-misc/youtube-servicemenu/youtube-servicemenu-1.5.ebuild
+++ b/kde-misc/youtube-servicemenu/youtube-servicemenu-1.5.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/python
-	=kde-base/konqueror-3.5*"
+	=kde-apps/konqueror-3.5*"
 
 LANGS="de ru sk uk"
 
diff --git a/media-gfx/digikam/digikam-0.9.4.ebuild b/media-gfx/digikam/digikam-0.9.4.ebuild
index 47c56da3..e177462d 100644
--- a/media-gfx/digikam/digikam-0.9.4.ebuild
+++ b/media-gfx/digikam/digikam-0.9.4.ebuild
@@ -30,8 +30,8 @@ DEPEND=">=media-libs/libgphoto2-2.2
 	!media-plugins/digikamimageplugins"
 
 RDEPEND="${DEPEND}
-	=kde-base/kgamma-3.5*
-	=kde-base/kamera-3.5*"
+	=kde-apps/kgamma-3.5*
+	=kde-apps/kamera-3.5*"
 
 need-kde 3.5
 
diff --git a/media-gfx/digikam/digikam-0.9.5-r1.ebuild b/media-gfx/digikam/digikam-0.9.5-r1.ebuild
index 1c7aeef6..d7bfa54e 100644
--- a/media-gfx/digikam/digikam-0.9.5-r1.ebuild
+++ b/media-gfx/digikam/digikam-0.9.5-r1.ebuild
@@ -36,8 +36,8 @@ DEPEND=">=dev-db/sqlite-3.5.9:3
 
 RDEPEND="${DEPEND}
 	!${CATEGORY}/${PN}:0
-	kde-base/kgamma:3.5
-	kde-base/kamera:3.5"
+	kde-apps/kgamma:3.5
+	kde-apps/kamera:3.5"
 
 need-kde 3.5
 
diff --git a/media-gfx/digikam/digikam-0.9.6.ebuild b/media-gfx/digikam/digikam-0.9.6.ebuild
index 31a561d9..6c70faa2 100644
--- a/media-gfx/digikam/digikam-0.9.6.ebuild
+++ b/media-gfx/digikam/digikam-0.9.6.ebuild
@@ -36,8 +36,8 @@ DEPEND=">=dev-db/sqlite-3.5.9:3
 
 RDEPEND="${DEPEND}
 	!${CATEGORY}/${PN}:0
-	kde-base/kgamma:3.5
-	kde-base/kamera:3.5"
+	kde-apps/kgamma:3.5
+	kde-apps/kamera:3.5"
 
 need-kde 3.5
 
diff --git a/media-gfx/showimg/showimg-0.9.5-r1.ebuild b/media-gfx/showimg/showimg-0.9.5-r1.ebuild
index 353db347..2285776c 100644
--- a/media-gfx/showimg/showimg-0.9.5-r1.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc ~x86"
 IUSE="exif kipi mysql postgres"
 
-DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
+DEPEND="|| ( =kde-apps/libkonq-3.5* =kde-base/kdebase-3.5* )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base >=dev-libs/libpqxx-2.6.9 )
 	exif? ( media-libs/libkexif )
diff --git a/media-gfx/showimg/showimg-0.9.5-r2.ebuild b/media-gfx/showimg/showimg-0.9.5-r2.ebuild
index 6bcdde5a..05b6f8a9 100644
--- a/media-gfx/showimg/showimg-0.9.5-r2.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5-r2.ebuild
@@ -22,7 +22,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc sparc ~x86"
 IUSE="exif kipi mysql postgres"
 
-DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
+DEPEND="|| ( =kde-apps/libkonq-3.5* =kde-base/kdebase-3.5* )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base >=dev-libs/libpqxx-2.6.9 )
 	exif? ( media-libs/libkexif )
diff --git a/media-sound/musicman/musicman-0.15.ebuild b/media-sound/musicman/musicman-0.15.ebuild
index 10a2547a..31f33d03 100644
--- a/media-sound/musicman/musicman-0.15.ebuild
+++ b/media-sound/musicman/musicman-0.15.ebuild
@@ -16,7 +16,7 @@ SLOT="3.5"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="kde-base/libkonq:3.5"
+RDEPEND="kde-apps/libkonq:3.5"
 DEPEND="${RDEPEND}"
 
 need-kde 3.5
diff --git a/media-sound/musicman/musicman-0.16.ebuild b/media-sound/musicman/musicman-0.16.ebuild
index 3e66c20d..b1dbff32 100644
--- a/media-sound/musicman/musicman-0.16.ebuild
+++ b/media-sound/musicman/musicman-0.16.ebuild
@@ -16,7 +16,7 @@ SLOT="3.5"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="kde-base/libkonq:3.5"
+RDEPEND="kde-apps/libkonq:3.5"
 DEPEND="${RDEPEND}"
 
 need-kde 3.5
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild
index 96006914..f9467a0c 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.4.3-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE="gstreamer xine mplayer"
 RESTRICT="nomirror"
 
-DEPEND="|| ( kde-base/kate kde-base/kdebase )
+DEPEND="|| ( kde-apps/kate kde-base/kdebase )
         gstreamer? ( media-libs/gstreamer )
         xine? ( media-libs/xine-lib )
         mplayer? ( media-video/mplayer )"
diff --git a/net-im/kopete-otr/kopete-otr-0.7.ebuild b/net-im/kopete-otr/kopete-otr-0.7.ebuild
index 6e45eb32..2e583180 100644
--- a/net-im/kopete-otr/kopete-otr-0.7.ebuild
+++ b/net-im/kopete-otr/kopete-otr-0.7.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=net-libs/libotr-3.1.0
-	kde-base/kopete:3.5"
+	kde-apps/kopete:3.5"
 
 need-kde 3.5
 
diff --git a/net-im/sim/sim-9999.ebuild b/net-im/sim/sim-9999.ebuild
index 10725e7c..8f185a76 100644
--- a/net-im/sim/sim-9999.ebuild
+++ b/net-im/sim/sim-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="debug gpg +jabber kde msn +oscar sms spell ssl weather yahoo livejournal"
 
 # kdebase-data provides the icon "licq.png"
 RDEPEND="kde? ( kde-base/kdelibs:3.5[spell=]
-				kde-base/kdebase-data:3.5 )
+				kde-apps/kdebase-data:3.5 )
 		!kde? ( spell? ( app-text/aspell ) )
 		dev-qt/qt-meta:3
 		ssl? ( dev-libs/openssl )
diff --git a/net-irc/konversation/konversation-1.1-r1.ebuild b/net-irc/konversation/konversation-1.1-r1.ebuild
index d0d29c61..7603af14 100644
--- a/net-irc/konversation/konversation-1.1-r1.ebuild
+++ b/net-irc/konversation/konversation-1.1-r1.ebuild
@@ -33,10 +33,10 @@ LANGS_DOC="da es et it pt ru sv"
 pkg_postinst() {
 	kde_pkg_postinst
 
-	if ! has_version kde-base/konsole; then
+	if ! has_version kde-apps/konsole; then
 		echo
 		elog "If you want to be able to use Konsole from inside ${PN}, please emerge"
-		elog "kde-base/konsole:3.5"
+		elog "kde-apps/konsole:3.5"
 		echo
 	fi
 }
diff --git a/net-misc/smb4k/smb4k-0.9.9.ebuild b/net-misc/smb4k/smb4k-0.9.9.ebuild
index 9724cf5b..93bb35a1 100644
--- a/net-misc/smb4k/smb4k-0.9.9.ebuild
+++ b/net-misc/smb4k/smb4k-0.9.9.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE="bindist"
 
-DEPEND="kde-base/konqueror:3.5"
+DEPEND="kde-apps/konqueror:3.5"
 RDEPEND="${DEPEND}
 	bindist? ( <net-fs/samba-3.2.0_pre2 )
 	!bindist? ( net-fs/samba )
diff --git a/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild b/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild
index 40614d8d..2122f735 100644
--- a/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild
+++ b/net-p2p/kmldonkey/kmldonkey-0.10.1-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="=kde-base/kcontrol-3.5*"
+DEPEND="=kde-apps/kcontrol-3.5*"
 
 need-kde 3.5
 
diff --git a/net-p2p/kmldonkey/kmldonkey-0.11.ebuild b/net-p2p/kmldonkey/kmldonkey-0.11.ebuild
index 915f2614..d5960119 100644
--- a/net-p2p/kmldonkey/kmldonkey-0.11.ebuild
+++ b/net-p2p/kmldonkey/kmldonkey-0.11.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="=kde-base/kcontrol-3.5*"
+DEPEND="=kde-apps/kcontrol-3.5*"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.11-sandbox.patch"
diff --git a/net-p2p/ktorrent/ktorrent-2.2.8-r2.ebuild b/net-p2p/ktorrent/ktorrent-2.2.8-r2.ebuild
index a51065e1..971297f6 100644
--- a/net-p2p/ktorrent/ktorrent-2.2.8-r2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.8-r2.ebuild
@@ -29,7 +29,7 @@ DEPEND="!<net-p2p/ktorrent-2.2.8-r2
 	>=dev-libs/geoip-1.4.0-r1
 	avahi? ( >=net-dns/avahi-0.6.16-r1[qt3] )"
 RDEPEND="${DEPEND}
-	kde-base/kdebase-kioslaves:3.5"
+	kde-apps/kdebase-kioslaves:3.5"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/profiles/categories b/profiles/categories
index 33da6e27..d3ff99c9 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -22,6 +22,7 @@ dev-vcs
 games-emulation
 games-puzzle
 games-util
+kde-apps
 kde-base
 kde-misc
 mail-client
diff --git a/sci-mathematics/koctave/koctave-0.65-r1.ebuild b/sci-mathematics/koctave/koctave-0.65-r1.ebuild
index 2d36245b..7e35904d 100644
--- a/sci-mathematics/koctave/koctave-0.65-r1.ebuild
+++ b/sci-mathematics/koctave/koctave-0.65-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="arts"
 
 DEPEND="sci-mathematics/octave
-	kde-base/konsole:3.5"
+	kde-apps/konsole:3.5"
 
 S="${WORKDIR}"/${PN}3-${PV}
 
diff --git a/sci-mathematics/koctave/koctave-0.70.ebuild b/sci-mathematics/koctave/koctave-0.70.ebuild
index 8add49c8..866fb856 100644
--- a/sci-mathematics/koctave/koctave-0.70.ebuild
+++ b/sci-mathematics/koctave/koctave-0.70.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="arts"
 
 DEPEND="sci-mathematics/octave
-	|| ( kde-base/konsole:3.5 kde-base/kdebase:3.5 )"
+	|| ( kde-apps/konsole:3.5 kde-base/kdebase:3.5 )"
 
 need-kde 3.5
 
diff --git a/x11-terms/kuake/kuake-0.3-r3.ebuild b/x11-terms/kuake/kuake-0.3-r3.ebuild
index aff8e774..e500f1f9 100644
--- a/x11-terms/kuake/kuake-0.3-r3.ebuild
+++ b/x11-terms/kuake/kuake-0.3-r3.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="arts"
 
-RDEPEND="=kde-base/konsole-3.5*"
+RDEPEND="=kde-apps/konsole-3.5*"
 DEPEND="${RDEPEND}"
 
 need-kde 3.3
diff --git a/x11-themes/baghira/baghira-0.8.ebuild b/x11-themes/baghira/baghira-0.8.ebuild
index 5eb616b2..5ed9a6b9 100644
--- a/x11-themes/baghira/baghira-0.8.ebuild
+++ b/x11-themes/baghira/baghira-0.8.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="=kde-base/kwin-3.5*
-	=kde-base/konqueror-3.5*"
+	=kde-apps/konqueror-3.5*"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" )
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
index 2206feac..ccd410f8 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
@@ -27,7 +27,7 @@ DEPEND="${COMMONDEPEND}
 	dev-util/cmake"
 # the little gnome_apps.png...
 RDEPEND="${COMMONDEPEND}
-	kde-base/kdebase-data:3.5"
+	kde-apps/kdebase-data:3.5"
 need-kde 3.5
 
 # Set slot after the need-kde. Fixes bug #78455.