summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-03-18 12:52:57 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-03-18 12:52:57 +0000
commitffb0e1066e8b8a267ffefea44410879f49842837 (patch)
tree3fa615e9d597c1d5c23eebc1359e12ed3f37f2cf /dev-ruby
parentStable on amd64 wrt bug #309949 (diff)
downloadgentoo-2-ffb0e1066e8b8a267ffefea44410879f49842837.tar.gz
gentoo-2-ffb0e1066e8b8a267ffefea44410879f49842837.tar.bz2
gentoo-2-ffb0e1066e8b8a267ffefea44410879f49842837.zip
Don't install the cdiff wrapper as it would collide with app-misc/colordiff. Closes bug #310073.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/term-ansicolor/ChangeLog7
-rw-r--r--dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild6
2 files changed, 11 insertions, 2 deletions
diff --git a/dev-ruby/term-ansicolor/ChangeLog b/dev-ruby/term-ansicolor/ChangeLog
index 4247aa652484..8e2cb3b4332a 100644
--- a/dev-ruby/term-ansicolor/ChangeLog
+++ b/dev-ruby/term-ansicolor/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-ruby/term-ansicolor
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/ChangeLog,v 1.6 2010/03/15 06:40:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/ChangeLog,v 1.7 2010/03/18 12:52:57 flameeyes Exp $
+
+ 18 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ term-ansicolor-1.0.5.ebuild:
+ Don't install the cdiff wrapper as it would collide with
+ app-misc/colordiff. Closes bug #310073.
*term-ansicolor-1.0.5 (15 Mar 2010)
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild
index 52e2ff687873..fb9fdb5027b1 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild,v 1.1 2010/03/15 06:40:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild,v 1.2 2010/03/18 12:52:57 flameeyes Exp $
EAPI=2
USE_RUBY="ruby18"
@@ -9,6 +9,10 @@ RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_TASK_TEST="tests"
RUBY_FAKEGEM_EXTRADOC="CHANGES README"
+# don't install a cdiff wrapper, collides with app-misc/colordiff (bug
+# #310073).
+RUBY_FAKEGEM_BINWRAP="decolor"
+
inherit ruby-fakegem
DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences."