[gentoo-commits] proj/kde:master commit in: kde-plasma/oxygen/, kde-plasma/breeze/, profiles/updates/, eclass/, ...

[Johannes Huber]

commit:     de8d734822cde2c74e31ce6260da5c832c5da1dc
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 09:13:13 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 09:13:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=de8d7348

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

 eclass/kde4-base.eclass                     | 8 ++++----
 kde-apps/kopete/kopete-16.12.49.9999.ebuild | 2 +-
 kde-apps/kopete/kopete-9999.ebuild          | 2 +-
 kde-plasma/breeze/breeze-5.8.49.9999.ebuild | 2 +-
 kde-plasma/breeze/breeze-9999.ebuild        | 2 +-
 kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild | 2 +-
 kde-plasma/oxygen/oxygen-9999.ebuild        | 2 +-
 profiles/updates/4Q-2016                    | 1 +
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 1fd79e9..93de76d 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -322,11 +322,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
@@ -386,7 +386,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/kde-apps/kopete/kopete-16.12.49.9999.ebuild b/kde-apps/kopete/kopete-16.12.49.9999.ebuild
index aa5a870..2eb547a 100644
--- a/kde-apps/kopete/kopete-16.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-16.12.49.9999.ebuild
@@ -64,10 +64,10 @@ 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]
+	kde-frameworks/kdelibs:4[zeroconf?]
 	media-libs/phonon[qt4]
 	media-libs/qimageblitz
 	!aqua? (

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index aa5a870..2eb547a 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -64,10 +64,10 @@ 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]
+	kde-frameworks/kdelibs:4[zeroconf?]
 	media-libs/phonon[qt4]
 	media-libs/qimageblitz
 	!aqua? (

diff --git a/kde-plasma/breeze/breeze-5.8.49.9999.ebuild b/kde-plasma/breeze/breeze-5.8.49.9999.ebuild
index 97e99b0..49de477 100644
--- a/kde-plasma/breeze/breeze-5.8.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.8.49.9999.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-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
index 97e99b0..49de477 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.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/oxygen/oxygen-5.8.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild
index 9b83839..5bc8b93 100644
--- a/kde-plasma/oxygen/oxygen-5.8.49.9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.8.49.9999.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-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
index 9b83839..5bc8b93 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-9999.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/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 3d5a960..6f6911c 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -7,3 +7,4 @@ move kde-apps/kdiagram dev-libs/kdiagram
 move media-sound/kwave kde-apps/kwave
 slotmove app-office/libalkimia 5 0
 move media-libs/prison kde-frameworks/prison
+move kde-base/kdelibs kde-frameworks/kdelibs