[gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/, app-accessibility/simon/, profiles/arch/powerpc/, ...

[Johannes Huber]

commit:     a6257f7c9dc4385f03d25852117c84f1b89cf7bc
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 20:41:30 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 09:15:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6257f7c

kde-base/kdelibs -> kde-frameworks/kdelibs

 app-accessibility/simon/simon-0.4.1.ebuild                        | 2 +-
 app-arch/p7zip/p7zip-15.09-r2.ebuild                              | 2 +-
 app-arch/p7zip/p7zip-15.09.ebuild                                 | 4 ++--
 app-arch/p7zip/p7zip-15.14.1.ebuild                               | 2 +-
 app-arch/p7zip/p7zip-15.14.ebuild                                 | 2 +-
 app-arch/p7zip/p7zip-9.20.1-r5.ebuild                             | 4 ++--
 app-arch/p7zip/p7zip-9.38.1-r2.ebuild                             | 4 ++--
 app-arch/p7zip/p7zip-9.38.1-r3.ebuild                             | 4 ++--
 app-cdr/k3b/k3b-2.0.3-r2.ebuild                                   | 2 +-
 app-cdr/k3b/k3b-2.0.3-r3.ebuild                                   | 2 +-
 app-crypt/kencfs/kencfs-1.6.2.ebuild                              | 2 +-
 app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild                        | 4 ++--
 app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild                         | 2 +-
 app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild                      | 2 +-
 app-i18n/uim/uim-1.8.6-r1.ebuild                                  | 2 +-
 app-i18n/uim/uim-1.8.6-r2.ebuild                                  | 2 +-
 app-office/libalkimia/libalkimia-5.0.0.ebuild                     | 2 +-
 app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild         | 2 +-
 dev-vcs/subversion/subversion-1.8.16.ebuild                       | 2 +-
 dev-vcs/subversion/subversion-1.8.17.ebuild                       | 2 +-
 dev-vcs/subversion/subversion-1.9.4.ebuild                        | 2 +-
 dev-vcs/subversion/subversion-1.9.5.ebuild                        | 2 +-
 eclass/kde4-base.eclass                                           | 8 ++++----
 games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild           | 4 ++--
 games-puzzle/ksokoban/ksokoban-9999.ebuild                        | 4 ++--
 kde-apps/akregator/akregator-4.4.2016.01.ebuild                   | 2 +-
 kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild             | 2 +-
 kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild                       | 2 +-
 kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild                       | 2 +-
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild    | 2 +-
 kde-apps/kmail/kmail-4.4.2016.01.ebuild                           | 2 +-
 kde-apps/kopete/kopete-16.08.3.ebuild                             | 2 +-
 kde-apps/kopete/kopete-16.12.0.ebuild                             | 2 +-
 kde-apps/pykde4/pykde4-4.14.3-r1.ebuild                           | 2 +-
 {kde-base => kde-frameworks}/kdelibs/Manifest                     | 0
 .../kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch      | 0
 .../kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch   | 0
 .../kdelibs/files/kdelibs-4.10.0-udisks.patch                     | 0
 .../kdelibs/files/kdelibs-4.14.20-FindQt4.patch                   | 0
 .../kdelibs/files/kdelibs-4.14.20-strigi-optional.patch           | 0
 .../kdelibs/files/kdelibs-4.14.22-webkit.patch                    | 0
 .../kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch              | 0
 .../kdelibs/files/kdelibs-4.14.5-mimetypes.patch                  | 0
 .../kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch  | 0
 .../kdelibs/files/kdelibs-4.4.90-xslt.patch                       | 0
 .../kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch             | 0
 .../kdelibs/files/kdelibs-4.8.1-norpath.patch                     | 0
 .../kdelibs/files/kdelibs-4.9.3-werror.patch                      | 0
 {kde-base => kde-frameworks}/kdelibs/kdelibs-4.14.24.ebuild       | 0
 {kde-base => kde-frameworks}/kdelibs/kdelibs-4.14.27.ebuild       | 0
 {kde-base => kde-frameworks}/kdelibs/metadata.xml                 | 0
 kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild                           | 4 ++--
 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild                           | 2 +-
 kde-misc/kfilebox/kfilebox-0.4.9.ebuild                           | 4 ++--
 kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild       | 2 +-
 kde-plasma/breeze/breeze-5.8.3.ebuild                             | 2 +-
 kde-plasma/breeze/breeze-5.8.4.ebuild                             | 2 +-
 kde-plasma/kwin/kwin-4.11.22.ebuild                               | 2 +-
 kde-plasma/oxygen/oxygen-5.8.3.ebuild                             | 2 +-
 kde-plasma/oxygen/oxygen-5.8.4.ebuild                             | 2 +-
 media-gfx/wally/wally-2.4.5.ebuild                                | 4 ++--
 media-sound/amarok/amarok-2.8.0-r3.ebuild                         | 2 +-
 media-sound/amarok/amarok-2.8.90-r2.ebuild                        | 2 +-
 media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild             | 2 +-
 media-video/qx11grab/qx11grab-0.4.12.ebuild                       | 2 +-
 media-video/vlc/vlc-2.2.1-r1.ebuild                               | 2 +-
 media-video/vlc/vlc-2.2.4-r1.ebuild                               | 2 +-
 media-video/vlc/vlc-2.2.4.ebuild                                  | 2 +-
 media-video/vlc/vlc-2.2.9999.ebuild                               | 2 +-
 media-video/vlc/vlc-9999.ebuild                                   | 2 +-
 net-analyzer/nmapsi/nmapsi-0.4.1.ebuild                           | 2 +-
 net-im/qutim/qutim-0.3.2.ebuild                                   | 2 +-
 net-im/qutim/qutim-0.3.3_p1.ebuild                                | 2 +-
 net-irc/quassel/quassel-0.12.4.ebuild                             | 2 +-
 net-libs/libproxy/libproxy-0.4.11-r2.ebuild                       | 4 ++--
 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild                         | 4 ++--
 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild                      | 2 +-
 net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild                         | 2 +-
 net-misc/hotot/hotot-0.9.8.14.ebuild                              | 4 ++--
 net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild                 | 2 +-
 net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild                    | 4 ++--
 net-misc/hotot/hotot-9999.ebuild                                  | 4 ++--
 net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild                         | 2 +-
 profiles/arch/amd64-fbsd/todo/package.use.mask                    | 2 +-
 profiles/arch/arm/package.use.mask                                | 2 +-
 profiles/arch/arm64/package.use.mask                              | 2 +-
 profiles/arch/nios2/package.use.mask                              | 2 +-
 profiles/arch/powerpc/package.use.mask                            | 2 +-
 profiles/base/package.use.force                                   | 2 +-
 profiles/default/bsd/package.use.mask                             | 2 +-
 profiles/default/linux/package.use.mask                           | 2 +-
 profiles/updates/4Q-2016                                          | 1 +
 sci-visualization/gwyddion/gwyddion-2.39.ebuild                   | 4 ++--
 sci-visualization/gwyddion/gwyddion-2.44.ebuild                   | 2 +-
 www-client/opera/opera-12.16_p1860-r1.ebuild                      | 4 ++--
 www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild             | 2 +-
 x11-misc/piedock/piedock-1.6.6.ebuild                             | 4 ++--
 x11-misc/qterm/qterm-0.5.12-r1.ebuild                             | 2 +-
 98 files changed, 102 insertions(+), 101 deletions(-)

diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
index d4352ac..f0f2779 100644
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 	media-libs/alsa-lib
 	x11-libs/libX11
 	x11-libs/libXtst

diff --git a/app-arch/p7zip/p7zip-15.09-r2.ebuild b/app-arch/p7zip/p7zip-15.09-r2.ebuild
index 8d7950b..3cd27bb 100644
--- a/app-arch/p7zip/p7zip-15.09-r2.ebuild
+++ b/app-arch/p7zip/p7zip-15.09-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-arch/p7zip/p7zip-15.09.ebuild b/app-arch/p7zip/p7zip-15.09.ebuild
index 2b4b810..8ac4ad1 100644
--- a/app-arch/p7zip/p7zip-15.09.ebuild
+++ b/app-arch/p7zip/p7zip-15.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-arch/p7zip/p7zip-15.14.1.ebuild b/app-arch/p7zip/p7zip-15.14.1.ebuild
index 6026420..b88e6c0 100644
--- a/app-arch/p7zip/p7zip-15.14.1.ebuild
+++ b/app-arch/p7zip/p7zip-15.14.1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-arch/p7zip/p7zip-15.14.ebuild b/app-arch/p7zip/p7zip-15.14.ebuild
index a2efa29..7f72d37 100644
--- a/app-arch/p7zip/p7zip-15.14.ebuild
+++ b/app-arch/p7zip/p7zip-15.14.ebuild
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
index 6b11477..e30b406 100644
--- a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-arch/p7zip/p7zip-9.38.1-r2.ebuild b/app-arch/p7zip/p7zip-9.38.1-r2.ebuild
index 7e779e8..03dab4f 100644
--- a/app-arch/p7zip/p7zip-9.38.1-r2.ebuild
+++ b/app-arch/p7zip/p7zip-9.38.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-arch/p7zip/p7zip-9.38.1-r3.ebuild b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
index 8c2486e..567aa85 100644
--- a/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
+++ b/app-arch/p7zip/p7zip-9.38.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
-	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-frameworks/kdelibs:4 )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )

diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
index 0cebffd..544b71d 100644
--- a/app-cdr/k3b/k3b-2.0.3-r2.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
@@ -48,8 +48,8 @@ DEPEND="${CDEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
+	kde-frameworks/kdelibs:4[udev,udisks(+)]
 	media-sound/cdparanoia
 	virtual/cdrtools
 	dvd? (

diff --git a/app-cdr/k3b/k3b-2.0.3-r3.ebuild b/app-cdr/k3b/k3b-2.0.3-r3.ebuild
index ecdd7ad..08317a6 100644
--- a/app-cdr/k3b/k3b-2.0.3-r3.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r3.ebuild
@@ -47,8 +47,8 @@ DEPEND="${CDEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
+	kde-frameworks/kdelibs:4[udev,udisks(+)]
 	media-sound/cdparanoia
 	virtual/cdrtools
 	dvd? (

diff --git a/app-crypt/kencfs/kencfs-1.6.2.ebuild b/app-crypt/kencfs/kencfs-1.6.2.ebuild
index 186dc90..8703167 100644
--- a/app-crypt/kencfs/kencfs-1.6.2.ebuild
+++ b/app-crypt/kencfs/kencfs-1.6.2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND="
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 "
 RDEPEND="${DEPEND}
 	kde-apps/kwalletd:4

diff --git a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
index c0bf1f0..c8681ad 100644
--- a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
+++ b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,7 +25,7 @@ CDEPEND="
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 		kde? (
-			kde-base/kdelibs:4
+			kde-frameworks/kdelibs:4
 			kde-apps/kwalletd:4
 		)
 	)

diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild
index 1b9f5f8..74cc0d9 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4]
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 	virtual/libintl
 	x11-libs/libX11
 	x11-libs/libxkbfile"

diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild
index b4988e1..3b26edf 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4]
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 	virtual/libintl
 	x11-libs/libX11
 	x11-libs/libxkbfile"

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index b25f0ce..684400c 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="X? (
 	libffi? ( virtual/libffi )
 	gtk? ( >=x11-libs/gtk+-2.4:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	kde? ( >=kde-base/kdelibs-4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index 5b04cfd..81d595e 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="X? (
 	libffi? ( virtual/libffi )
 	gtk? ( >=x11-libs/gtk+-2.4:2 )
 	gtk3? ( x11-libs/gtk+:3 )
-	kde? ( >=kde-base/kdelibs-4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	libedit? ( dev-libs/libedit )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )

diff --git a/app-office/libalkimia/libalkimia-5.0.0.ebuild b/app-office/libalkimia/libalkimia-5.0.0.ebuild
index cca7eac..efc0e1d 100644
--- a/app-office/libalkimia/libalkimia-5.0.0.ebuild
+++ b/app-office/libalkimia/libalkimia-5.0.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/gmp:0=[cxx]
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig

diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild
index c81ab56..c30ff07 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.2.3.3.ebuild
@@ -70,7 +70,7 @@ BIN_COMMON_DEPEND="
 	>=sys-devel/gcc-4.9.3
 	>=sys-libs/glibc-2.22
 	virtual/jpeg:62
-	kde? ( >=kde-base/kdelibs-4.14.24:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 )
+	kde? ( >=kde-frameworks/kdelibs-4.14.24:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 )
 "
 
 # PLEASE place any restrictions that are specific to the binary builds

diff --git a/dev-vcs/subversion/subversion-1.8.16.ebuild b/dev-vcs/subversion/subversion-1.8.16.ebuild
index afae86f..f90474d 100644
--- a/dev-vcs/subversion/subversion-1.8.16.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.16.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 	berkdb? ( >=sys-libs/db-4.0.14:= )
 	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
+	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )

diff --git a/dev-vcs/subversion/subversion-1.8.17.ebuild b/dev-vcs/subversion/subversion-1.8.17.ebuild
index c5a0f02..45382cd 100644
--- a/dev-vcs/subversion/subversion-1.8.17.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.17.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 	berkdb? ( >=sys-libs/db-4.0.14:= )
 	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
+	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )

diff --git a/dev-vcs/subversion/subversion-1.9.4.ebuild b/dev-vcs/subversion/subversion-1.9.4.ebuild
index df0bcd1..ccc9865 100644
--- a/dev-vcs/subversion/subversion-1.9.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.4.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 	berkdb? ( >=sys-libs/db-4.0.14:= )
 	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
+	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )

diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild
index 3c98e5d..4ec988b 100644
--- a/dev-vcs/subversion/subversion-1.9.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.5.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
 	berkdb? ( >=sys-libs/db-4.0.14:= )
 	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
+	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index f1e41f7..35909a0 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -314,11 +314,11 @@ kdecommondepend="
 if [[ ${PN} != kdelibs ]]; then
 	local _kdelibsuse
 	case ${WEBKIT_REQUIRED} in
-		always) _kdelibsuse="webkit" ;;
-		optional) _kdelibsuse="webkit?" ;;
+		always) _kdelibsuse="[webkit]" ;;
+		optional) _kdelibsuse="[webkit?]" ;;
 		*) ;;
 	esac
-	kdecommondepend+=" $(add_kdebase_dep kdelibs "${_kdelibsuse}" 4.14.22)"
+	kdecommondepend+=" >=kde-frameworks/kdelibs-4.14.22:4${_kdelibsuse}"
 	unset _kdelibsuse
 	if [[ ${KDEBASE} = kdevelop ]]; then
 		if [[ ${PN} != kdevplatform ]]; then
@@ -378,7 +378,7 @@ kdehandbookdepend="
 	app-text/docbook-xsl-stylesheets
 "
 kdehandbookrdepend="
-	$(add_kdebase_dep kdelibs 'handbook')
+	kde-frameworks/kdelibs:4[handbook]
 "
 case ${KDE_HANDBOOK} in
 	always)

diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
index 0256ede..453096d 100644
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/ksokoban/"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="kde-base/kdelibs:4"
+DEPEND="kde-frameworks/kdelibs:4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"

diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild
index 0256ede..453096d 100644
--- a/games-puzzle/ksokoban/ksokoban-9999.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/ksokoban/"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="kde-base/kdelibs:4"
+DEPEND="kde-frameworks/kdelibs:4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-apps/akregator/akregator-4.4.2016.01.ebuild b/kde-apps/akregator/akregator-4.4.2016.01.ebuild
index 83aedbf..889c96c 100644
--- a/kde-apps/akregator/akregator-4.4.2016.01.ebuild
+++ b/kde-apps/akregator/akregator-4.4.2016.01.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs '' 4.6)
 	$(add_kdeapps_dep kdepimlibs '' 4.6)
 	$(add_kdeapps_dep libkdepim '' 4.4.2015)
+	kde-frameworks/kdelibs:4
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
index a89f670..5d84843 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
@@ -14,10 +14,10 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs '' 4.13.1)
 	$(add_kdeapps_dep kdepimlibs '' 4.13.1)
 	$(add_kdeapps_dep libkdepim '' 4.4.2015)
 	$(add_kdeapps_dep libkleo '' 4.4.2015)
+	kde-frameworks/kdelibs:4
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild
index 29dc41a..bdb1848 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.08.3.ebuild
@@ -20,7 +20,7 @@ SLOT="4"
 KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 	sys-devel/gettext
 "
 RDEPEND="

diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild
index ff28593..b871af0 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.12.0.ebuild
@@ -20,7 +20,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="
-	kde-base/kdelibs:4
+	kde-frameworks/kdelibs:4
 	sys-devel/gettext
 "
 RDEPEND="

diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
index 9832529..9c7434c 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
@@ -27,8 +27,8 @@ DEPEND="
 	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
 "
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
 	kde-apps/kdialog:*
+	kde-frameworks/kdelibs:4[bzip2?,lzma?]
 	virtual/ssh
 	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
 "

diff --git a/kde-apps/kmail/kmail-4.4.2016.01.ebuild b/kde-apps/kmail/kmail-4.4.2016.01.ebuild
index 73ce2af..1d55c69 100644
--- a/kde-apps/kmail/kmail-4.4.2016.01.ebuild
+++ b/kde-apps/kmail/kmail-4.4.2016.01.ebuild
@@ -15,11 +15,11 @@ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs '' 4.13.1)
 	$(add_kdeapps_dep kdepimlibs '' 4.13.1)
 	$(add_kdeapps_dep libkdepim '' 4.4.11.1-r1)
 	$(add_kdeapps_dep libkleo '' 4.4.2015)
 	$(add_kdeapps_dep libkpgp '' 4.4.2015)
+	kde-frameworks/kdelibs:4
 "
 RDEPEND="${DEPEND}
 	!>=kde-apps/kdepimlibs-4.14.11_pre20160211

diff --git a/kde-apps/kopete/kopete-16.08.3.ebuild b/kde-apps/kopete/kopete-16.08.3.ebuild
index cfb7c97..f647270 100644
--- a/kde-apps/kopete/kopete-16.08.3.ebuild
+++ b/kde-apps/kopete/kopete-16.08.3.ebuild
@@ -64,12 +64,12 @@ testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdeapps_dep kdepimlibs)
 	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	media-libs/phonon[qt4]
 	media-libs/qimageblitz
+	kde-frameworks/kdelibs:4[zeroconf?]
 	!aqua? (
 		x11-libs/libX11
 		x11-libs/libXScrnSaver

diff --git a/kde-apps/kopete/kopete-16.12.0.ebuild b/kde-apps/kopete/kopete-16.12.0.ebuild
index 449decd..3b10bfd 100644
--- a/kde-apps/kopete/kopete-16.12.0.ebuild
+++ b/kde-apps/kopete/kopete-16.12.0.ebuild
@@ -64,12 +64,12 @@ testbed winpopup +xmpp yahoo zeroconf"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
-	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdeapps_dep kdepimlibs)
 	dev-libs/libpcre
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	media-libs/phonon[qt4]
 	media-libs/qimageblitz
+	kde-frameworks/kdelibs:4[zeroconf?]
 	!aqua? (
 		x11-libs/libX11
 		x11-libs/libXScrnSaver

diff --git a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
index ce382c6..a09a44d 100644
--- a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
+++ b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/PyQt4-4.11.1[${PYTHON_USEDEP},dbus,declarative,script,sql,svg,webkit,X]
 	>=dev-python/sip-4.16.2:=[${PYTHON_USEDEP}]
-	$(add_kdebase_dep kdelibs 'opengl')
+	kde-frameworks/kdelibs:4[opengl]
 	akonadi? ( $(add_kdeapps_dep kdepimlibs) )
 "
 DEPEND="${RDEPEND}

diff --git a/kde-base/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
similarity index 100%
rename from kde-base/kdelibs/Manifest
rename to kde-frameworks/kdelibs/Manifest

diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
similarity index 100%
rename from kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
rename to kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch

diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
similarity index 100%
rename from kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
rename to kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.14.22-webkit.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch

diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch
similarity index 100%
rename from kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch
rename to kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch

diff --git a/kde-base/kdelibs/kdelibs-4.14.24.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild
similarity index 100%
rename from kde-base/kdelibs/kdelibs-4.14.24.ebuild
rename to kde-frameworks/kdelibs/kdelibs-4.14.24.ebuild

diff --git a/kde-base/kdelibs/kdelibs-4.14.27.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild
similarity index 100%
rename from kde-base/kdelibs/kdelibs-4.14.27.ebuild
rename to kde-frameworks/kdelibs/kdelibs-4.14.27.ebuild

diff --git a/kde-base/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml
similarity index 100%
rename from kde-base/kdelibs/metadata.xml
rename to kde-frameworks/kdelibs/metadata.xml

diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
index 941e98f..fa5839f 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ IUSE="debug kde"
 CDEPEND="
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
-	kde? ( $(add_kdebase_dep kdelibs) )
+	kde? ( kde-frameworks/kdelibs:4 )
 "
 DEPEND="${CDEPEND}
 	sys-devel/gettext

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 6881973..beb094a 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -36,7 +36,7 @@ CDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5 )
-	kde? ( $(add_kdebase_dep kdelibs) )
+	kde? ( kde-frameworks/kdelibs:4 )
 "
 DEPEND="${CDEPEND}
 	sys-devel/gettext

diff --git a/kde-misc/kfilebox/kfilebox-0.4.9.ebuild b/kde-misc/kfilebox/kfilebox-0.4.9.ebuild
index e759cee..816ed96 100644
--- a/kde-misc/kfilebox/kfilebox-0.4.9.ebuild
+++ b/kde-misc/kfilebox/kfilebox-0.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ IUSE=""
 for name in ${LANGS} ; do IUSE+="linguas_$name " ; done
 unset name
 
-DEPEND="kde-base/kdelibs"
+DEPEND="kde-frameworks/kdelibs:4"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}

diff --git a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
index ed4fd10..6472332 100644
--- a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
+++ b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdebase_dep kdelibs)
 	$(add_kdeapps_dep kdepimlibs)
 	kde-apps/akonadi:4
+	kde-frameworks/kdelibs:4
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	dev-qt/qtwebkit:4

diff --git a/kde-plasma/breeze/breeze-5.8.3.ebuild b/kde-plasma/breeze/breeze-5.8.3.ebuild
index 50e994a..2f6a2f0 100644
--- a/kde-plasma/breeze/breeze-5.8.3.ebuild
+++ b/kde-plasma/breeze/breeze-5.8.3.ebuild
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	x11-libs/libxcb
 	qt4? (
-		kde-base/kdelibs:4
+		kde-frameworks/kdelibs:4
 		x11-libs/libX11
 	)
 	wayland? ( $(add_frameworks_dep kwayland) )

diff --git a/kde-plasma/breeze/breeze-5.8.4.ebuild b/kde-plasma/breeze/breeze-5.8.4.ebuild
index 7a46fbc..6929778 100644
--- a/kde-plasma/breeze/breeze-5.8.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.8.4.ebuild
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	x11-libs/libxcb
 	qt4? (
-		kde-base/kdelibs:4
+		kde-frameworks/kdelibs:4
 		x11-libs/libX11
 	)
 	wayland? ( $(add_frameworks_dep kwayland) )

diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild b/kde-plasma/kwin/kwin-4.11.22.ebuild
index 5e9fc97..717579f 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -21,7 +21,7 @@ IUSE="debug gles opengl wayland"
 
 COMMONDEPEND="
 	kde-frameworks/kactivities:4
-	$(add_kdebase_dep kdelibs opengl)
+	kde-frameworks/kdelibs:4[opengl]
 	kde-plasma/kephal:4
 	kde-plasma/libkworkspace:4
 	kde-plasma/liboxygenstyle:4

diff --git a/kde-plasma/oxygen/oxygen-5.8.3.ebuild b/kde-plasma/oxygen/oxygen-5.8.3.ebuild
index 3798d2e..701b200 100644
--- a/kde-plasma/oxygen/oxygen-5.8.3.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.8.3.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	x11-libs/libxcb
 	qt4? (
-		kde-base/kdelibs:4
+		kde-frameworks/kdelibs:4
 		x11-libs/libX11
 	)
 	wayland? ( $(add_frameworks_dep kwayland) )

diff --git a/kde-plasma/oxygen/oxygen-5.8.4.ebuild b/kde-plasma/oxygen/oxygen-5.8.4.ebuild
index 4c8fcd1..7f94ea9 100644
--- a/kde-plasma/oxygen/oxygen-5.8.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.8.4.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	x11-libs/libxcb
 	qt4? (
-		kde-base/kdelibs:4
+		kde-frameworks/kdelibs:4
 		x11-libs/libX11
 	)
 	wayland? ( $(add_frameworks_dep kwayland) )

diff --git a/media-gfx/wally/wally-2.4.5.ebuild b/media-gfx/wally/wally-2.4.5.ebuild
index 19b48f7..837bd69 100644
--- a/media-gfx/wally/wally-2.4.5.ebuild
+++ b/media-gfx/wally/wally-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ DEPEND="
 	dev-qt/qtgui:4
 	dev-qt/qtsql:4
 	dev-qt/qtsvg:4
-	kde? ( $(add_kdebase_dep kdelibs) )
+	kde? ( kde-frameworks/kdelibs:4 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index a0216b8..ca05a30 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -39,7 +39,7 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	app-crypt/qca:2[qt4(+)]
-	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
+	kde-frameworks/kdelibs:4[opengl?]
 	$(add_kdeapps_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1

diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index a088d19..40177e6 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -34,7 +34,7 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	app-crypt/qca:2[qt4(+)]
-	$(add_kdebase_dep kdelibs 'opengl?' 4.8.4)
+	kde-frameworks/kdelibs:4[opengl?]
 	$(add_kdeapps_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1

diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild
index da9b210..261e166 100644
--- a/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3-r3.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 "
 
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
+	kde-frameworks/kdelibs:4[udev,udisks(+)]
 	$(add_kdeapps_dep audiocd-kio)
 "
 

diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild
index 39b2df9..ffbeb0c 100644
--- a/media-video/qx11grab/qx11grab-0.4.12.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.3
 	libav? ( >=media-video/libav-9:0=[X,encode,truetype] )
 	!libav? ( >=media-video/ffmpeg-1.1:0=[X,encode,truetype] )
-	kde? ( kde-base/kdelibs:4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	opengl? ( >=dev-qt/qtopengl-4.7.4:4 )
 	pulseaudio? ( media-sound/pulseaudio )
 "

diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 92c84d5..8e73802 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -177,7 +177,7 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	xcb? ( x11-proto/xproto:0 )
 	app-arch/xz-utils:0
 	x86?   ( dev-lang/yasm:* )

diff --git a/media-video/vlc/vlc-2.2.4-r1.ebuild b/media-video/vlc/vlc-2.2.4-r1.ebuild
index ded746a..43aa8cf 100644
--- a/media-video/vlc/vlc-2.2.4-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.4-r1.ebuild
@@ -177,7 +177,7 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )

diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild
index 7854b23..da16f6c 100644
--- a/media-video/vlc/vlc-2.2.4.ebuild
+++ b/media-video/vlc/vlc-2.2.4.ebuild
@@ -179,7 +179,7 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	xcb? ( x11-proto/xproto:0 )
 	app-arch/xz-utils:0
 	x86?   ( dev-lang/yasm:* )

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 81f5436..0e60e1c 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -177,7 +177,7 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index ebe73b8..e9be021 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -177,7 +177,7 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	!qt5? ( kde? ( kde-base/kdelibs:4 ) )
+	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )

diff --git a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
index cdc4ac7..ef42208 100644
--- a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
+++ b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	dev-qt/qtwebkit:4
-	kde? ( kde-base/kdelibs:4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 "
 RDEPEND="${DEPEND}
 	>=net-analyzer/nmap-6.00

diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 87b71a6..2c13245 100644
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.2.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 	histman? ( >=dev-qt/qtsql-${QT_PV} )
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
 	hunspell? ( app-text/hunspell )
-	kde? ( kde-base/kdelibs:4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	mobility? (
 		dev-qt/qt-mobility[multimedia,feedback]
 		>=dev-qt/qtbearer-${QT_PV}

diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild
index 611370e..9d926bb 100644
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 	histman? ( >=dev-qt/qtsql-${QT_PV} )
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
 	hunspell? ( app-text/hunspell )
-	kde? ( kde-base/kdelibs:4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	mobility? (
 		dev-qt/qt-mobility[multimedia,feedback]
 		>=dev-qt/qtbearer-${QT_PV}

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
index c543474..9f34a3c 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -64,7 +64,7 @@ GUI_RDEPEND="
 			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)]
 			dev-qt/qtdbus:4
 			kde? (
-				kde-base/kdelibs:4
+				kde-frameworks/kdelibs:4
 				kde-frameworks/oxygen-icons:*
 				ayatana? ( kde-misc/plasma-widget-message-indicator )
 			)

diff --git a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
index eae73af..1ae5fe6 100644
--- a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
 # NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support
 RDEPEND="gnome? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	kde? ( >=kde-base/kdelibs-4.4.5 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	mono? ( dev-lang/mono )
 	networkmanager? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	perl? ( dev-lang/perl:= )

diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild
index d5d96a4..d48f3cb 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ DEPEND="${DEPEND}
 	libnotify? (
 		gtk?  ( x11-libs/libnotify )
 		gtk3? ( x11-libs/libnotify )
-		qt4?  ( kde-base/kdelibs )
+		qt4?  ( kde-frameworks/kdelibs:4 )
 	)
 	gtk?  ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )

diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
index 78bfb2a..43ea008 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	libnotify? (
 		gtk?  ( x11-libs/libnotify )
 		gtk3? ( x11-libs/libnotify )
-		qt4?  ( kde-base/kdelibs kde-apps/knotify )
+		qt4?  ( kde-frameworks/kdelibs:4 kde-apps/knotify:4 )
 	)
 	gtk?  ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )

diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild
index 5f4c71e..d44d63c 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild
@@ -25,7 +25,7 @@ DEPEND="${DEPEND}
 	libnotify? (
 		gtk?  ( x11-libs/libnotify )
 		gtk3? ( x11-libs/libnotify )
-		qt4?  ( kde-base/kdelibs )
+		qt4?  ( kde-frameworks/kdelibs:4 )
 	)
 	gtk?  ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )

diff --git a/net-misc/hotot/hotot-0.9.8.14.ebuild b/net-misc/hotot/hotot-0.9.8.14.ebuild
index a6ad8b9..5a893d3 100644
--- a/net-misc/hotot/hotot-0.9.8.14.ebuild
+++ b/net-misc/hotot/hotot-0.9.8.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	gtk? ( dev-python/pywebkitgtk )
 	qt4? ( dev-qt/qtwebkit:4
-		kde? ( kde-base/kdelibs ) )"
+		kde? ( kde-frameworks/kdelibs:4 ) )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	qt4? ( dev-qt/qtsql:4 )"

diff --git a/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild b/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild
index 4657908..f5115f9 100644
--- a/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild
+++ b/net-misc/hotot/hotot-0.9.8.14_p20130514-r1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( chrome qt4 ) ${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	qt4? ( dev-qt/qtwebkit:4
-		kde? ( kde-base/kdelibs ) )
+		kde? ( kde-frameworks/kdelibs:4 ) )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

diff --git a/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild b/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild
index 3f85cc5..dc69219 100644
--- a/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild
+++ b/net-misc/hotot/hotot-0.9.8.14_p20130514.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	gtk? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
 	qt4? ( dev-qt/qtwebkit:4
-		kde? ( kde-base/kdelibs ) )"
+		kde? ( kde-frameworks/kdelibs:4 ) )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	qt4? ( dev-qt/qtsql:4 )"

diff --git a/net-misc/hotot/hotot-9999.ebuild b/net-misc/hotot/hotot-9999.ebuild
index 4bb51e0..652b40a 100644
--- a/net-misc/hotot/hotot-9999.ebuild
+++ b/net-misc/hotot/hotot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	gtk? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
 	qt4? ( dev-qt/qtwebkit:4
-		kde? ( kde-base/kdelibs ) )"
+		kde? ( kde-frameworks/kdelibs:4 ) )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	qt4? ( dev-qt/qtsql:4 )"

diff --git a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild
index cb204f6..57aceac 100644
--- a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild
@@ -49,8 +49,8 @@ COMMONDEPEND="
 	mediaplayer? ( >=media-libs/taglib-1.5 )
 	rss? ( $(add_kdeapps_dep kdepimlibs) )
 	search? (
-		$(add_kdebase_dep kdelibs webkit 4.14.22)
 		dev-qt/qtwebkit:4
+		kde-frameworks/kdelibs:4[webkit]
 	)
 "
 DEPEND="${COMMONDEPEND}

diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index fcbb4f5..3255f7e 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -148,7 +148,7 @@ x11-base/xorg-drivers video_cards_tdfx
 # >=sys-auth/polkit-qt-0.103.0
 # >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
 # >=sys-auth/polkit-kde-agent-0.99
-kde-base/kdelibs policykit
+kde-frameworks/kdelibs policykit
 
 # <=sci-geosciences/gpsd-2.95-r1
 app-misc/geoclue gps

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index dbd247d..b0cfce8 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -510,7 +510,7 @@ sys-auth/polkit kde
 app-text/asciidoc test
 
 # Michael Weber <xmw@g.o> (10 Feb 2011)
-# kde-base/kdelibs is not stable for arm
+# kde-frameworks/kdelibs is not stable for arm
 net-libs/libproxy kde
 
 # Justin Lecher <jlec@g.o> (14 Jen 2011)

diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f6ff3fb..9d1712a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -249,7 +249,7 @@ sys-auth/polkit kde
 app-text/asciidoc test
 
 # Michael Weber <xmw@g.o> (10 Feb 2011)
-# kde-base/kdelibs is not stable for arm
+# kde-frameworks/kdelibs is not stable for arm
 net-libs/libproxy kde
 
 # Justin Lecher <jlec@g.o> (14 Jen 2011)

diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
index dc85f13..fd5ea3f 100644
--- a/profiles/arch/nios2/package.use.mask
+++ b/profiles/arch/nios2/package.use.mask
@@ -233,7 +233,7 @@ sys-auth/polkit kde
 app-text/asciidoc test
 
 # Michael Weber <xmw@g.o> (10 Feb 2011)
-# kde-base/kdelibs is not stable for arm
+# kde-frameworks/kdelibs is not stable for arm
 net-libs/libproxy kde
 
 # Justin Lecher <jlec@g.o> (14 Jen 2011)

diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 0ef948f..d76017f 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -25,7 +25,7 @@ app-misc/hachoir-metadata kde
 dev-vcs/subversion kde
 games-arcade/jumpnbump kde
 kde-apps/katepart handbook
-kde-base/kdelibs handbook policykit
+kde-frameworks/kdelibs handbook policykit
 net-libs/libproxy kde
 net-voip/ekiga kde
 sys-auth/polkit kde

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 7ff7884..9e482e4 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -21,7 +21,7 @@ dev-lang/python threads
 
 # Michael Palimaka <kensington@g.o> (27 Jul 2016)
 # Reverse dependencies need to be fully investigated yet
-kde-base/kdelibs webkit
+kde-frameworks/kdelibs webkit
 
 # Lars Wendler <polynomial-c@g.o> (11 Sep 2015)
 # Package fails to build with dbus USE flag being disabled (bug #560208)

diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index c914d8f..5e5d61b 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -95,7 +95,7 @@ media-libs/xine-lib fusion
 media-libs/mesa sysfs
 
 # needs udev
-kde-base/kdelibs udisks upower
+kde-frameworks/kdelibs udisks upower
 media-libs/mesa gbm dri3
 x11-base/xorg-drivers video_cards_radeonsi
 x11-drivers/xf86-video-ati glamor

diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index abbde26..5117338 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -8,7 +8,7 @@ sys-auth/consolekit -cgroups
 
 # Michael Palimaka <kensington@g.o> (03 Sep 2015)
 # Native inotify support is preferred on linux.
-kde-base/kdelibs fam
+kde-frameworks/kdelibs fam
 kde-frameworks/kcoreaddons fam
 
 # Christian Ruppert <idl0r@g.o> (23 Aug 2015)

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index a86928b..4d83e50 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -57,3 +57,4 @@ move kde-base/krosspython kde-apps/kross-interpreters
 move kde-base/katepart kde-apps/katepart
 move kde-base/pykde4 kde-apps/pykde4
 move kde-base/kde-env kde-frameworks/kdelibs-env
+move kde-base/kdelibs kde-frameworks/kdelibs

diff --git a/sci-visualization/gwyddion/gwyddion-2.39.ebuild b/sci-visualization/gwyddion/gwyddion-2.39.ebuild
index 028a8e1..818e984 100644
--- a/sci-visualization/gwyddion/gwyddion-2.39.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,7 +27,7 @@ RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )
 	gnome? ( gnome-base/gconf:2 )
-	kde? ( kde-base/kdelibs:4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl )
 	python? (

diff --git a/sci-visualization/gwyddion/gwyddion-2.44.ebuild b/sci-visualization/gwyddion/gwyddion-2.44.ebuild
index d1f85c2..e1460b9 100644
--- a/sci-visualization/gwyddion/gwyddion-2.44.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.44.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	fits? ( sci-libs/cfitsio )
 	fftw? ( sci-libs/fftw:3.0 )
 	gnome? ( gnome-base/gconf:2 )
-	kde? ( kde-base/kdelibs:4 )
+	kde? ( kde-frameworks/kdelibs:4 )
 	opengl? ( virtual/opengl x11-libs/gtkglext )
 	perl? ( dev-lang/perl )
 	python? (

diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild
index b206145..3a83485 100644
--- a/www-client/opera/opera-12.16_p1860-r1.ebuild
+++ b/www-client/opera/opera-12.16_p1860-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -73,7 +73,7 @@ GTKRDEPEND="
 	x11-libs/pixman
 "
 KDERDEPEND="
-	kde-base/kdelibs
+	kde-frameworks/kdelibs:4
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 "

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild b/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild
index b248d1f..5e7bdbb 100644
--- a/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.186.ebuild
@@ -49,7 +49,7 @@ NPAPI_RDEPEND="
 		dev-qt/qtdbus:4
 		dev-qt/qtgui:4
 		dev-qt/qtsvg:4
-		kde-base/kdelibs
+		kde-frameworks/kdelibs:4
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libXau

diff --git a/x11-misc/piedock/piedock-1.6.6.ebuild b/x11-misc/piedock/piedock-1.6.6.ebuild
index 788f26d..5f1a094 100644
--- a/x11-misc/piedock/piedock-1.6.6.ebuild
+++ b/x11-misc/piedock/piedock-1.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,7 +27,7 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 	kde? (
-		kde-base/kdelibs:4
+		kde-frameworks/kdelibs:4
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 	)

diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
index 637fc00..3bf0b9c 100644
--- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
+++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
-	kde-base/kdelibs
+	kde-frameworks/kdelibs:4
 	dev-qt/qthelp:4
 	dev-qt/qtwebkit:4"