From eb2937fa38660a87101865bf74b74850064658aa Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 22 Nov 2009 03:19:29 +0000
Subject: Block <kdevelop-3.9.96 due to file collision. Package-Manager:
 portage-2.2_rc51_p14873/cvs/Linux i686

---
 dev-util/kdevplatform/ChangeLog                  |  5 ++++-
 dev-util/kdevplatform/Manifest                   | 14 ++++++++++++--
 dev-util/kdevplatform/kdevplatform-0.9.96.ebuild |  3 ++-
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'dev-util')

diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index cb15224c6e9e..3907933c4d85 100644
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.11 2009/11/12 15:51:53 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.12 2009/11/22 03:19:29 zmedico Exp $
+
+  22 Nov 2009; Zac Medico <zmedico@gentoo.org> kdevplatform-0.9.96.ebuild:
+  Block <kdevelop-3.9.96 due to file collision.
 
 *kdevplatform-0.9.96 (12 Nov 2009)
 
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 9206ad5cf7bc..366d67e28218 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kdevplatform-0.9.95.tar.bz2 1057385 RMD160 837b0c288084e8e4566e36e260e117042fa434b4 SHA1 d3a235a7c4a6a216a74a9c0dedeb9bd195b79432 SHA256 3149fcd763f74ad6b9956864615d486db28253fc8a47c4868593ee0bc9604c06
 DIST kdevplatform-0.9.96.tar.bz2 1017341 RMD160 1f1ea10eecd77a65b504139f503ef99ec57a76ab SHA1 9f453db5e7b376233ffd0415e3e9c295af11010a SHA256 a00e5140e7960b594eb035423b09b5037d090b8f42eccc27da93af9824b66d6e
 EBUILD kdevplatform-0.9.95.ebuild 1233 RMD160 8922c23cc1385367db71aaa6003dad2d80b5772c SHA1 9b6b72292abe0b98f8630e43e3684fa4b5888ebe SHA256 865bdbe6a45f7a8cccc098982a44dc33b5fa8001ab426845f3353ea8ff496917
-EBUILD kdevplatform-0.9.96.ebuild 1348 RMD160 e96ae26e09517b15cecd630fd434a27484e48850 SHA1 b58f97ee14c0d5c4d2581818aec89431d2f572f3 SHA256 ca01e2ae9e22a97eb8a5704869e589be23777f78c2a9753e35d0edea198092a9
-MISC ChangeLog 1802 RMD160 9cf5937d3387010b96a356c9ae1b5503c3877d6c SHA1 db37bdec52d0a94b73303f57243d61f14fd1b166 SHA256 a0b629d3f59cd73b2ba17b2357b8dff8286b80f775a34d01bda0c3017bf22b59
+EBUILD kdevplatform-0.9.96.ebuild 1376 RMD160 d2f50fcbe4cd92579e7302fef120e0264caf29db SHA1 0a674b9b9e6881c603f9a2a4ff0558fc3954c064 SHA256 9a51fde07d0f068173ad13dd78f83d6da48587d15c95fc34a81421286858b964
+MISC ChangeLog 1926 RMD160 c93f004d2d5305933cbf6db5ea6541cc4247bff1 SHA1 8456f5e0d0559e7e42251b8beeda2b493bb40447 SHA256 b71509d6b2ead1391cbd9a8efbb23bbbeb6fd734d597bc1839fa790cd2672afb
 MISC metadata.xml 277 RMD160 2df3f37e1550394d65f3917609b796d64b7154d9 SHA1 41488b2074e66849c5f7845931590c03637c94a3 SHA256 f38c49db36b718a992a1040c791dd61561bbef2554df01bc0e785c25cc21e1f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksIreIACgkQ/ejvha5XGaMIxQCdEMqoavNnF9NBke7rCZb6dUvm
+y3kAn3bqZn8bkySx8dEmH9x0NR58Eqpb
+=JLv5
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild
index a04bf56188ea..8fb165daec16 100644
--- a/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild,v 1.1 2009/11/12 15:51:53 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild,v 1.2 2009/11/22 03:19:29 zmedico Exp $
 
 EAPI="2"
 
@@ -28,6 +28,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	cvs? ( dev-util/cvs )
 	mercurial? ( dev-util/mercurial )
+	!<dev-util/kdevelop-3.9.96
 "
 
 # Moved to playground for now
-- 
cgit v1.2.3-65-gdbad