diff options
author | Stephen Bennett <spb@gentoo.org> | 2004-12-18 22:25:29 +0000 |
---|---|---|
committer | Stephen Bennett <spb@gentoo.org> | 2004-12-18 22:25:29 +0000 |
commit | feb106546aa237bc3d5d7b656569b9564d8342e2 (patch) | |
tree | f283a97379a568b769dac864582d3784de5081c7 /eclass | |
parent | revision bump, repoman fixes (Manifest recommit) (diff) | |
download | gentoo-2-feb106546aa237bc3d5d7b656569b9564d8342e2.tar.gz gentoo-2-feb106546aa237bc3d5d7b656569b9564d8342e2.tar.bz2 gentoo-2-feb106546aa237bc3d5d7b656569b9564d8342e2.zip |
Don't overwrite programs from FreeBSD base system. Bug #69535.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/vim.eclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/eclass/vim.eclass b/eclass/vim.eclass index 9f33c1fbe2eb..def4454a870e 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.84 2004/12/18 22:13:13 spb Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.85 2004/12/18 22:25:29 spb Exp $ # Authors: # Ryan Phillips <rphillips@gentoo.org> @@ -497,7 +497,14 @@ src_install() { # of these links are "owned" by the vim ebuild when it is installed, # but they might be good for gvim as well (see bug 45828) update_vim_symlinks() { - local f syms="vi vimdiff rvim ex view rview" + local f syms + + # Some of these are provided already on x86-fbsd, bug 69535. + if use x86-fbsd ; then + syms="vimdiff rvim rview" + else + syms="vi vimdiff rvim ex view rview" + fi # Make or remove convenience symlink, vim -> gvim if [[ -f /usr/bin/gvim ]]; then |