diff options
| -rw-r--r-- | dev-util/cdiff/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cdiff/cdiff-0.3.ebuild | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-util/cdiff/ChangeLog b/dev-util/cdiff/ChangeLog index 0d8c98f2d898..b2d22d155d69 100644 --- a/dev-util/cdiff/ChangeLog +++ b/dev-util/cdiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cdiff # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.1 2013/02/09 20:15:38 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.2 2013/02/10 00:46:06 tomwij Exp $ + + 10 Feb 2013; Tom Wijsman <TomWij@gentoo.org> cdiff-0.3.ebuild: + Block app-misc/colordiff since it installs a /usr/bin/cdiff symlink. Fixes + #456358. *cdiff-0.3 (09 Feb 2013) diff --git a/dev-util/cdiff/cdiff-0.3.ebuild b/dev-util/cdiff/cdiff-0.3.ebuild index 59dcdc966001..f4e26e67352a 100644 --- a/dev-util/cdiff/cdiff-0.3.ebuild +++ b/dev-util/cdiff/cdiff-0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.3.ebuild,v 1.1 2013/02/09 20:15:38 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.3.ebuild,v 1.2 2013/02/10 00:46:06 tomwij Exp $ EAPI=5 @@ -17,5 +17,6 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="!app-misc/colordiff + dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" |