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

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

4 files changed, 24 insertions, 55 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/Manifest b/kde-base/plasma-workspace/Manifest
index e6de8ace702d..c63b9e3dc8eb 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -7,7 +7,6 @@ AUX plasma-workspace-4.6.2-optional_akonadi-server.patch 4897 RMD160 64260bce383
 AUX plasma-workspace-4.6.2-panelplacement.patch 14030 RMD160 6040b6a7acba19073f81483d4b6823638f791a22 SHA1 0e5b825b4d15362a0872f6d54f58c3f1ba4c174c SHA256 71ff67df3956806c9d949780245719dcea6837953ed555e6e7c5773dc3fbacb6
 AUX plasma-workspace-4.6.3-dduplicate.patch 835 RMD160 5231815b4a8c64ebeb4b8d77bdfa46512bd50ea8 SHA1 ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d SHA256 ea36fb98ed122dc039b28337df028887919bced1b1413c04fcb9488dfc87e108
 AUX plasma-workspace-4.6.3-gpsdapi.patch 2233 RMD160 d3d51fa4a07ad4f3719060dfcd03af0c15fccb8c SHA1 f91d01066241cd3e78b825addf360db23716bf52 SHA256 29939f28bc8fa93041ebcb44bde05cd5151559ec314a87e2628388b1f38c2288
-AUX plasma-workspace-4.7.3-customcont.patch 1673 RMD160 13de4a1b2026326ef91e27cea278fbab41b61b33 SHA1 0810ce778314ec89566ef290bb31ff016cecee78 SHA256 9821678b7422a6184e2a08bf01d37cab95affb32a1589571825bf10442577875
 AUX plasma-workspace-4.7.3-taskcrash.patch 9774 RMD160 3127550aaf2786bd418e44047474ce2766102dd3 SHA1 784c6bd6d6c0c9f0be2ed187949e4d1ddda11630 SHA256 980177f9e48481f6d593ff38c7214e3ed62a07f1690fe15b58aeda7d769e58df
 AUX plasma-workspace-4.7.3-weathercrash.patch 1248 RMD160 a6e636bb4a7718557ff9b90f96b838c0e518e196 SHA1 915594b561107980633da44a64d5b2da4d5dd968 SHA256 18f6af44a45841f1912eb73a0d3a93415b2665cd5e3e0352a13e58fc1ff7b141
 DIST kde-workspace-4.7.2.tar.bz2 20556305 RMD160 a3576eb82bfdba215f0fe44d3c5d616e9a79e024 SHA1 afd37b2f583690e391828c1ceb7311e2e8d37c6f SHA256 6a174d6780ad04700ec9eddfe2ed3d916aea018ad7fb93b04debc81f2d3f9eb0
@@ -17,23 +16,23 @@ DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338
 EBUILD plasma-workspace-4.6.3-r2.ebuild 3577 RMD160 d0ab587a6ecba68eae11c154bda402710792fc1e SHA1 586dd8977565a91c1ccc34767186fa0c413a8324 SHA256 1f2a8414b6939b95ebb960de43b1d958c91d6eff5cd8ef2b40552c4099296ff1
 EBUILD plasma-workspace-4.6.5.ebuild 3513 RMD160 b1169802a4c9b98b8ca5fe5b0f3a69050db3a74a SHA1 4980d0348ba428181bbe3b7d4cbec31dc5b998b4 SHA256 05d09ab7aa6a39159aa61ebcbf4179922c75baed5ee090912eea4f2c6c083a09
 EBUILD plasma-workspace-4.7.2-r1.ebuild 3464 RMD160 c3d04bb0978972b7d3fe51965146412db35f90e7 SHA1 aca6b98a355f2bc1e15cbd7bf3465c2c50d5da5c SHA256 752cb2e5e65a81af4af9ec67ac2e79c189e649afc082a4be5bd4b9727c5a0ffe
-EBUILD plasma-workspace-4.7.3-r3.ebuild 3602 RMD160 2cf9ce78fd15dc74c761269ec95fd64bf312b904 SHA1 47ff1b73a57bb8c199063214e6446ce69e80b05e SHA256 70d7efdd2341b9e60db1bb20a56ce838c746f12d6d951904ddb71f8c9316986f
-MISC ChangeLog 21186 RMD160 d1c4aab436a962d1d7cdf7076e52de9acba88576 SHA1 5abd8577a285cd396d323a309ce86035251ae1ac SHA256 e2d0a60b3d9cff03f9006c5a5a120528f0c92c46597f2d6fed2999e6d2169843
+EBUILD plasma-workspace-4.7.3-r4.ebuild 3558 RMD160 ffab83aaa6de5d7a2ca0a60cbbc7aca6d9cdc804 SHA1 8f386e1f5995402049ea6f3fa20586528c1ebf6f SHA256 21f73851d9f045c87724072efe40cd378910cb74ba537aeb94c34232c1e992fd
+MISC ChangeLog 21476 RMD160 da9a00137afe879125c7a9f7f8751e01b243ffdc SHA1 90748948dafc943e351d63d8c54ce4da6b0ceea5 SHA256 09229e44f5cb3d0fea427f2330001a7f3460437d4db35c94ace190eaf8ce8f7b
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOyXfeAAoJENwGBM22xffeqFoP/RO6ZCdDD553T0hIHHk43/IX
-hm41plUnEFR7PQiPxuWFxLIoPJ+rHGlSNiiLMxDfhjlf++XBNdpM0d34MJe5l8jV
-ZvUxcgOhZDdM12bRiJu3dulkQ8noBrOaYb9iKCW6jDATPPw9/2MnUnhszWzC3vJN
-8KT8N8cSN0eggdzAPjAlO8w7PzayZdCloxdZKXUlYV1DKQMi7D9wy81aZjC1diDE
-G/D8/cbf/IumjRwF21Zg/RsjiZKakoqlGxJIYl/f2yK2PisC41puJXMGOuv1w6yl
-MEgvOQNSYHBTPJ2hg4cvwnEF6BnNzRbQG2L/JfvNKBBGZexeQCFJB4syQLErEPYQ
-4y65Q8jg5l/bIrbJ+WgpeFGrr524BogCApYFDE7CjECNz5RuCNkcDOjyuYazGUlY
-l1wogmbMTbOUMNbK8OMAJwkqkA4Qf51hwkJ5tY4dHqtDllO9mN92HpiGcy8HMlPj
-QS0DrgLbtrutB0USjgUfBgDPns9yH/Djb5JAu4ISxHgVTr/05bPJqOtmP4IpVgvg
-hM7auUfEH2bR3sEe9qV/vHHXvHJvoPF2kToBhowP2kvVcXGJDS9+MsJAqenudcdW
-LYASJX7ixW0S1m49puIfKd0d8j04r0Wbz0iyNeJpiOVlRet5SoqPJA6uWU1S0ALh
-t0sVOis/vnYlWYN45vA8
-=vkto
+iQIcBAEBCgAGBQJOyXlkAAoJENwGBM22xffe1JMP/R39rHFvyRDYMK/1toYpU7It
+iAqV+oPJ3LfGBMIU6IHx1E0AxAePGhECJbsXXM7xXkaGzeRSrSIa5mtsTargNVEb
+L2R7QH60sUILB73YRDRDCPEW+XloaKPXKkgQwijaNXE7SOSkqUeoyY4sfW+FaAF8
+nHjHUNsXD449SnuwCzOzkAE8fwcIWIu3vfwkY4M5veOmaQdXCN43tSbmcQpzeMec
+kOyJf2IwElOu+3nLV1aoWiB+JB6pBZsUHmFTUrN3aeAUa8y2BSZDRSud2fTdaVnu
+FdQI8n41g7gXlVmeZ5BIW9HHxXXiEpHMBru60Ht8tnGgwEEHwwRwNi0/N9fBCaLX
+aNutpXOwjyIzTOfIr1+yqL9PDs0CwOtP4ROZRAyU0eeSsYcLs6SaBu97npfMvIde
+4tfsmOeiI5Hcgme/xlDJ/pnqLxNFDJExBnD8sc3+M2lKHR+YwnD5wdyFTiym8Sfg
+82lS0Yv8JpuU21ivQ6sZv+ea3DhhYCDm+ZlvA5o/jPYP4QeGfuH5kS8SXE9m0vEe
+PYAO2iMq0chUZ5uRwUCr0BvyzA6hS4JlOY1bfXND8Vcj4+GLyKMOXjN6/rBb81q6
+x3HCqpMBpw1ADAHhhA3T37NqeVY9+jBK+NCAQpoydMKwcXCX4jgseGA9bQUZJ8Dk
++Z4o0F0vvzWzajnrSSeo
+=wV6X
 -----END PGP SIGNATURE-----
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() {