kde-base/plasma-workspace -> kde-plasma/plasma-workspace

8 files changed, 125 insertions, 5 deletions

diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
index b4b5534f6440..74e41c07b216 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-4.14.3-r1.ebuild
@@ -20,7 +20,7 @@ RESTRICT=test
 COMMON_DEPEND="
 	app-crypt/qca:2[qt4(+)]
 	kde-plasma/krunner:4
-	$(add_kdebase_dep plasma-workspace '' 4.11)
+	kde-plasma/plasma-workspace:4
 	x11-misc/shared-mime-info
 	attica? ( dev-libs/libattica )
 	desktopglobe? ( $(add_kdeapps_dep marble) )
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
index 12a22c28a8db..fedfddb785fa 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
@@ -115,7 +115,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepasswd:4
 	!kde-apps/knetattach[handbook]
 	!kde-base/plasma-desktop:4
-	!kde-base/plasma-workspace:4
+	!kde-plasma/plasma-workspace:4
 	!kde-plasma/solid-actions-kcm:4
 	!kde-plasma/systemsettings:4
 	!kde-misc/kcm_touchpad
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
index 023719ccb4f9..46e1c4bf396b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
@@ -115,7 +115,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepasswd:4
 	!kde-apps/knetattach[handbook]
 	!kde-base/plasma-desktop:4
-	!kde-base/plasma-workspace:4
+	!kde-plasma/plasma-workspace:4
 	!kde-plasma/solid-actions-kcm:4
 	!kde-plasma/systemsettings:4
 	!kde-misc/kcm_touchpad
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index fac589a493df..578dee375b19 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST plasma-workspace-5.8.3.tar.xz 6955700 SHA256 8b2f455bdf355d7d771bd6fb4e19510ec4b131c093b23268cb9c1a321c75059a SHA512 7ed6887dfd7b10c98bfba128a7d0bc6b534f067f519495fb389023308bec178043154bbe755158df6dc65623987f390389b9fde1b9d1780a87fd4450e41bdbeb WHIRLPOOL 3afa4bba6148c4e14cd17e83b71c744288a802161a711179c12b3190dc27c746d97476c8148130fd0cb39505697da1c4044af613dd4ba8ebc3a7682f4022227e
 DIST plasma-workspace-5.8.4.tar.xz 7018972 SHA256 8d732e141ccf6f56c02fc8f4234323ceaf907d159a736f907715e84118cf8dc3 SHA512 5f28779fbd34522bdfe1818a4015bc033e102da7f0d34af2ed8068b91f4453f5a466606d7dc87dd904a6d01044cc146e5936ed8033ce7302de2fab8408ff6252 WHIRLPOOL 70c4e5b29eef525096bc90353fa96aac52d6670b75ec9bb54d957f48b357ea662f983e06b61e43597004637c03a399fbb126261a1b93d2766572b2f236141749
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index bc65a860b673..25ab4b69b441 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
+		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
+		<flag name="pim">KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
 		<flag name="prison">Enable support for barcodes/QRcodes</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild
new file mode 100644
index 000000000000..c8e048cd340a
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+KMMODULE="plasma"
+PYTHON_COMPAT=( python2_7 )
+OPENGL_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+inherit python-single-r1 kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="debug gps json +pim python qalculate"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMONDEPEND="
+	dev-libs/libdbusmenu-qt
+	>=dev-qt/qtcore-4.8.4-r3:4
+	kde-frameworks/kactivities:4
+	kde-plasma/kephal:4
+	kde-plasma/ksysguard:4
+	kde-plasma/libkworkspace:4
+	kde-plasma/libplasmaclock:4[pim?]
+	kde-plasma/libplasmagenericshell:4
+	kde-plasma/libtaskmanager:4
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	json? ( dev-libs/qjson )
+	pim? ( $(add_kdeapps_dep kdepimlibs) )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.4.0[X,${PYTHON_USEDEP}]
+		$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	)
+	qalculate? ( sci-libs/libqalculate )
+"
+DEPEND="${COMMONDEPEND}
+	dev-libs/boost
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdeapps_dep plasma-runtime)
+"
+
+KMEXTRA="
+	appmenu/
+	ktouchpadenabler/
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	kcheckpass/
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	ksmserver/screenlocker/
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	libs/kdm/kgreeterplugin.h
+	ksysguard/
+"
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NepomukCore=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_Xmms=OFF
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with json QJSON)
+		$(cmake-utils_use_with pim Akonadi)
+		$(cmake-utils_use_with pim KdepimLibs)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with qalculate)
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	if use python; then
+		python_optimize "${ED}"
+	fi
+}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
index 12ee56ea8707..8fed1fb7c66b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
@@ -114,7 +114,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
 	!kde-plasma/ksplash:4
-	!kde-base/plasma-workspace:4
+	!kde-plasma/plasma-workspace:4
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
index 914572361bba..e8b62fcee1fa 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -113,7 +113,7 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/krunner:4
 	!kde-plasma/ksmserver:4
 	!kde-plasma/ksplash:4
-	!kde-base/plasma-workspace:4
+	!kde-plasma/plasma-workspace:4
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto