summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2012-07-22 13:40:28 +0000
committerHans de Graaff <graaff@gentoo.org>2012-07-22 13:40:28 +0000
commit28ca9ac86edced545893b4c2b7b530b0c0c7c3c7 (patch)
tree4e5cd31b9a783a4bce80ede0bc88f36727e4f623 /dev-ruby/bcat
parentBased on 3.4.6 + genpatches-3.4-6 + grsecurity-2.9.1-3.4.6-201207211444 (diff)
downloadgentoo-2-28ca9ac86edced545893b4c2b7b530b0c0c7c3c7.tar.gz
gentoo-2-28ca9ac86edced545893b4c2b7b530b0c0c7c3c7.tar.bz2
gentoo-2-28ca9ac86edced545893b4c2b7b530b0c0c7c3c7.zip
Add blocker on speech-tools which also tries to install bcat.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/bcat')
-rw-r--r--dev-ruby/bcat/ChangeLog5
-rw-r--r--dev-ruby/bcat/bcat-0.6.2.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-ruby/bcat/ChangeLog b/dev-ruby/bcat/ChangeLog
index ee54cffc8b55..9d8bf022cb89 100644
--- a/dev-ruby/bcat/ChangeLog
+++ b/dev-ruby/bcat/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/bcat
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/ChangeLog,v 1.7 2012/07/22 13:36:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/ChangeLog,v 1.8 2012/07/22 13:40:28 graaff Exp $
+
+ 22 Jul 2012; Hans de Graaff <graaff@gentoo.org> bcat-0.6.2.ebuild:
+ Add blocker on speech-tools which also tries to install bcat.
22 Jul 2012; Hans de Graaff <graaff@gentoo.org> -bcat-0.6.1.ebuild:
Remove old version.
diff --git a/dev-ruby/bcat/bcat-0.6.2.ebuild b/dev-ruby/bcat/bcat-0.6.2.ebuild
index caa73b73ea8c..36c7f4c2dd86 100644
--- a/dev-ruby/bcat/bcat-0.6.2.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2.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-ruby/bcat/bcat-0.6.2.ebuild,v 1.5 2012/07/11 16:21:56 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/bcat-0.6.2.ebuild,v 1.6 2012/07/22 13:40:28 graaff Exp $
EAPI=4
USE_RUBY="ruby18 ruby19 ree18"
@@ -18,6 +18,9 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
IUSE=""
+# Collides on /usr/bin/bcat, bug 418301
+RDEPEND="${RDEPEND} !!app-accessibility/speech-tools"
+
ruby_add_bdepend "doc? ( app-text/ronn )"
ruby_add_bdepend "test? ( virtual/ruby-test-unit )"