Add back blocker to libmaildir to support upgrade from 4.2.X

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 12 insertions, 16 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index edbd93511b19..9566b24d1ec4 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.13 2010/06/30 15:36:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.14 2010/07/30 15:37:45 scarabeus Exp $
+
+  30 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  kdepim-runtime-4.4.4.ebuild, kdepim-runtime-4.4.5.ebuild:
+  Add back blocker to libmaildir to support upgrade from 4.2.X
 
 *kdepim-runtime-4.4.5 (30 Jun 2010)
 
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index 193deeeb7ada..10663f9d583b 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdepim-runtime-4.4.4.tar.bz2 632556 RMD160 c74dcc82225e55b223b5796d19479daa069741f6 SHA1 18e5ec39f4b39f9d524cee82b5037e5ba6c2b417 SHA256 3071af7aaae0cf6e8a225546658a90fcb6f003bb917b47fcdf0f5856bb6177c5
 DIST kdepim-runtime-4.4.5.tar.bz2 632524 RMD160 56762cc2fcec0505f8ca1c2ace45e405a3781cf1 SHA1 178e138336f6983c0c1a49d7b40f791bb09042c9 SHA256 479284594c4d69e5512121e308eea92717ada0063e034734243414e9f6f93afa
-EBUILD kdepim-runtime-4.4.4.ebuild 832 RMD160 0c350772420c9ebab7e3f76bc36175c41196e2cc SHA1 af51e8f0d3d84ef9f5a6cbd4fc01b7cff3a2090a SHA256 cce7ad8612f9ea19aaced5677fccf48ce4050b03d175ec8c3623da4565129ed5
-EBUILD kdepim-runtime-4.4.5.ebuild 835 RMD160 5d29a9bce912f37efb65d6cdccf3eb50a119cbc7 SHA1 b615c864b116c76a50acee67a49cf94c62f97850 SHA256 5148009cc6ad0cba0c4b12190cec5c2ab4963da9992047f833177f0afa4fd237
-MISC ChangeLog 1960 RMD160 3f407a38e4f904c9c121016e892436e4400744b7 SHA1 3a5d1e1dc6d52b8f0171d47009491e754e45e128 SHA256 6c9eff141a84ca2d3054df0f8fbd851cd5184c277a54913631bcae707a1e0894
+EBUILD kdepim-runtime-4.4.4.ebuild 868 RMD160 092e6fba8e6a4526312eb09c7b2485930d57c88c SHA1 90877500d08ba98d8ba50374c3d8821fea7cd38c SHA256 a6010e1cdff41064ba8a2e4e36e020854e84bd9ee98523aa7394e02ed609dfd3
+EBUILD kdepim-runtime-4.4.5.ebuild 870 RMD160 058d26adeed785f0ccb7d70431564aaac545093a SHA1 1a8601a0d4fe43fbda5c01d1a96d2bc1338c021f SHA256 3e089eafef03e2001e311347fb4928278c9377393b0a0de0f2bfaa035ed5f321
+MISC ChangeLog 2142 RMD160 ce6ec970c6bcc5f48626926353beebaa52943811 SHA1 e3ae01b1c971e9ce00539c908389ed3a86fdc1db SHA256 3c423cd5b714f7564a0f41e5d89da4aca024591d20502502a37cdeb7e68288d3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwrZVMACgkQ5BmOA85PVLgt/QCgrbpNrFXEKFfseaIeaU4T0lgH
-KP8AnRSg0abH4uOnC98dCp8/tRSneL7X
-=LTBa
------END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild
index 83a026a4f882..62667cfdf855 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild,v 1.3 2010/06/27 18:29:50 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.4.ebuild,v 1.4 2010/07/30 15:37:45 scarabeus Exp $
 
 EAPI="3"
 
@@ -31,4 +31,5 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepim-icons)
 "
 
+add_blocker kdemaildir '<4.3.0'
 add_blocker akonadi '<4.3.90'
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.5.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.5.ebuild
index 51264cef3dea..0c91067c05f1 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.5.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.5.ebuild,v 1.1 2010/06/30 15:36:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.5.ebuild,v 1.2 2010/07/30 15:37:45 scarabeus Exp $
 
 EAPI="3"
 
@@ -31,4 +31,5 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepim-icons)
 "
 
+add_blocker kdemaildir '<4.3.0'
 add_blocker akonadi '<4.3.90'