diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2009-04-14 15:38:31 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2009-04-14 15:38:31 +0000 |
| commit | c6bcf755d3a312ec5ac0880d4630aec800638bed (patch) | |
| tree | dacac4c7979f123e31ba36385805b4686f8b0d5b /app-shells | |
| parent | Update metadata. (diff) | |
| download | historical-c6bcf755d3a312ec5ac0880d4630aec800638bed.tar.gz historical-c6bcf755d3a312ec5ac0880d4630aec800638bed.tar.bz2 historical-c6bcf755d3a312ec5ac0880d4630aec800638bed.zip | |
add cowsay blocker due to file collision, bug 266112
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash-completion/ChangeLog | 6 | ||||
| -rw-r--r-- | app-shells/bash-completion/Manifest | 4 | ||||
| -rw-r--r-- | app-shells/bash-completion/bash-completion-1.0-r2.ebuild | 5 |
3 files changed, 10 insertions, 5 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/Manifest b/app-shells/bash-completion/Manifest index ec9357d5d3ac..81291d87ae51 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -5,6 +5,6 @@ AUX bash-completion.sh 1683 RMD160 f5d723122d1a0431af0a19838330e30f6f7e324f SHA1 DIST bash-completion-1.0.tar.gz 143578 RMD160 b590c2633c5c10c3e98b14a74f4e96c910b6177d SHA1 61040795731f5ff509c46e818a1edf0a7a93e11d SHA256 bd96e7d2858f02783046908a984993736f1189d07d82e9ce4b465068dd7187ef DIST bash-completion-20081219.tar.bz2 91246 RMD160 4fd868363f3ee7277c8ad8769a37fe7c6de76efd SHA1 c13987837c46feefd6d7832c181d2c6f15878ead SHA256 c3869a95654ba6c976ee156d7553d066d597225d764dbf63706041583cfe5a7f EBUILD bash-completion-0.20081219-r1.ebuild 3399 RMD160 7662286dbb326d523a64866abd81d503bece730a SHA1 b4f120cd6daa3f81cd069ca2b09f8a2145af66d1 SHA256 727c27a6f9fb43ce646dadd4ea96b9d6e68603357c666ac68ae5e760302462ed -EBUILD bash-completion-1.0-r2.ebuild 3095 RMD160 86ff291e396605e42034f85888e3b24d9892948b SHA1 f2c90bc7432d28d58d672e3d9369be893176e561 SHA256 37aa60ead5be8d6349a44d795bfe059c258bdf87449cedc0a194b409fbd297e9 -MISC ChangeLog 30939 RMD160 51671f98d6c034078fdd9d078d8b5e6a1a34a188 SHA1 f8bc0bad0e89263742899f80862fe85ed44cbe6b SHA256 a51492712c9efd3dc8be16e329b0068f7c38a9830c4572d11ef56acea485c56f +EBUILD bash-completion-1.0-r2.ebuild 3125 RMD160 94fa0a69c76655f12374239898f639015386c814 SHA1 334919b25e14eafbae84682524d4f19f2aeb7ad9 SHA256 134ba84e70829cac0eee613efa4ec07f12bc1fc8ae04d664b550b32df946fd44 +MISC ChangeLog 31078 RMD160 d28bc7ac58fde8d7ee6bd53fd80acc127e99a7de SHA1 738553126a973f15939225b09a9c84c6d0f547d0 SHA256 0a16beb3bc9e71168654eeebedae7d6e737df95d68c85a2bf82fe978231039b1 MISC metadata.xml 930 RMD160 e6718602012b2cfcb5be5bfc962889bf88f4dc73 SHA1 a585c9cfc0bdb59ee4c7ff1e786bc53d28d36aac SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9 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() { |