Initial import of the local overlay.

4 files changed, 263 insertions, 0 deletions

diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
new file mode 100755
index 0000000..37ee17d
--- /dev/null
+++ b/kde-base/plasma-workspace/Manifest
@@ -0,0 +1,4 @@
+AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
+AUX taskbar-patch.diff 3727 RMD160 448bd7144999eab64573549c0b6a5e9da2cf5749 SHA1 9d6ba94689839103ca13769b7ffed739879a2a2c SHA256 e1bb5847c2bf5b11715d4db645c28a018f76b85aebefb1f5a2d91707f82aee9a
+DIST kde-workspace-4.7.0.tar.bz2 20049430 RMD160 20520845b336d9485bb2149191ad9f5e6a90824d SHA1 cbc61a20013c746f424681020c29480c6249fd10 SHA256 7e30d1a493b2b8981790a255edf0003bab19bf4dc3e77c37694da495a33a3468
+EBUILD plasma-workspace-4.7.0.ebuild 3451 RMD160 c0ab6f67b4d120a93fbe82b347e414cf946cf63e SHA1 b967b7240fd98e744a0561b5fb993638f2c6031c SHA256 c9644d19b3019717adec07e9c92857f0643b98df0764a3716b8760ab92fb9687
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
new file mode 100755
index 0000000..5596f41
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
@@ -0,0 +1,18 @@
+diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
+--- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake	2009-11-21 10:44:36.000000000 +0100
++++ kdebase-workspace-4.4.2/ConfigureChecks.cmake	2010-04-02 00:04:32.000000000 +0200
+@@ -71,7 +71,14 @@
+ macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
+ macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
+ macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
++
++if(NOT WITH_X11_Xinerama)
++  set(X11_Xinerama_FOUND FALSE)
++  MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
++endif(NOT WITH_X11_Xinerama)
++
+ macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
++
+ macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
+ macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
diff --git a/kde-base/plasma-workspace/files/taskbar-patch.diff b/kde-base/plasma-workspace/files/taskbar-patch.diff
new file mode 100755
index 0000000..6e335e9
--- /dev/null
+++ b/kde-base/plasma-workspace/files/taskbar-patch.diff
@@ -0,0 +1,99 @@
+commit 00b03781b8106cc9d079d133373af88b23522fc1
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Thu Aug 11 16:53:36 2011 +0200
+
+    if we are supposd to skip a task .. still check for startup items.
+    
+    this should prevent the ghost-in-the-taskbar bugs
+
+diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp
+index 4d8e4d9..854db2e 100644
+--- a/libs/taskmanager/groupmanager.cpp
++++ b/libs/taskmanager/groupmanager.cpp
+@@ -233,14 +233,15 @@ bool GroupManagerPrivate::addTask(TaskPtr task)
+              << task->className()
+              << task->classClass(); */
+ 
++    bool skip = false;
+     if (!task->showInTaskbar()) {
+         //kDebug() << "Do not show in taskbar";
+-        return false;
++        skip = true;
+     }
+ 
+     if (showOnlyCurrentScreen && !task->isOnScreen(currentScreen)) {
+         //kDebug() << "Not on this screen and showOnlyCurrentScreen";
+-        return false;
++        skip = true;
+     }
+ 
+     // Should the Task be displayed ? We always display if attention is demaded
+@@ -250,25 +251,25 @@ bool GroupManagerPrivate::addTask(TaskPtr task)
+         if (showOnlyCurrentDesktop && !task->isOnCurrentDesktop()) {
+             /* kDebug() << "Not on this desktop and showOnlyCurrentDesktop"
+                      << KWindowSystem::currentDesktop() << task->desktop(); */
+-            return false;
++            skip = true;
+         }
+ 
+         if (showOnlyCurrentActivity && !task->isOnCurrentActivity()) {
+             /* kDebug() << "Not on this desktop and showOnlyCurrentActivity"
+                      << KWindowSystem::currentActivity() << task->desktop(); */
+-            return false;
++            skip = true;
+         }
+ 
+         if (showOnlyMinimized && !task->isMinimized()) {
+             //kDebug() << "Not minimized and only showing minimized";
+-            return false;
++            skip = true;
+         }
+ 
+         NET::WindowType type = task->info().windowType(NET::NormalMask | NET::DialogMask |
+                                                     NET::OverrideMask | NET::UtilityMask);
+         if (type == NET::Utility) {
+             //kDebug() << "skipping utility window" << task->name();
+-            return false;
++            skip = true;
+         }
+ 
+             //TODO: should we check for transiency? if so the following code can detect it.
+@@ -288,14 +289,14 @@ bool GroupManagerPrivate::addTask(TaskPtr task)
+ 
+     //Ok the Task should be displayed
+     TaskItem *item = qobject_cast<TaskItem*>(currentRootGroup()->getMemberByWId(task->window()));
+-    if (!item) {
+-        // first search for an existing startuptask for this task
++    if (!item || skip) {
++        TaskItem *startupItem = 0;
+         QHash<StartupPtr, TaskItem *>::iterator it = startupList.begin();
+         QHash<StartupPtr, TaskItem *>::iterator itEnd = startupList.end();
+         while (it != itEnd) {
+             if (it.key()->matchesWindow(task->window())) {
+                 //kDebug() << "startup task found";
+-                item = it.value();
++                item = startupItem = it.value();
+                 startupList.erase(it);
+                 QObject::disconnect(item, 0, q, 0);
+                 item->setTaskPointer(task);
+@@ -304,6 +305,12 @@ bool GroupManagerPrivate::addTask(TaskPtr task)
+             ++it;
+         }
+ 
++        // if we are to skip because we don't display, we simply delete the startup related to it
++        if (skip) {
++            delete startupItem;
++            return false;
++        }
++
+         if (!item) {
+             item = new TaskItem(q, task);
+         }
+@@ -324,7 +331,6 @@ bool GroupManagerPrivate::addTask(TaskPtr task)
+     }
+ 
+     geometryTasks.insert(task.data());
+-
+     return true;
+ }
+ 
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.0.ebuild
new file mode 100755
index 0000000..9e0bada
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.0.ebuild,v 1.2 2011/08/06 16:32:09 dilfridge Exp $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		>=dev-python/sip-4.7.1
+		$(add_kdebase_dep pykde4)
+	)
+	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	rss? ( dev-libs/boost )
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep activitymanager)
+	$(add_kdebase_dep plasma-runtime)
+"
+
+KMEXTRA="
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	  "${FILESDIR}/taskbar-patch.diff"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	rm -f \
+		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+		"${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4 \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			PyKDE4 \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}