summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevplatform/ChangeLog5
-rw-r--r--dev-util/kdevplatform/kdevplatform-0.9.96.ebuild3
2 files changed, 6 insertions, 2 deletions
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/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