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

johu · Dec 24, 2016 · a6257f7 · a6257f7
1 parent 979641b
commit a6257f7
Show file tree

Hide file tree

Showing 98 changed files with 102 additions and 101 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → kde-frameworks/kdelibs/Manifest b/kde-base/kdelibs/Manifest → kde-frameworks/kdelibs/Manifest
diff --git a/...ist/01_gentoo_set_xdg_menu_prefix-1.patch → ...ist/01_gentoo_set_xdg_menu_prefix-1.patch b/...ist/01_gentoo_set_xdg_menu_prefix-1.patch → ...ist/01_gentoo_set_xdg_menu_prefix-1.patch
diff --git a/.../02_gentoo_append_xdg_config_dirs-1.patch → .../02_gentoo_append_xdg_config_dirs-1.patch b/.../02_gentoo_append_xdg_config_dirs-1.patch → .../02_gentoo_append_xdg_config_dirs-1.patch
diff --git a/...kdelibs/files/kdelibs-4.10.0-udisks.patch → ...kdelibs/files/kdelibs-4.10.0-udisks.patch b/...kdelibs/files/kdelibs-4.10.0-udisks.patch → ...kdelibs/files/kdelibs-4.10.0-udisks.patch
diff --git a/...elibs/files/kdelibs-4.14.20-FindQt4.patch → ...elibs/files/kdelibs-4.14.20-FindQt4.patch b/...elibs/files/kdelibs-4.14.20-FindQt4.patch → ...elibs/files/kdelibs-4.14.20-FindQt4.patch
diff --git a/...les/kdelibs-4.14.20-strigi-optional.patch → ...les/kdelibs-4.14.20-strigi-optional.patch b/...les/kdelibs-4.14.20-strigi-optional.patch → ...les/kdelibs-4.14.20-strigi-optional.patch
diff --git a/...delibs/files/kdelibs-4.14.22-webkit.patch → ...delibs/files/kdelibs-4.14.22-webkit.patch b/...delibs/files/kdelibs-4.14.22-webkit.patch → ...delibs/files/kdelibs-4.14.22-webkit.patch
diff --git a/.../files/kdelibs-4.14.5-fatalwarnings.patch → .../files/kdelibs-4.14.5-fatalwarnings.patch b/.../files/kdelibs-4.14.5-fatalwarnings.patch → .../files/kdelibs-4.14.5-fatalwarnings.patch
diff --git a/...libs/files/kdelibs-4.14.5-mimetypes.patch → ...libs/files/kdelibs-4.14.5-mimetypes.patch b/...libs/files/kdelibs-4.14.5-mimetypes.patch → ...libs/files/kdelibs-4.14.5-mimetypes.patch
diff --git a/...bs-4.3.80-kdeui_util_kkeyserver_mac.patch → ...bs-4.3.80-kdeui_util_kkeyserver_mac.patch b/...bs-4.3.80-kdeui_util_kkeyserver_mac.patch → ...bs-4.3.80-kdeui_util_kkeyserver_mac.patch
diff --git a/...e/kdelibs/files/kdelibs-4.4.90-xslt.patch → ...s/kdelibs/files/kdelibs-4.4.90-xslt.patch b/...e/kdelibs/files/kdelibs-4.4.90-xslt.patch → ...s/kdelibs/files/kdelibs-4.4.90-xslt.patch
diff --git a/...files/kdelibs-4.6.3-no_suid_kdeinit.patch → ...files/kdelibs-4.6.3-no_suid_kdeinit.patch b/...files/kdelibs-4.6.3-no_suid_kdeinit.patch → ...files/kdelibs-4.6.3-no_suid_kdeinit.patch
diff --git a/...kdelibs/files/kdelibs-4.8.1-norpath.patch → ...kdelibs/files/kdelibs-4.8.1-norpath.patch b/...kdelibs/files/kdelibs-4.8.1-norpath.patch → ...kdelibs/files/kdelibs-4.8.1-norpath.patch
diff --git a/.../kdelibs/files/kdelibs-4.9.3-werror.patch → .../kdelibs/files/kdelibs-4.9.3-werror.patch b/.../kdelibs/files/kdelibs-4.9.3-werror.patch → .../kdelibs/files/kdelibs-4.9.3-werror.patch
diff --git a/kde-base/kdelibs/kdelibs-4.14.24.ebuild → ...frameworks/kdelibs/kdelibs-4.14.24.ebuild b/kde-base/kdelibs/kdelibs-4.14.24.ebuild → ...frameworks/kdelibs/kdelibs-4.14.24.ebuild
diff --git a/kde-base/kdelibs/kdelibs-4.14.27.ebuild → ...frameworks/kdelibs/kdelibs-4.14.27.ebuild b/kde-base/kdelibs/kdelibs-4.14.27.ebuild → ...frameworks/kdelibs/kdelibs-4.14.27.ebuild
diff --git a/kde-base/kdelibs/metadata.xml → kde-frameworks/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml → 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
@@ -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