diff options
Diffstat (limited to 'dev-util/ninja')
| -rw-r--r-- | dev-util/ninja/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/ninja/ninja-1.0.0.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/ninja/ChangeLog b/dev-util/ninja/ChangeLog index c5938f1bfb2d..18ffa2bd187c 100644 --- a/dev-util/ninja/ChangeLog +++ b/dev-util/ninja/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/ninja # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.4 2012/10/23 15:50:41 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.5 2012/12/30 23:53:50 ottxor Exp $ + + 30 Dec 2012; Christoph Junghans <ottxor@gentoo.org> ninja-1.0.0.ebuild: + fix collision with net-irc/ninja (bug #436804) *ninja-1.0.0 (23 Oct 2012) diff --git a/dev-util/ninja/ninja-1.0.0.ebuild b/dev-util/ninja/ninja-1.0.0.ebuild index 21643bf6e9d4..91a5d685d5b3 100644 --- a/dev-util/ninja/ninja-1.0.0.ebuild +++ b/dev-util/ninja/ninja-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.0.0.ebuild,v 1.1 2012/10/23 15:50:41 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.0.0.ebuild,v 1.2 2012/12/30 23:53:50 ottxor Exp $ EAPI=4 @@ -39,7 +39,7 @@ RDEPEND=" ) ) zsh-completion? ( app-shells/zsh ) - " + !<net-irc/ninja-1.5.9_pre14-r1" #436804 pkg_setup() { python_set_active_version 2 |