diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-04-26 01:51:35 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-04-26 01:51:35 +0000 |
commit | 2025716cef94cf44bc6f21e481e6a916b5126e48 (patch) | |
tree | 7147c80a6161235cb2d8bdc40cf5925ac1c4bb0d | |
parent | Bump to 0.6.1, fixes #267430 (diff) | |
download | gentoo-2-2025716cef94cf44bc6f21e481e6a916b5126e48.tar.gz gentoo-2-2025716cef94cf44bc6f21e481e6a916b5126e48.tar.bz2 gentoo-2-2025716cef94cf44bc6f21e481e6a916b5126e48.zip |
Block dev-util/kdevelop:0 due to file collision with
/usr/share/apps/kdevappwizard/kdevappwizard.rc.
(Portage version: 2.2_rc31_p13391/cvs/Linux i686)
-rw-r--r-- | dev-util/kdevplatform/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/kdevplatform/kdevplatform-0.9.91.ebuild | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog index a2cf85476413..de14f48cc751 100644 --- a/dev-util/kdevplatform/ChangeLog +++ b/dev-util/kdevplatform/ChangeLog @@ -1,6 +1,10 @@ # 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.4 2009/03/26 20:20:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.5 2009/04/26 01:51:35 zmedico Exp $ + + 26 Apr 2009; Zac Medico <zmedico@gentoo.org> kdevplatform-0.9.91.ebuild: + Block dev-util/kdevelop:0 due to file collision with + /usr/share/apps/kdevappwizard/kdevappwizard.rc. 26 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kdevplatform-0.9.91.ebuild: diff --git a/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild index 5eb40087a502..2e0355991343 100644 --- a/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild +++ b/dev-util/kdevplatform/kdevplatform-0.9.91.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.91.ebuild,v 1.4 2009/03/26 20:20:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild,v 1.5 2009/04/26 01:51:35 zmedico Exp $ EAPI="2" @@ -24,6 +24,7 @@ RDEPEND="${DEPEND} cvs? ( dev-util/cvs ) git? ( dev-util/git ) mercurial? ( dev-util/mercurial ) + !dev-util/kdevelop:0 " src_configure() { |