diff options
25 files changed, 24 insertions, 23 deletions
diff --git a/dev-util/kdevelop/kdevelop-4.7.2.ebuild b/dev-util/kdevelop/kdevelop-4.7.2.ebuild index 2d5df824efcc..c2aeedc71cfa 100644 --- a/dev-util/kdevelop/kdevelop-4.7.2.ebuild +++ b/dev-util/kdevelop/kdevelop-4.7.2.ebuild @@ -22,8 +22,8 @@ DEPEND=" dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( - $(add_kdebase_dep libkworkspace) kde-plasma/ksysguard:4 + kde-plasma/libkworkspace:4 ) okteta? ( $(add_kdeapps_dep okteta) ) qthelp? ( dev-qt/qthelp:4 ) diff --git a/dev-util/kdevelop/kdevelop-4.7.3.ebuild b/dev-util/kdevelop/kdevelop-4.7.3.ebuild index c73179e82eb9..042285bd6126 100644 --- a/dev-util/kdevelop/kdevelop-4.7.3.ebuild +++ b/dev-util/kdevelop/kdevelop-4.7.3.ebuild @@ -22,8 +22,8 @@ DEPEND=" dev-libs/qjson dev-qt/qtdeclarative:4[webkit] gdbui? ( - $(add_kdebase_dep libkworkspace) kde-plasma/ksysguard:4 + kde-plasma/libkworkspace:4 ) okteta? ( $(add_kdeapps_dep okteta) ) qthelp? ( dev-qt/qthelp:4 ) diff --git a/kde-apps/kget/kget-16.04.3.ebuild b/kde-apps/kget/kget-16.04.3.ebuild index effda83328e0..89d517be7924 100644 --- a/kde-apps/kget/kget-16.04.3.ebuild +++ b/kde-apps/kget/kget-16.04.3.ebuild @@ -14,8 +14,8 @@ IUSE="debug bittorrent gpg mms sqlite webkit" RDEPEND=" $(add_kdeapps_dep libkonq) - $(add_kdebase_dep libkworkspace '' 4.11) app-crypt/qca:2[qt4] + kde-plasma/libkworkspace:4 bittorrent? ( >=net-libs/libktorrent-1.0.3:4 ) gpg? ( || ( $(add_kdeapps_dep gpgmepp) $(add_kdeapps_dep kdepimlibs) ) ) mms? ( media-libs/libmms ) diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild index 8e58260a2763..d249f8382e1d 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild @@ -73,7 +73,6 @@ RDEPEND=" !minimal? ( $(add_kdeapps_dep kdepasswd) $(add_kdebase_dep klipper) - $(add_kdebase_dep libkworkspace) $(add_kdebase_dep libplasmaclock) $(add_kdebase_dep libplasmagenericshell) $(add_kdebase_dep libtaskmanager) @@ -88,6 +87,7 @@ RDEPEND=" kde-plasma/ksysguard:4 kde-plasma/ksystraycmd:4 kde-plasma/kwrited:4 + kde-plasma/libkworkspace:4 kde-plasma/liboxygenstyle:4 kde-plasma/powerdevil:4 kde-plasma/qguiplatformplugin_kde:4 diff --git a/kde-base/kdm/kdm-4.11.22.ebuild b/kde-base/kdm/kdm-4.11.22.ebuild index 3be99e485b6a..1ab6487d7516 100644 --- a/kde-base/kdm/kdm-4.11.22.ebuild +++ b/kde-base/kdm/kdm-4.11.22.ebuild @@ -15,7 +15,7 @@ IUSE="debug +consolekit kerberos pam systemd" REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )" DEPEND=" - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 media-libs/qimageblitz x11-libs/libX11 x11-libs/libXau diff --git a/kde-base/klipper/klipper-4.11.22.ebuild b/kde-base/klipper/klipper-4.11.22.ebuild index 8aff3988f25d..acb62faa5fda 100644 --- a/kde-base/klipper/klipper-4.11.22.ebuild +++ b/kde-base/klipper/klipper-4.11.22.ebuild @@ -14,7 +14,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug prison" DEPEND=" - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 $(add_kdebase_dep libtaskmanager) sys-libs/zlib x11-libs/libX11 diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild index bee1ceed8106..82f9b49b120a 100644 --- a/kde-base/krunner/krunner-4.11.22.ebuild +++ b/kde-base/krunner/krunner-4.11.22.ebuild @@ -15,11 +15,11 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" DEPEND=" $(add_kdebase_dep ksmserver) - $(add_kdebase_dep libkworkspace) $(add_kdebase_dep libplasmagenericshell) kde-plasma/kcheckpass:4 kde-plasma/kephal:4 kde-plasma/ksysguard:4 + kde-plasma/libkworkspace:4 !aqua? ( x11-libs/libX11 x11-libs/libXcursor diff --git a/kde-base/ksmserver/ksmserver-4.11.22.ebuild b/kde-base/ksmserver/ksmserver-4.11.22.ebuild index e71be42c5934..2f92cc895093 100644 --- a/kde-base/ksmserver/ksmserver-4.11.22.ebuild +++ b/kde-base/ksmserver/ksmserver-4.11.22.ebuild @@ -14,7 +14,7 @@ IUSE="debug" DEPEND=" kde-plasma/kcminit:4 - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 media-libs/qimageblitz x11-libs/libICE x11-libs/libSM diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild index c00c81a62c0b..a5ff8beed9c0 100644 --- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild +++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild @@ -15,7 +15,7 @@ IUSE="debug test" DEPEND=" kde-plasma/kephal:4 - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 x11-libs/libX11 " RDEPEND="${DEPEND}" diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild index c5f000330cb3..504ce9db7001 100644 --- a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild +++ b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild @@ -14,9 +14,9 @@ IUSE="debug" DEPEND=" $(add_kdebase_dep kactivities) - $(add_kdebase_dep libkworkspace) kde-plasma/kephal:4 kde-plasma/ksysguard:4 + kde-plasma/libkworkspace:4 x11-libs/libX11 " RDEPEND="${DEPEND}" diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild index 2dd4d8f0e1b0..44e57e5d7d5f 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild @@ -24,12 +24,12 @@ COMMONDEPEND=" >=dev-qt/qtcore-4.8.4-r3:4 !kde-misc/ktouchpadenabler $(add_kdebase_dep kactivities) - $(add_kdebase_dep libkworkspace) $(add_kdebase_dep libplasmaclock 'kdepim?') $(add_kdebase_dep libplasmagenericshell) $(add_kdebase_dep libtaskmanager) kde-plasma/kephal:4 kde-plasma/ksysguard:4 + kde-plasma/libkworkspace:4 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage diff --git a/kde-misc/homerun/homerun-1.2.5.ebuild b/kde-misc/homerun/homerun-1.2.5.ebuild index ab64b9f5e9fd..02ffaad634f4 100644 --- a/kde-misc/homerun/homerun-1.2.5.ebuild +++ b/kde-misc/homerun/homerun-1.2.5.ebuild @@ -22,7 +22,7 @@ IUSE="debug" DEPEND=" $(add_kdeapps_dep libkonq) - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 " RDEPEND=" ${DEPEND} diff --git a/kde-misc/krunner-googletranslate/krunner-googletranslate-0.1.ebuild b/kde-misc/krunner-googletranslate/krunner-googletranslate-0.1.ebuild index d863da0d26ea..690b5b57590f 100644 --- a/kde-misc/krunner-googletranslate/krunner-googletranslate-0.1.ebuild +++ b/kde-misc/krunner-googletranslate/krunner-googletranslate-0.1.ebuild @@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND=" - $(add_kdebase_dep libkworkspace) dev-libs/qjson + kde-plasma/libkworkspace:4 " DEPEND=" ${RDEPEND} diff --git a/kde-misc/krunner-kopete-contacts/krunner-kopete-contacts-0.4.ebuild b/kde-misc/krunner-kopete-contacts/krunner-kopete-contacts-0.4.ebuild index f6c587c92e68..8d6914e29dd1 100644 --- a/kde-misc/krunner-kopete-contacts/krunner-kopete-contacts-0.4.ebuild +++ b/kde-misc/krunner-kopete-contacts/krunner-kopete-contacts-0.4.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 $(add_kdeapps_dep kopete) " RDEPEND="${DEPEND}" diff --git a/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild b/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild index df79132eef7b..4b2289a7f8f3 100644 --- a/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild +++ b/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild @@ -18,7 +18,7 @@ IUSE="" DEPEND=" $(add_kdebase_dep kactivities) - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 $(add_kdebase_dep plasma-workspace) " RDEPEND=${DEPEND} diff --git a/kde-plasma/khotkeys/khotkeys-4.11.22.ebuild b/kde-plasma/khotkeys/khotkeys-4.11.22.ebuild index f884f8ff224a..3b7aa67aeda1 100644 --- a/kde-plasma/khotkeys/khotkeys-4.11.22.ebuild +++ b/kde-plasma/khotkeys/khotkeys-4.11.22.ebuild @@ -12,7 +12,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 x11-libs/libX11 x11-libs/libXtst " diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild b/kde-plasma/kwin/kwin-4.11.22.ebuild index 9ec7cdb0aadf..1884ea8f6a85 100644 --- a/kde-plasma/kwin/kwin-4.11.22.ebuild +++ b/kde-plasma/kwin/kwin-4.11.22.ebuild @@ -22,8 +22,8 @@ IUSE="debug gles opengl wayland" COMMONDEPEND=" $(add_kdebase_dep kactivities) $(add_kdebase_dep kdelibs opengl) - $(add_kdebase_dep libkworkspace) kde-plasma/kephal:4 + kde-plasma/libkworkspace:4 kde-plasma/liboxygenstyle:4 x11-libs/libICE x11-libs/libSM diff --git a/kde-base/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index db5163f83985..db5163f83985 100644 --- a/kde-base/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest diff --git a/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild b/kde-plasma/libkworkspace/libkworkspace-4.11.22.ebuild index 5e74252151dc..7b7dbcf8b5d9 100644 --- a/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-4.11.22.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$ @@ -8,7 +8,7 @@ KMNAME="kde-workspace" KMMODULE="libs/kworkspace" inherit kde4-meta -DESCRIPTION="A library for KDE desktop applications" +DESCRIPTION="A library for Plasma desktop applications" KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="debug" diff --git a/kde-base/libkworkspace/metadata.xml b/kde-plasma/libkworkspace/metadata.xml index 0cf59224b009..0cf59224b009 100644 --- a/kde-base/libkworkspace/metadata.xml +++ b/kde-plasma/libkworkspace/metadata.xml diff --git a/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild b/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild index a01d55bb3fb5..dadadaffd40d 100644 --- a/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild +++ b/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild @@ -14,7 +14,7 @@ IUSE="debug +pm-utils" DEPEND=" $(add_kdebase_dep kactivities) - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 !aqua? ( x11-libs/libX11 x11-libs/libXext diff --git a/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild index afc05d52992f..0d62d2e0f470 100644 --- a/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild +++ b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" COMMONDEPEND=" dev-libs/glib:2 kde-plasma/kwin:4 - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 diff --git a/net-nntp/kwooty/kwooty-1.1.0.ebuild b/net-nntp/kwooty/kwooty-1.1.0.ebuild index 300c3366ecb1..1f5ba8c2f859 100644 --- a/net-nntp/kwooty/kwooty-1.1.0.ebuild +++ b/net-nntp/kwooty/kwooty-1.1.0.ebuild @@ -17,7 +17,7 @@ KEYWORDS="amd64 x86" IUSE="debug" DEPEND=" - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 " RDEPEND=" ${DEPEND} diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 index 39f8b2c8d886..e5f1e650af0f 100644 --- a/profiles/updates/4Q-2016 +++ b/profiles/updates/4Q-2016 @@ -40,3 +40,4 @@ move kde-base/ksystraycmd kde-plasma/ksystraycmd move kde-base/kstartupconfig kde-plasma/kstartupconfig move kde-base/qguiplatformplugin_kde kde-plasma/qguiplatformplugin_kde move kde-base/ksplash kde-plasma/ksplash +move kde-base/libkworkspace kde-plasma/libkworkspace diff --git a/x11-themes/smaragd/smaragd-0.0.7.ebuild b/x11-themes/smaragd/smaragd-0.0.7.ebuild index 81248dad99e5..9189dc209370 100644 --- a/x11-themes/smaragd/smaragd-0.0.7.ebuild +++ b/x11-themes/smaragd/smaragd-0.0.7.ebuild @@ -17,7 +17,7 @@ SLOT="4" IUSE="debug" DEPEND=" - $(add_kdebase_dep libkworkspace) + kde-plasma/libkworkspace:4 x11-libs/cairo " RDEPEND=" |