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
commit3f963059961d0b5e3cb717ed467523950bd9198e (patch)
treece4ed33a5fa5bd8a9b05dfa1aeb6ff32204db299 /dev-ruby/term-ansicolor
parentStable on amd64 wrt bug #309949 (diff)
downloadhistorical-3f963059961d0b5e3cb717ed467523950bd9198e.tar.gz
historical-3f963059961d0b5e3cb717ed467523950bd9198e.tar.bz2
historical-3f963059961d0b5e3cb717ed467523950bd9198e.zip
Don't install the cdiff wrapper as it would collide with app-misc/colordiff. Closes bug #310073.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/term-ansicolor')
-rw-r--r--dev-ruby/term-ansicolor/ChangeLog7
-rw-r--r--dev-ruby/term-ansicolor/Manifest10
-rw-r--r--dev-ruby/term-ansicolor/term-ansicolor-1.0.5.ebuild6
3 files changed, 16 insertions, 7 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/Manifest b/dev-ruby/term-ansicolor/Manifest
index 23acbc51491c..a26c69132ed1 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -5,13 +5,13 @@ DIST term-ansicolor-1.0.4.gem 15360 RMD160 d637b212c193168263516fdbf99cc44b2422c
DIST term-ansicolor-1.0.5.gem 15360 RMD160 972ecf783fa44af636623842e2546a42a47ba99d SHA1 07e9388ed54ff88dd2d3ce9d7e857fb5d1d49a9b SHA256 812d03fd5ad601983c36aa034eed909c0006256af58e403809927a371b610cf6
EBUILD term-ansicolor-1.0.4-r1.ebuild 666 RMD160 c0eb3f7bc07b9e3ba4ab92f0aa32a4b655fc8bdd SHA1 3fa4f8737d92025556815d67cbabae9c7d07bb2c SHA256 a81d9b3c25d0ab2eb45d184170c5c210272e56d512849456fe48465c8045c250
EBUILD term-ansicolor-1.0.4.ebuild 461 RMD160 1f217e8fe484df727b242052bf9bb48dc1dc36ac SHA1 e25431a7ad3880555c185a41e3f7a897383c6b83 SHA256 ddaa96ae1fb76af464a21d7e6cd960bb6d9a780a19368d0b1436c63fafbe173b
-EBUILD term-ansicolor-1.0.5.ebuild 692 RMD160 45a0089405e46d89177861e60cde0e39e3f73672 SHA1 5bbf4508a62777ea51c63a4a856d16dfb47089c9 SHA256 1c4c115e3205925c083dd4b1f7c20b087826cc3e65dd4bd0f4220f341de91094
-MISC ChangeLog 1170 RMD160 7ba82446480e00bfbe926aefb370c7461db6fe8a SHA1 a1ac4e834b5c3ec3ddcb6f16d391e9325d2a779e SHA256 1ab72bdaf3efa851d3677699f9a799c16cd1a5822b9ff4522c137c1bfb0a122f
+EBUILD term-ansicolor-1.0.5.ebuild 810 RMD160 a92167bbf920606bc5b81afb2c0924be43437eff SHA1 f8ea62269577f3658db62c8e11e3e84e0b081454 SHA256 3ae3fff2633a4cad06380aa6f0eb1d782fe80a9791ce2f460a9cd6c9a485c15d
+MISC ChangeLog 1362 RMD160 14bc90822fc7ee63a36b9d7a478fc5340baec286 SHA1 e23bf41f3f96255925cf4b7457356aa3b1707700 SHA256 9e80526df371c91a9f5fd4ed6dd4172d627403208dbcb335a0a6fc573266d4f8
MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkud1kwACgkQeM7EJeUH71P/vwCeMiAuUuFshAzY2g6tFr8igDlw
-xXwAnR/Lrxfr3BL2II3LAHClD1VsgVNJ
-=KaZJ
+iEYEARECAAYFAkuiIhkACgkQAiZjviIA2XijVQCeKMfrdyvQ7cQtVHkwXKkEqBuw
+EDYAn34MRBQlq8jA160MQi1dRMzzYWVp
+=xAzz
-----END PGP SIGNATURE-----
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."