summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-04-14 15:38:31 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-04-14 15:38:31 +0000
commit015ee31f9da0d44a73f64f6150a430426caeb25c (patch)
tree8c7fb5cce682df7f2061f9bf0ece03e3be17c7a6 /app-shells
parentUpdate metadata. (diff)
downloadgentoo-2-015ee31f9da0d44a73f64f6150a430426caeb25c.tar.gz
gentoo-2-015ee31f9da0d44a73f64f6150a430426caeb25c.tar.bz2
gentoo-2-015ee31f9da0d44a73f64f6150a430426caeb25c.zip
add cowsay blocker due to file collision, bug 266112
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/bash-completion/ChangeLog6
-rw-r--r--app-shells/bash-completion/bash-completion-1.0-r2.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index a997b8a910d7..470b47772496 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-shells/bash-completion
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.169 2009/04/12 04:25:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.170 2009/04/14 15:38:31 darkside Exp $
+
+ 14 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
+ bash-completion-1.0-r2.ebuild:
+ add cowsay blocker due to file collision, bug 266112
*bash-completion-1.0-r2 (12 Apr 2009)
diff --git a/app-shells/bash-completion/bash-completion-1.0-r2.ebuild b/app-shells/bash-completion/bash-completion-1.0-r2.ebuild
index 8173775737d0..3d88b65000e7 100644
--- a/app-shells/bash-completion/bash-completion-1.0-r2.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.0-r2.ebuild,v 1.1 2009/04/12 04:25:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.0-r2.ebuild,v 1.2 2009/04/14 15:38:31 darkside Exp $
EAPI="2"
@@ -22,7 +22,8 @@ RDEPEND="app-admin/eselect
>=app-shells/bash-2.05a
app-shells/zsh
)
- sys-apps/miscfiles"
+ sys-apps/miscfiles
+ !<=games-misc/cowsay-3.03-r1"
PDEPEND="app-shells/gentoo-bashcomp"
src_prepare() {