Add blocker for plasma-workspace-4.4 because of file collisions, bug 394997

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

5 files changed, 49 insertions, 39 deletions

diff --git a/kde-base/plasma-runtime/ChangeLog b/kde-base/plasma-runtime/ChangeLog
index 8da1692d59ee..36faf09eaa9e 100644
--- a/kde-base/plasma-runtime/ChangeLog
+++ b/kde-base/plasma-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.78 2011/12/11 18:52:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.79 2011/12/16 22:39:26 dilfridge Exp $
+
+  16 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  plasma-runtime-4.7.3.ebuild, plasma-runtime-4.7.4.ebuild:
+  Add blocker for plasma-workspace-4.4 because of file collisions, bug 394997
 
 *plasma-runtime-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/plasma-runtime/Manifest b/kde-base/plasma-runtime/Manifest
index 95d3202f047a..99b83d691c0e 100644
--- a/kde-base/plasma-runtime/Manifest
+++ b/kde-base/plasma-runtime/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
@@ -7,24 +7,24 @@ DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
 EBUILD plasma-runtime-4.6.3.ebuild 595 RMD160 49b8db1cf52ee686575f600604f3b22052d34416 SHA1 089aaf2a3f16328ac109cbf82af95ed296a5c7c3 SHA256 8f62e9e98db7faade612ff000f1106adb86b9f83a94e021e663548d8a34f2a25
 EBUILD plasma-runtime-4.6.5.ebuild 596 RMD160 823e595c5567cb21de8cddd5f89d4226d7feee9b SHA1 313771f3499aeb10e50f592af15d4fd08b985abc SHA256 13ae9a8f1206b313c3446ed1bb787fc3f4a69e9bf9a9b645d7b785b67a521f1a
-EBUILD plasma-runtime-4.7.3.ebuild 473 RMD160 dc3e0544dea26598562f658186f8f7901ca9c8ff SHA1 9612a4b8046e10eaea822a9e4ba230b999fe4241 SHA256 b92bf82f391583fa6f14d9a752779d0079f3d8cbd8260bb168e586c60c5aa5c6
-EBUILD plasma-runtime-4.7.4.ebuild 473 RMD160 5f254c382955bbf4fa420a5126c581a2764dfc32 SHA1 061265b8ae2eb50b63083b599eb7293810e24c1f SHA256 e16000c350dcc0a7c0d6ddf9b81f4b35b449e9d8bc9392fafcabae5c98b476df
-MISC ChangeLog 10303 RMD160 4133e7a2555dd17adc3e9c6ed8b2a0a0b0a5bd4a SHA1 90a7a0a68df53763998b70c615dbfa0b55b0a3ef SHA256 900c57d3c7d7d6a4c58b99fc47c03cc6b782b012dd175e188be9083455cab8a4
+EBUILD plasma-runtime-4.7.3.ebuild 541 RMD160 685520e08a8de82a1f4bd38d66b872b897f3a0e6 SHA1 8e8e3b5b1c0861ccd672c7be7de6b3686b81df0a SHA256 e71a990c49f8792edc327cb73431f0baa2cd23b627f07672159fdb47e58c556a
+EBUILD plasma-runtime-4.7.4.ebuild 543 RMD160 0a1c3be4ca0fec17a7c20a9893d6a73a32f61229 SHA1 41a09dcb639a78faf6d3284c7af90ab0a871eefb SHA256 dae423939844473380573c4fc39a0318ae4c1b364a58d3237e9ea9ed01da441b
+MISC ChangeLog 10502 RMD160 971f381ccdcf075ca6549e6639c829bc72eabd53 SHA1 d9ac44171cc001202396f816682e17f4f19a4eb3 SHA256 de180c7c1b5fcbfb54b0f2270b80ee57a3def949477acccee58af12eab96da69
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO5PzuAAoJEOf+E+/4L5Lmj6cP/3Meby72IH8NZFMl8idJ/nTg
-UW+uNvWqzFYIuYa1UacQj78a4RiE16UBpdhtjDFqw9wAbuyUuCS60qup6Or3BlYs
-V9+FpyirqDyHCRsdS7VMs/DtHEZkUFYuDgaeOPHG9oKpnQF9crZFfUBefmb+zIE5
-j2BgKc2KHdjbV7nna7om7zAHfrk7rcF8+RgOqC6OdJLK37sTwpHvEPPTGvX4YqEc
-LdLb4SKJOk9K7MaLr+WF8lxEmnYZ6UuDYgMmikB4bCLRJKZ9xjFNjHr372gSVqES
-FA6ebBCPASYQ2qXCXTH9T2l7QdKiPUv+OvA7idXI4H9Db/ZZwR9eeIGZpAUOG9fR
-wZWywKnjxWeC+w1aYCp1sUqmA6mhrhmiedYeWqdGOSYl1raWv/bEyuaRrvhVmHde
-65CM9N6J7I2zDgzH+nmthuKsvFphGoPlD1G8Y0u1z7Zg5O+v3i2vb0olPLH0lEAL
-o7Ms85GQGNLPsWYgyzT4pGqCITcVPhKdsNLsGrKFXhIDErHtwPaSw+hVNB9wjvZ+
-EEFRSWVLh2SpZ3qdwAPh1sJSGfTY7ja0ljFjjy6he9O+kZx7hGiu18JLfWA3fhYl
-LpXd0XUJSZDy5Z58QhflYeY9HPUa1QM8zMMD5coQBeep7lMzgiTGDCQIH2fYfX92
-QnHS+wzTgjUxSzNrde25
-=QYuU
+iQIcBAEBCgAGBQJO68ipAAoJENwGBM22xffe99sP/jeQLy45TN0a3XWAfG0bv60R
+NPsFxEQop62UL7yYx1rWDnIxVmXKLTA+hxA0kargx4TvzxTozuOhABnwYwh6ZDUj
+++DTHXg0BCvRWOcSyw3dhzLjbM6/kSk1nW5L1A1mdy3xS30ro7TdnqR/a4wPH8eE
+z637uxuxdoyTcUbv5oV4LLEz9eYSbXmJZ8qQM7RTGyk7/s1KZavaSPBrqSUqg45Q
+jJ0u1xOg2fyWY2m2NOL1MoZxEL01bge/fjp+lMcsWbTgK7eqeWlm7tiO3ElJNcmG
+1EUd47VN7qhG7KmGc2CzU2LgyK+9NyNUvxsIEFGBRn15XkZgkHDP6WAUP7kpRT4D
+6KgWCG2NxfUX1y7Pz83+rVde3bN82IRuUZ1LBcreZhpKguVXAZ8g7T9oh9Ygqm1A
+8PZ2Zq1KQuV2II1iLAlIGIY0tRXG6h15IAOtbiWIoVCJw3xl9BWB+JgRGkFDFyeF
+8QPHWWkJGxaHD230nKSqbFf7zYC0uAOLOgUDumu08XMx4pAeqe74vwqp6zQlfcDp
+rZfhv5WH0LBI9abmVL4j9h1bBeiMozsbYcv0rvfVq8+AShLas5hLelwYRU3wrerI
+mm4no+/wZkNCgrK5BZCd2w3iq0ZY/vHttHNhL1062/6IQYRScSO303ZfYw0IpN00
+ratYNQrSkDYWw8e9w3VZ
+=eORh
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild
index 5e5511499b3e..7265b605db03 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.7.3.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-runtime/plasma-runtime-4.7.3.ebuild,v 1.3 2011/12/07 22:13:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.7.3.ebuild,v 1.4 2011/12/16 22:39:26 dilfridge Exp $
 
 EAPI=4
 
@@ -12,3 +12,6 @@ inherit kde4-meta
 DESCRIPTION="Script engine and package tool for plasma"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+# file collisions, bug 394997
+add_blocker plasma-workspace 4.4.50
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.7.4.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.7.4.ebuild
index ed196afe6e17..b25625e2971b 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.7.4.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.7.4.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-runtime/plasma-runtime-4.7.4.ebuild,v 1.1 2011/12/11 18:52:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.7.4.ebuild,v 1.2 2011/12/16 22:39:26 dilfridge Exp $
 
 EAPI=4
 
@@ -12,3 +12,6 @@ inherit kde4-meta
 DESCRIPTION="Script engine and package tool for plasma"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+# file collisions, bug 394997
+add_blocker plasma-workspace 4.4.50
diff --git a/kde-base/solid-runtime/Manifest b/kde-base/solid-runtime/Manifest
index fe9f89498c4e..e6751a119a85 100644
--- a/kde-base/solid-runtime/Manifest
+++ b/kde-base/solid-runtime/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST kde-runtime-4.7.3.tar.bz2 6026718 RMD160 97c4b57c285988fab13bf97ff1fb1717aa321545 SHA1 293dec26e0d7278396d2ad0240d14aeea6060970 SHA256 280f112c3b4874ab19a2d82abe02e8d198697750db04e444a14595878fd80356
 DIST kde-runtime-4.7.4.tar.bz2 6026460 RMD160 0b35753ef335268d2705a61218fa92c88f13e4da SHA1 bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6 SHA256 8d1bd0712ca8f9c6f4700f481a0201938165026b75e05fe7b0c5b9a30dd9dd1a
@@ -7,24 +7,24 @@ DIST kdebase-runtime-4.6.3.tar.bz2 5835360 RMD160 db9af784d718c26ae380b220d089cf
 DIST kdebase-runtime-4.6.5.tar.bz2 5828482 RMD160 2b7f997b0d1c312d09ff6a968b265332c43dd51a SHA1 e91d35af2a916259305cc7efc2f3a3fbc8b22def SHA256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2
 EBUILD solid-runtime-4.6.3.ebuild 781 RMD160 2f50d35b57e22b23699ae4d005da19b98fdb499c SHA1 b0dd511922305eec849e5ccfc09eeefb6153ddde SHA256 500ff184d25de0cadff848fdcedfcf9555be1bd7d39e5fcb3d56e7285e8ce809
 EBUILD solid-runtime-4.6.5.ebuild 782 RMD160 64bfc03899acbd2ff3f20f92fa223ee251300651 SHA1 23a292bbc6eab0cbf894a84adf039fe98600473d SHA256 1dc35f1e66d69b95d9de4ffa927798162146c691c894af4a631426b9256863e3
-EBUILD solid-runtime-4.7.3.ebuild 574 RMD160 9b859f49a3026bb56fa029b28a9b7f5049c82a0f SHA1 8e49b622afada9f3913f9533c2195c8ca86a75c0 SHA256 8bfa0a55ecc196cf1a5955fa271841fd1252e04a09dafb54b9176defc00da9cf
-EBUILD solid-runtime-4.7.4.ebuild 574 RMD160 7905d8fab461e6457d08b6a20a4a1162aee62b9b SHA1 20586cd9c467a02a1e9a0b6a7b96da259d1d2331 SHA256 bffc555614c7ba6a7482d9c302cea3b2d8f8fe7d6749be3f925dacfb082f0c11
-MISC ChangeLog 7068 RMD160 5729152bf83ab3662dc01e8d54497598845b8c47 SHA1 6074fd2582e9a59656217c470b966ed47395dd1c SHA256 a62292f71d85e642862273e4d323a1f7c9f4ee84b400e2bd681ca29d4bdf096a
+EBUILD solid-runtime-4.7.3.ebuild 631 RMD160 eb15e98345771bc664beaae95e8eaba1717d9eef SHA1 69e3d69a5802ef61a7f02a35a5b303cdc570eab0 SHA256 dbf5f6b9f9d88f9bc584c177add44317599a053894ccb34682f4c2c4be58ad30
+EBUILD solid-runtime-4.7.4.ebuild 633 RMD160 7ed3f5e8212c55710c09cc51cfc3b9142d880753 SHA1 d58ccefe2da567d9b9f32149e0bbda05c08d6b84 SHA256 0a477b91d924175a8ca1d4b4c01b5dd67604e185bf3693c3f458447899d04f53
+MISC ChangeLog 7254 RMD160 e59b64fcedd2aac7262030b7cfbb18b48a12c5f3 SHA1 6de4e9b394a4ccce9059c7c4a0d9e08f7cceeefd SHA256 f3c10eb9a2ac3b8732a1701156333f6788ba31d119123edb49201b9f487069a6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO5PzzAAoJEOf+E+/4L5LmaBgP/39w95/Na6awDuWEQwLZrTO5
-l4uSPkmN4oI8hjIWZuo+toT7EKDclfxWp91hOzbpzoFN4z+dOt2/+JgqJip9RVqv
-Pw640GK4Bq1nMMnfrrlrV0hwlt3E9nYyUgsEUKH2A6Aef9FCQ+QFiECUiPxoa+zG
-lBJf00R5wBRw73EN5nyo/VC742jU2LtyxoRXXfxoRbzjzReE92a2GY+1Fv1fy2Ax
-CsH4rWl27qZmQ/1s+6euzTMWXWSsoZ4FiUMGDgfxt6mOdM7NhkT2mHadUIYyVIhQ
-oL/CvcpZgzN8uQMqgmq8Sw8YqnebhW4CPZLDGUuj3YA/1LPf2t5W7Ka6GVaqRz2S
-D5Rhp65Aa1GwRiIOtUwvGUf6weVL+5tkHph6n044wM6Rg8n0NKqSp0f3MpZ4udg8
-w0APFaiMlxdkBJN52xw5kZOivpu70g/YxQvnGcMEo+zojTSu+bZ0v02DmwVmeS+7
-rzuJ9lUv9QnXRYF8XG5ijvyjRKpaOgiqOGqbKDI4fwzUMlvXBxDkVCmO2czXMaMb
-xRx3M+1/hRtWmOp+M9Hmesmft7cI0TWbEK+NeYtADlmw4WNHZtxqUuCBNjTo6Tl0
-NeKIF28/GFIlC43Pya8UE7zT3dlHrJkz9XivP+wo2iV/AruG9VfOPmJN+FrgLuRu
-rPZb8zKGXm2k1F+L44Lm
-=nMOm
+iQIcBAEBCgAGBQJO68mRAAoJENwGBM22xffeYlcQAI3lCEm7Idc5mO56RhRp2xtz
+vNLGzTh3QJcxfZW3kzeSFV+xWWBCy2t0nDn/gtt1/WBHQZoCuwROVT2j7AJP8yUb
+q8TDEzA9b84z6vvYlD4ndGdFOuKSHN/VSfZejHH9NezL2IPBFFfkwbPO03k1m0/u
+l6bMFUtqaEi5c1DKcnXPu2fdXGsBt0MQm9INP07R4KqVdE8L+0dtEp83prmBkZ6+
+6OPeM4ABHZLHeCV8qsluN02Z5KbIEWhiSw7YuaVUPtAVcNjkann5N26VAEXabatI
+cBpUJR/hibV1/ST2wJXWCz3ExNShLhlPSIiZI7ldPboqCyJF/fN7kAqVSnbwtW1U
+bmtp3BKM3+TcAuwIDKoxq1icyueR/deJDlmWJi3gXdV/ritrBsDrlSiCgKQJ1FvD
+QdlW8PdoMbg7W3sdqA0oUhiTq1kvdz2eOUNT8Fd4U0XX6SKOCF1uAxwLs29U4DJF
+IkH0SydZjtth//20tsKJnAsvhb1oyMlDHEERLaJUYIfP7blJTYtL71MYz3GEa0Y7
+MPDmj3SJQ9Yh7kjWhHftvKukqA8MK18Fexkv15lHdnKDRHtUG4qrgmPYM0em95oS
+wPcnwDeNj2g532PW27nWjirg03LN64S/UXY0EjQ3V0yIq8qKvFQJRIj2RK6dOrDn
+IOcFmgZbDoq12XL0dlsT
+=GqvN
 -----END PGP SIGNATURE-----