Blargh. Undid that again, the patch belongs to another ebuild. :|

(Portage version: 2.1.10.36/cvs/Linux x86_64)

3 files changed, 9 insertions, 39 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index e00547bd0886..322884d43695 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.133 2011/11/20 21:57:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.134 2011/11/20 22:04:14 dilfridge Exp $
+
+*plasma-workspace-4.7.3-r4 (20 Nov 2011)
+
+  20 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -plasma-workspace-4.7.3-r3.ebuild, +plasma-workspace-4.7.3-r4.ebuild,
+  -files/plasma-workspace-4.7.3-customcont.patch:
+  Blargh. Undid that again, the patch belongs to another ebuild. :|
 
 *plasma-workspace-4.7.3-r3 (20 Nov 2011)
 
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-customcont.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-customcont.patch
deleted file mode 100644
index 74a1a93c6b48..000000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-customcont.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 5aad39dbb324aad4cac3f44967ee1fc1b3d2a168
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Sun Nov 20 18:50:41 2011 +0100
-
-    don't count custom panel contaiments (e.g. the grouping desktop) the same as a desktop containment
-    
-    from the "useful things missing from bug reports" and "wondering wtf is wrong with people
-    while trying to get the useful bits out of a bug report" files ...
-    
-    BUG:260360
-
-diff --git a/plasma/containment.cpp b/plasma/containment.cpp
-index 00a8a77..9e3a505 100644
---- a/plasma/containment.cpp
-+++ b/plasma/containment.cpp
-@@ -987,7 +987,9 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
-     //kDebug() << activity() << "setting screen to " << newScreen << newDesktop << "and type is" << type;
- 
-     Containment *swapScreensWith(0);
--    if (type == Containment::DesktopContainment || type >= Containment::CustomContainment) {
-+    const bool isDesktopContainment = type == Containment::DesktopContainment ||
-+                                      type == Containment::CustomContainment;
-+    if (isDesktopContainment) {
-         // we want to listen to changes in work area if our screen changes
-         if (toolBox) {
-             if (screen < 0 && newScreen > -1) {
-@@ -1011,8 +1013,7 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
-         }
-     }
- 
--    if (newScreen < numScreens && newScreen > -1 &&
--        (type == Containment::DesktopContainment || type >= Containment::CustomContainment)) {
-+    if (newScreen < numScreens && newScreen > -1 && isDesktopContainment) {
-         q->resize(corona->screenGeometry(newScreen).size());
-     }
- 
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r4.ebuild
index e371ebdaead5..9a163a494d48 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r3.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r3.ebuild,v 1.1 2011/11/20 21:57:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.7.3-r4.ebuild,v 1.1 2011/11/20 22:04:14 dilfridge Exp $
 
 EAPI=4
 
@@ -76,7 +76,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${PN}-4.7.3-weathercrash.patch"
 	"${FILESDIR}/${PN}-4.7.3-taskcrash.patch"
-	"${FILESDIR}/${PN}-4.7.3-customcont.patch"
 )
 
 pkg_setup() {