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
commit3109b3bbf388f95c6769f8e156ca048e92410bf5 (patch)
tree7eb34be82f14eaf378e994bf940c68256cf7dfdf /dev-ruby/bcat
parentBased on 3.2.23 + genpatches-3.2-16 + grsecurity-2.9.1-3.2.23-201207211428 (diff)
downloadhistorical-3109b3bbf388f95c6769f8e156ca048e92410bf5.tar.gz
historical-3109b3bbf388f95c6769f8e156ca048e92410bf5.tar.bz2
historical-3109b3bbf388f95c6769f8e156ca048e92410bf5.zip
Add blocker on speech-tools which also tries to install bcat.
Package-Manager: portage-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/Manifest10
-rw-r--r--dev-ruby/bcat/bcat-0.6.2.ebuild5
3 files changed, 13 insertions, 7 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/Manifest b/dev-ruby/bcat/Manifest
index 637532e4a232..4aa6ba560d19 100644
--- a/dev-ruby/bcat/Manifest
+++ b/dev-ruby/bcat/Manifest
@@ -2,13 +2,13 @@
Hash: SHA256
DIST bcat-0.6.2.gem 22016 SHA256 a11816491a1f0233b838d6828f3a157cca95d0ca3dbab82b25ee68f62ce55c70 SHA512 142f853ca0931e5ba300276b1db0977fa275b9b13602940fbaca2c5d32ff881fe753dee25632526a348d71cf71eb6e390aed821b4ba1f48e380d6369ad87ead7 WHIRLPOOL 1132a63a18a5beb6e632dcd22d9585783a1699e97d62b4ec352e0c9892225a754ce1e70e3a2da6d4552b73c6298921cb02253096d9dba2a418f8589df2b7d783
-EBUILD bcat-0.6.2.ebuild 1149 SHA256 5b3da46b7da5df38a324c31f4a20110e08a739c732f04b41a058d30d38d783f1 SHA512 e01d61bd65cbb1ca741403dc01bd972dafebf2f1e1d3f1749d5400161704a9d479c77e5e7778a74f4746cfa7d98e1c21120221272cde5379c9403e18349066e1 WHIRLPOOL 5650e3c19e461cb241be0ada4e48af7e3e92bba86db2965c83cbb17027e5efe9a218e1cafe63f9a514e195da6e73454f2ab7c8ab44afdf2ea52a4622add7f39a
-MISC ChangeLog 955 SHA256 ea3b9e425eecf238e250b1ea5f8d8dc662fb56e9c7fa182072673e93da496849 SHA512 a7968a494f05bc77aa310838a3ddac1887eb5626c884d894cf1ce647b621cf078c47697849724932959564d37f2497b834fc661bf444f6718d0c51857ed1c2e3 WHIRLPOOL 3bcd911df1a66ebf36e89987d28730146c79f22343e1d92b5d73f19bcb9f233480baed203f0680be9aa97f79f2ecd6e0f718be3c5b38e22aec84e5169d2d2c4a
+EBUILD bcat-0.6.2.ebuild 1241 SHA256 e84c63e1171ca47347cd849a43fb00aae6cc1bcc53cd68333017372a001967b0 SHA512 8fbbca84ce7c9f1c615c458452d73a44f19d6dc5549fa6b46f0e43d0aab9943b672009a73893e58cc84f4b6c23f10bc5df10de8956612561b3074872b3ac792e WHIRLPOOL 97478dec433a251200a76a1dd1463fc18cb565aa1be241bfaf06c05f4b23cd280e8cae691a1512f417df4765331083908fcc93c2cb52c30268969f579f16b669
+MISC ChangeLog 1089 SHA256 d1adc093761cc52cc72937ba1e82ed4e10fc72b09beb6579570aaf46b0fe4de0 SHA512 d9572a75c95e46ac7d2a4db7d949282811a293900ea014225a51614b56c99256f37285f726a179486bdf5aedd6f72fcaf96d8e20d0152c50ff2576af8ecc5247 WHIRLPOOL ef8f143e4a758905648ee6ba577f92ca06285dceec3c5d802d779d41b972d08129784a843c95b857f48de33d216f3a880a908377f12aad202eab6ea185a30b7f
MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlAMAdIACgkQiIP6VqMIqNclWQD+IsUiMStoTC9OFzlAQED6FB64
-qcOWFLBQyEt9egZQu1YBAJU2UKGSKt798DgnUb3324H4VRWqldTCpeRe4IWvgg8t
-=0dWR
+iF0EAREIAAYFAlAMAtIACgkQiIP6VqMIqNcnIAD+Mr9cDEqoc9w2A0bIynbRzLim
+dXZ3vd0IeePQrBZ4Dc8A+JqMfUplHaj2cUex6ijdh9swT13ddS74lIi5+dLZ2hE=
+=MYhG
-----END PGP SIGNATURE-----
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 )"