summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/plasma-runtime/ChangeLog6
-rw-r--r--kde-base/plasma-runtime/Manifest24
-rw-r--r--kde-base/plasma-runtime/plasma-runtime-4.6.2.ebuild3
3 files changed, 29 insertions, 4 deletions
diff --git a/kde-base/plasma-runtime/ChangeLog b/kde-base/plasma-runtime/ChangeLog
index c90b8a0fb66b..8622c74b70be 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.53 2011/04/06 14:19:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/ChangeLog,v 1.54 2011/04/09 19:43:18 dilfridge Exp $
+
+ 09 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ plasma-runtime-4.6.2.ebuild:
+ Extend blocker to old kdelibs because of file collisions, bug 362767
*plasma-runtime-4.6.2 (06 Apr 2011)
diff --git a/kde-base/plasma-runtime/Manifest b/kde-base/plasma-runtime/Manifest
index f4c19d207af2..8b0c5af8df73 100644
--- a/kde-base/plasma-runtime/Manifest
+++ b/kde-base/plasma-runtime/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
DIST kdebase-runtime-4.4.5.tar.bz2 7332344 RMD160 4cc49e993e05adf4dfb4c5d4acdf992b5efbc114 SHA1 93c58fbef37cdf0c9c6b37c773f8cde054fae51f SHA256 3d3be43d2f53b40dea7fc566f1f5b07b30fcc6b4c69ad77c1e1be13637781428
DIST kdebase-runtime-4.6.2.tar.bz2 5834267 RMD160 1fec8ef92dc3123b14df3320795bfa3230a2f649 SHA1 d939d78f82e8c9d1257552abac08e4da1ff28c51 SHA256 28ad78488f3202b7a999b19e773dde987892528b9386c2a6aa63574939af8933
EBUILD plasma-runtime-4.4.5.ebuild 540 RMD160 4da278b79d3baa928c4127dbbe4f96f1692ba3f4 SHA1 cecc190defba02a4bb66c867463a50ce760c200c SHA256 0dabe43e8a3d9894758f66ce3e8ad76d29f791af8fa5a9cd09686d615bd92f4d
-EBUILD plasma-runtime-4.6.2.ebuild 571 RMD160 beaf0a8ef48c91ef50a66fc5f66fdbbcc487c01b SHA1 caaf72af04014d6a38bf63945b8c7a57f4506656 SHA256 5824e91dbdb23efa1094f80f0ef9d482f22dc91d7260a4051a9f0a70cc84eacb
-MISC ChangeLog 7126 RMD160 ebb2295056a7cc0f57dec5d73e70bfc2d39a91d7 SHA1 ad85b377c426d01acb92bad99849e2f3501fc4f4 SHA256 beec5b1a83e82f12bd2c21475805aabdba33b568e4c42b4b019bc042afc2c383
+EBUILD plasma-runtime-4.6.2.ebuild 601 RMD160 ee1f62ef95ad383d3c0820beebab3a4f70f80b2b SHA1 20a7902e308c5267fc89cdc6af1b9712ac47cb71 SHA256 23406942cdb31fc28e3f87c22094bf9f7a42ecaff281e3a10e270f7fd25b9744
+MISC ChangeLog 7286 RMD160 b07193c72d55091fa256da59734033798f95db04 SHA1 ab9d3a56a93955829e60c296e3dc469702da949b SHA256 006f3483797592b856e18da1ac3322e8cdb64b0a366be85eb5ca442ddb2c4efb
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNoLeWAAoJENwGBM22xffeFjgP/0FELWiJ9AnvCzj4kznMBIJk
+NzfoPnIkLul1n/MpuqT0GZPPag1um/hEL8tjj2GvdX+eva65n3linw0og5jydanV
+uJwMTqKnZmuHpC+vpUP3CVUy2xKEXI4mZMC4KIWetqFJpJT9SSwmL+CfMWKED8lf
+XAxmY1LUcjk/MtnnTWhkkxfVAq5V2cNK021NkSqo62r7bnqxH0vhM10wa1IBS11A
+1PHwXyhgFAAUf0bNJU/+smeyce5sxuYoxQxOzMD8Do26rLlwELv9c5+45PduSrd0
+Vgx3KpIlDFXnCGFCJaEu8Laql6zrm8TY2SO/PI5zFB0kFyRhf5Tnr6SFmOOVL2V+
+m/j86W0QHRibq/vba5tQrjez/YWxJP6Joz90f0KVKrCXgODVZuwjY0SWoUqqTKM5
+hv1DtRFDzyr0s7K/XW9B2h1AiUFsrxroo1YAIoLGcUq+AEHi+sT1UbEgNTjZHMhw
+2VesOwaheQcBruBWnowILG5mF6D3ntZutG0ffsjV0xLaagNYCAGfrLwyN1GeY7OX
+7KI/Ugba+OspNnsgAxVJcaOpMjD5tqzfyDoGHY1J6LEXeYf9VkKendWZC6hvqrdI
+jaWtTI2au/XVYwnfCTjwpUw4Qbjyz7g5EQ1t/xfISdhkMGRiDkPbQPHJNrvpJ2Xo
+fw/q/pSjo/F6xChG1ri7
+=ru7R
+-----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-runtime/plasma-runtime-4.6.2.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.6.2.ebuild
index f199f8b2ee2a..d820c2baa901 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.6.2.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.6.2.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.6.2.ebuild,v 1.1 2011/04/06 14:19:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-runtime/plasma-runtime-4.6.2.ebuild,v 1.2 2011/04/09 19:43:18 dilfridge Exp $
EAPI=3
@@ -15,3 +15,4 @@ IUSE="debug"
# cloned from workspace thus introduce collisions.
add_blocker plasma-workspace '<4.5.60'
+add_blocker kdelibs '<4.5.60'