Remove old.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 14 insertions, 210 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index be7afc125b49..c9384a35c563 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.327 2013/05/06 20:18:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.328 2013/05/10 18:06:59 kensington Exp $
+
+  10 May 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/kwin-4.10.1-nulluuid.patch, -files/kwin-4.10.1-unref.patch,
+  -kwin-4.10.2.ebuild:
+  Remove old.
 
 *kwin-4.10.3 (06 May 2013)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index af941d41415f..30162d8d5c32 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX kwin-4.10.1-nulluuid.patch 1494 SHA256 a7c14bbc4c0a66729c86a1965639eea30a12f1572dd977fb0e2ad40404754643 SHA512 a37f4c7fa60f5640632dd2adc02b6f61a72a816c8cc93e03992dfaac308fc9054e348ae1a5bcefa85c24de82ac4ff3e69b1849561506b6291dad31499ff6b4b2 WHIRLPOOL 29caf3d5eb86f0c450c09bcb436fe95369f186a92ac3cd54e69f72c9a1e02cd84deb4b8fe3ac79bdb1d858fbb63ecc9e9fb39d300aac6d069061a0575398d911
-AUX kwin-4.10.1-unref.patch 3654 SHA256 d5ecb27b5e2bde93abbfcb0b38bacb30a853ca938718d233ca59306cead2936f SHA512 6b505fa9e7e61372e68def7b9c7e355ad259dac023400a306e7701bc8de46b7b5da951a242f5fd0142d2319d501a143dc3658e2f72e0ef82b9e4c9b32715e5f9 WHIRLPOOL 06d7faf204dded7b4f712ca7300979c7cec1547dd4446894688d6de3643828130992f31b4e1d545822327fe943fe0b0996bef9bc457b1248f6c146a9725f3ccf
 AUX kwin-4.10.2-mesa.patch 2449 SHA256 d2a2d07f1749e3a8276c0f38c4d85525924b8abf8649b084f7411ba35e9b661c SHA512 b23989c02ca6f1c83a6360b6bee637c36de566358fba8f1cb457dbb63b90b0a0a4ab80ef913aaac7bfc2e00291a4f616dc496fbe78bac811adba996faa44506e WHIRLPOOL 459e84caf84c628d2214146a68cd09d368e1780e0f39e7a3ba6cff9d029c5f176078b4dd75f719eec76b38e397ad15b62ff66896f0c904fdb4fa632fd7c49400
 DIST kde-workspace-4.10.2.tar.xz 13564908 SHA256 36e429113b62b196ee2f259f0d16c19746c2705ebe225dec920aee49797b6867 SHA512 aa4b5b89026587282b34382e5d48e2ca51dd65b580f606d1f03dface3163c99d00d7ec6bbd234d886b00585534c294d1b8a5bfe368570a1fccae0e861c7c4dff WHIRLPOOL 78a9447f910a9e602e45867e0934970115307a94e363a6a20a64eb5bf0c5f3ee118107cedece6656b7ffc0fa3e5d708dc9644a98a895f507d4f03259614ac741
 DIST kde-workspace-4.10.3.tar.xz 13569364 SHA256 d870db2f39dcec6d4c11ccaef53d24978c1249a9426814414a90456d9cfce49d SHA512 d7e29ec5401e9aeb38e57257ada8060d0f684b2c057df809f519d8e89d94b39b9ef88435104caa8a056ec6337c54799909109d73d81104e27bc671e6099310ea WHIRLPOOL 476398ba07427979c253507dac6ca5b4ea29c4136b1fdd5613d5e017f8eab5930a614bb50efedd5f2ecea9e12e3527311ea9eb3aab0919e987b447d696f6096a
 EBUILD kwin-4.10.2-r1.ebuild 1597 SHA256 23125668efa51b25f6ba93a7406d2a342bab09aff34378966d685d5cd848a179 SHA512 ddb12e3709d6b1b547beafbbb381dcda75e4c2c4c3c452bf41735ea0f4f48e51e4f042a28de541a64d06e7e46662b7437be12c95b4a6a7c77f2341fea02e3abd WHIRLPOOL ad86ecfc35a7b6aedfd13ec3229c79a4973f343d66aa7e54454744679c9a2321591156713138e6dbd6c4fffb846855c333d18ceaf19fb96cab5768e65a110704
-EBUILD kwin-4.10.2.ebuild 1561 SHA256 0cd640644409db027b8541a38809dfff2f8d3b8c7b44527368ad4d5828c8bf85 SHA512 9b8698c806e46ae8c45f30047cc412bfad0c8a018e23305d6cfd6aba1182e4c179c05817cf346ff81d24a98608335fdd1d2c73182b120d5251acb218c7df5d88 WHIRLPOOL 5933559c83fa2590f1127cfcc2c94ef4880f74e08ce30ab6431d51bf9e6519454fb8fd9bc1849864a5477e0318e28d5b24d97c7b83132aef2fe4d6dccfd70150
 EBUILD kwin-4.10.3.ebuild 1696 SHA256 fbd4397038d04ff650570842f8a848ef737328affd11227959de089fbeaccd3f SHA512 c2eaa82c723f8a25ba50cadef8109b1d19e05aa564e70f9ced3484d3fe30563042bfd1c17eff8857254cec3b8de7797943d83b48c718cfe8a4eba918325b4a4d WHIRLPOOL 9ba8c5bf00be2d248d0289036838d01aa6538b5972398913b824fbf8a2f34cb539c1858214e80d3c07393eab716df17369cc2d885e41f79899e2aaea93df5d82
-MISC ChangeLog 40085 SHA256 9fa1fe78f5ae2280b5a143497f5afd6b873a32a1e54d7f499469550534e1ed34 SHA512 4975cf4c9459cfcdc52ad2e6450eb5915bcd3ae0b96239d7c84de90c89c96c61a81763e4764e1f1b84513ace31c0a11171bcc9928b3fcb6fc89aa676dcf5dafb WHIRLPOOL ff1fa8d69fb1ee8a6c7b0cc84599611200b62687b5b7c84ce59e3e8af29108561dc95e4fb266713e7a1c84fa3eed85dfe31386f699f808e60de26dc75a2a97ac
+MISC ChangeLog 40254 SHA256 4730fbc2c25ca8d03743056627878bf3e658796301527f89ba6ef454b728bbf1 SHA512 ffa847ca438285c7a5e528c544d037fa121e4b73b568c8df21feb18890e63a22fa05d7fa4d2cdb2c7f1c5ee8295b4e62451f2352391d8a1e49f467cc19cacaf5 WHIRLPOOL 4b82aa7a1b9a11e1ffcbd6936502cee69c6aa980123f5c7e06040886d9085531174ebebeecb25bc58db2999b9b56104a39d57ac6f8e1c2b70b422406727fff5d
 MISC metadata.xml 229 SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7 SHA512 357e165f3706a18dbab9ce108b28d7b3338e3a458fb9d184d701e7fd932f41d1abdc7785bdd22003b2bd2d702674b3dcc206b39e141d8c3adfda7d6d1d1ec0d8 WHIRLPOOL fd66f59afef8829e84f2be5f0782511e6b16dbd811d432205eaf629470055d1d4173d135a59b95668500c4b4cb15bcf9f6230e96aecf5f0e1d5338d4d4881018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRiBBuAAoJEO+t9ga+3I3anosH/imkS1JXtrg43f2GOSo2CLc2
-jjTSZDka/VZMgrTk1DQjOpY/92fSeDaL6DvNO+EE2GtRYCdJBewYdUpBwAkYS+B6
-tKb8RlSiS87NGNMWBJI2q6GZM+nufCvoOU317xjf64pLSuB3/STWzUz/fD+R+jyB
-MJ2LzICYcsMZVGeovkqfvm3CiuXvuM+Bzwf9PqxUSvOcljXvX1JaLM9N56q+JD+V
-iU+zVcyxoXkn4hAFNGpU1pf+f1TabVSHm1B3fNoqOSZenWMxsr2YZYwq0/1HdfU7
-+qiheUOm6RJfpv9WsYuLWX+VetlDHZGLAYQWcRPwvmOsAWAo+QVgVu5OHBAJ5UA=
-=bfky
+iQEcBAEBCAAGBQJRjTcEAAoJEMbwO6tnXQ0smtwH/jRhSWAmruY0J9sFLBv0BU4T
+E/egxfnz4B5btbZPGlW2cNLTIZRtDOGHgfmFJds3JyXj9o2TUZ1X3o+7frybnwMt
+tW8633s6zkDTa/yGR9/WvnBLGSn9IODwtCoBba+INMNc5HxBkI61zf7UVOH7PnWE
+cD5qk3UHvz/Hg9V81uJTM6oc7GTc+0F/ddnjx/qcc8at12PlPW/UIHJCrCnNLeEV
+cEdIJjIKab/ZVcAQh0ejLEywv5/7OkUKRfYqi52ltHF9o9jO8g5rpkdTW776vmtb
++s5bRNBNyuINaukbA3gcIayzIOo1e4mDPFBgRZ+hgL34N2v2cI69G5HJaK6irus=
+=V56M
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.10.1-nulluuid.patch b/kde-base/kwin/files/kwin-4.10.1-nulluuid.patch
deleted file mode 100644
index 184c73c05b9f..000000000000
--- a/kde-base/kwin/files/kwin-4.10.1-nulluuid.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 569f79c60f8fd2b3e655433c2c53f840b4c103e9
-Author: Thomas Lübking <thomas.luebking@gmail.com>
-Date:   Sat Mar 2 22:27:20 2013 +0100
-
-    Map NULL_UUID activity to ALL activities
-    
-    REVIEW: 109274
-    BUG: 314830
-    FIXED-IN: 4.10.2
-
-diff --git a/kwin/client.cpp b/kwin/client.cpp
-index 5fb6dcb..e16a1fe 100644
---- a/kwin/client.cpp
-+++ b/kwin/client.cpp
-@@ -1518,12 +1518,16 @@ void Client::setOnActivity(const QString &activity, bool enable)
- /**
-  * set exactly which activities this client is on
-  */
-+#define NULL_UUID "00000000-0000-0000-0000-000000000000"
- void Client::setOnActivities(QStringList newActivitiesList)
- {
-     QString joinedActivitiesList = newActivitiesList.join(",");
-     joinedActivitiesList = rules()->checkActivity(joinedActivitiesList, false);
-     newActivitiesList = joinedActivitiesList.split(',', QString::SkipEmptyParts);
- 
-+    if (newActivitiesList.contains(NULL_UUID))
-+        newActivitiesList.clear(); // turn into "all"
-+
-     QStringList allActivities = workspace()->activityList();
-     if ( newActivitiesList.isEmpty() ||
-         (newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count()) ||
-@@ -2380,6 +2384,12 @@ void Client::checkActivities()
-     }
- 
-     newActivitiesList = QString(prop).split(',');
-+
-+    if (newActivitiesList.contains(NULL_UUID)) {
-+        setOnAllActivities(true);
-+        return;
-+    }
-+
-     if (newActivitiesList == activityList)
-         return; //expected change, it's ok.
- 
diff --git a/kde-base/kwin/files/kwin-4.10.1-unref.patch b/kde-base/kwin/files/kwin-4.10.1-unref.patch
deleted file mode 100644
index ebbbd117b47c..000000000000
--- a/kde-base/kwin/files/kwin-4.10.1-unref.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 342f3a9ff2d9587601039605e42df873fa7b75a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
-Date: Mon, 11 Mar 2013 16:19:16 +0100
-Subject: [PATCH] keep + track m_closeWindow to keep m_winData alive
-
-BUG: 259640
-FIXED-IN: 4.10.2
-REVIEW: 109509
----
- kwin/effects/presentwindows/presentwindows.cpp | 26 ++++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/kwin/effects/presentwindows/presentwindows.cpp b/kwin/effects/presentwindows/presentwindows.cpp
-index 7a59aec..79baadb 100755
---- a/kwin/effects/presentwindows/presentwindows.cpp
-+++ b/kwin/effects/presentwindows/presentwindows.cpp
-@@ -64,6 +64,7 @@ PresentWindowsEffect::PresentWindowsEffect()
-     , m_highlightedWindow(NULL)
-     , m_filterFrame(NULL)
-     , m_closeView(NULL)
-+    , m_closeWindow(NULL)
-     , m_dragInProgress(false)
-     , m_dragWindow(NULL)
-     , m_highlightedDropTarget(NULL)
-@@ -217,7 +218,7 @@ void PresentWindowsEffect::postPaintScreen()
- {
-     if (m_motionManager.areWindowsMoving())
-         effects->addRepaintFull();
--    else if (!m_activated && m_motionManager.managingWindows()) {
-+    else if (!m_activated && m_motionManager.managingWindows() && !m_closeWindow) {
-         // We have finished moving them back, stop processing
-         m_motionManager.unmanageAll();
- 
-@@ -261,7 +262,7 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
- {
-     // TODO: We should also check to see if any windows are fading just in case fading takes longer
-     //       than moving the windows when the effect is deactivated.
--    if (m_activated || m_motionManager.areWindowsMoving()) {
-+    if (m_activated || m_motionManager.areWindowsMoving() || m_closeWindow) {
-         DataHash::iterator winData = m_windowData.find(w);
-         if (winData == m_windowData.end()) {
-             effects->prePaintWindow(w, data, time);
-@@ -306,6 +307,9 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
-                 // we have to keep the window in the list to prevent flickering
-                 winData->referenced = false;
-                 w->unrefWindow();
-+                if (w == m_closeWindow) {
-+                    m_closeWindow = NULL;
-+                }
-             } else
-                 w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DELETE);
-         }
-@@ -437,6 +441,15 @@ void PresentWindowsEffect::slotWindowAdded(EffectWindow *w)
-         rearrangeWindows();
-     }
-     if (m_closeView && w == effects->findWindow(m_closeView->winId())) {
-+        if (m_closeWindow != w) {
-+            DataHash::iterator winDataIt = m_windowData.find(m_closeWindow);
-+            if (winDataIt != m_windowData.end()) {
-+                if (winDataIt->referenced) {
-+                    m_closeWindow->unrefWindow();
-+                }
-+                m_windowData.erase(winDataIt);
-+            }
-+        }
-         winData->visible = true;
-         winData->highlight = 1.0;
-         m_closeWindow = w;
-@@ -452,13 +465,14 @@ void PresentWindowsEffect::slotWindowClosed(EffectWindow *w)
-     if (winData == m_windowData.end())
-         return;
-     winData->deleted = true;
--    winData->referenced = true;
--    w->refWindow();
-+    if (!winData->referenced) {
-+        winData->referenced = true;
-+        w->refWindow();
-+    }
-     if (m_highlightedWindow == w)
-         setHighlightedWindow(findFirstWindow());
-     if (m_closeWindow == w) {
--        m_closeWindow = 0;
--        return; // don't rearrange
-+        return; // don't rearrange, get's nulled when unref'd
-     }
-     rearrangeWindows();
- 
--- 
-1.8.1.5
-
diff --git a/kde-base/kwin/kwin-4.10.2.ebuild b/kde-base/kwin/kwin-4.10.2.ebuild
deleted file mode 100644
index 9dc179a63ef7..000000000000
--- a/kde-base/kwin/kwin-4.10.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.2.ebuild,v 1.1 2013/04/06 00:04:39 dilfridge Exp $
-
-EAPI=5
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="always"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles opengl"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs opengl)
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	opengl? ( >=media-libs/mesa-7.10 )
-	gles? (
-		|| (  ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
-			>=media-libs/mesa-7.12[egl(+),gles2] )
-	)
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/scripts
-"
-
-KMEXTRACTONLY="
-	ksmserver/
-	libs/kephal/
-	libs/oxygen/
-"
-
-# you need one of these
-REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
-
-src_configure() {
-	# FIXME Remove when activity API moved away from libkworkspace
-	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
-	mycmakeargs=(
-		$(cmake-utils_use_with gles OpenGLES)
-		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
-		$(cmake-utils_use_with opengl OpenGL)
-		-DWITH_X11_Xcomposite=ON
-	)
-
-	kde4-meta_src_configure
-}