commit:     170bc1bbdbe24c4cac8d00226273838f8f89acf4
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  8 21:35:22 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 21:36:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170bc1bb

app-editors/vim: remove vulnerable versions.

Bug: https://bugs.gentoo.org/639710
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-editors/vim/Manifest            |   3 -
 app-editors/vim/vim-8.0.0386.ebuild | 348 ------------------------------------
 app-editors/vim/vim-8.0.1188.ebuild | 309 --------------------------------
 3 files changed, 660 deletions(-)

diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index b15b79a97f8..e389e37e215 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,7 +1,4 @@
-DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 BLAKE2B 
8e10c0c56ad97cbae0677ec91b0b35359f6e08b5eb542b00028fd0e243a075551adab4e140a90930cbce4549c3c4bc79a40c0e1a6c13aae18f67d6fc55a80e0e
 SHA512 
39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a
-DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B 
c38c1b75334cae916f76562ec5a06d59c4f2df6123d4b27a0a854dd8ecd9ae6f5d008a94137abe6217fc28d233077d636d30f2c26a5a139ff35f50cb52204f79
 SHA512 
3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66
 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 
05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827
 SHA512 
a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
-DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 
545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f
 SHA512 
9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b
 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 
4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843
 SHA512 
7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 
88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103
 SHA512 
f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B 
a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905
 SHA512 
367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085

diff --git a/app-editors/vim/vim-8.0.0386.ebuild 
b/app-editors/vim/vim-8.0.0386.ebuild
deleted file mode 100644
index 796d1755732..00000000000
--- a/app-editors/vim/vim-8.0.0386.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 
python-r1
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2";
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 
~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby 
selinux tcl vim-pager"
-REQUIRED_USE="
-       luajit? ( lua )
-       python? (
-               || ( $(python_gen_useflags '*') )
-               ?? ( $(python_gen_useflags 'python2*') )
-               ?? ( $(python_gen_useflags 'python3*') )
-       )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       !minimal? (
-               ~app-editors/vim-core-${PV}
-               dev-util/ctags
-       )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 
dev-lang/ruby:2.1 ) )
-       selinux? ( sys-libs/libselinux )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-       sys-devel/autoconf
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug 82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home
-       export HOME="${T}"/home
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' 
"${S}"/runtime/tools/mve.awk \
-               || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> 
"${S}"/src/feature.h
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> 
"${S}"/src/feature.h
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug 29398 (27 Sep 2003 agriffis)
-       sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug 43885 (20 Mar 2004 agriffis)
-       sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager ; then
-               cat <<-END > "${S}"/runtime/macros/manpager.sh
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       END
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]] ; then
-               sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile
-       fi
-
-       if version_is_at_least 7.3.122 ; then
-               cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-       fi
-
-       # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-       if version_is_at_least 7.3 ; then
-               sed -i 
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"     \
-                       "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS 
failed'
-       fi
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug 37354: Disallow -funroll-all-loops on amd64
-       # Bug 57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm -f src/auto/configure
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug 24447). The hvc
-       # things are for ppc64, see bug 86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-               [[ -e ${file} ]] && addwrite $file
-       done
-
-       if use minimal ; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-multibyte
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       --enable-multibyte
-                       $(use_enable acl)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable lua luainterp)
-                       $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-                       $(use_with luajit)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-               )
-
-               if use python ; then
-                       py_add_interp() {
-                               local v
-
-                               [[ ${EPYTHON} == python3* ]] && v=3
-                               myconf+=(
-                                       --enable-python${v}interp
-                                       vi_cv_path_python${v}="${PYTHON}"
-                               )
-                       }
-
-                       python_foreach_impl py_add_interp
-               else
-                       myconf+=(
-                               --disable-pythoninterp
-                               --disable-python3interp
-                       )
-               fi
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope ; then
-                       sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-                               die "couldn't disable cscope"
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       echo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       echo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       echo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# 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
-       syms="vimdiff rvim rview"
-       einfo "Calling eselect vi update..."
-       # Call this with --if-unset to respect user's choice (bug 187449)
-       eselect vi update --if-unset
-
-       # Make or remove convenience symlink, vim -> gvim
-       if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-               ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-       elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; 
then
-               rm "${EROOT}"/usr/bin/vim
-       fi
-
-       # Make or remove convenience symlinks to vim
-       if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-               for f in ${syms}; do
-                       ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-               done
-       else
-               for f in ${syms}; do
-                       if [[ -L "${EROOT}"/usr/bin/${f} && ! -f 
"${EROOT}"/usr/bin/${f} ]]; then
-                               rm -f "${EROOT}"/usr/bin/${f}
-                       fi
-               done
-       fi
-
-       # This will still break if you merge then remove the vi package,
-       # but there's only so much you can do, eh?  Unfortunately we don't
-       # have triggers like are done in rpm-land.
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       dosym vim /usr/bin/vimdiff
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-
-       # We shouldn't be installing the ex or view man page symlinks, as they
-       # are managed by eselect-vi
-       rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}

diff --git a/app-editors/vim/vim-8.0.1188.ebuild 
b/app-editors/vim/vim-8.0.1188.ebuild
deleted file mode 100644
index 5b4fa3b5766..00000000000
--- a/app-editors/vim/vim-8.0.1188.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIM_VERSION="8.0"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=threads
-inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-               
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby 
selinux tcl terminal vim-pager"
-REQUIRED_USE="
-       luajit? ( lua )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:0=
-       nls? ( virtual/libintl )
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       cscope? ( dev-util/cscope )
-       gpm? ( >=sys-libs/gpm-1.19.3 )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       !minimal? (
-               ~app-editors/vim-core-${PV}
-               dev-util/ctags
-       )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-       selinux? ( sys-libs/libselinux )
-       tcl? ( dev-lang/tcl:0= )
-       X? ( x11-libs/libXt )
-"
-
-DEPEND="
-       ${RDEPEND}
-       sys-devel/autoconf
-       nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-       # people with broken alphabets run into trouble. bug 82186.
-       unset LANG LC_ALL
-       export LC_COLLATE="C"
-
-       # Gnome sandbox silliness. bug #114475.
-       mkdir -p "${T}"/home || die "mkdir failed"
-       export HOME="${T}"/home
-
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}"/patches/
-       fi
-
-       # Fixup a script to use awk instead of nawk
-       sed -i -e \
-               '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-               "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-       # Read vimrc and gvimrc from /etc/vim
-       echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-       echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-               >> "${S}"/src/feature.h || die "echo failed"
-
-       # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-       # Hopefully this pattern won't break for a while at least.
-       # This fixes bug 29398 (27 Sep 2003 agriffis)
-       sed -i -e \
-               's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-               "${S}"/runtime/doc/syntax.txt \
-               "${S}"/runtime/doc/tagsrch.txt \
-               "${S}"/runtime/doc/usr_29.txt \
-               "${S}"/runtime/menu.vim \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-       # this is NeXT, but it's actually just a file in dev-libs/9libs
-       # This fixes bug 43885 (20 Mar 2004 agriffis)
-       sed -i -e \
-               's/ libc\.h / /' \
-               "${S}"/src/configure.ac || die 'sed failed'
-
-       # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-       # correctly. To avoid some really entertaining error messages about 
stuff
-       # which isn't even in the source file being invalid, we'll do some 
trickery
-       # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-       find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
-       done
-
-       # conditionally make the manpager.sh script
-       if use vim-pager; then
-               cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat 
EOF failed"
-                       #!/bin/sh
-                       sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-                                       vim \\
-                                               -c 'let no_plugin_maps = 1' \\
-                                               -c 'set nolist nomod ft=man 
ts=8' \\
-                                               -c 'let g:showmarks_enable=0' \\
-                                               -c 'runtime! macros/less.vim' -
-                       _EOF_
-       fi
-
-       # Try to avoid sandbox problems. Bug #114475.
-       if [[ -d "${S}"/src/po ]]; then
-               sed -i -e \
-                       '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; 
./testvim -X,' \
-                       "${S}"/src/po/Makefile || die "sed failed"
-       fi
-
-       cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp 
failed"
-
-       sed -i -e \
-               "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-               "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-       eapply_user
-}
-
-src_configure() {
-       local myconf=()
-
-       # Fix bug 37354: Disallow -funroll-all-loops on amd64
-       # Bug 57859 suggests that we want to do this for all archs
-       filter-flags -funroll-all-loops
-
-       # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-       # everyone since previous flag filtering bugs have turned out to affect
-       # multiple archs...
-       replace-flags -O3 -O2
-
-       # Fix bug 18245: Prevent "make" from the following chain:
-       # (1) Notice configure.ac is newer than auto/configure
-       # (2) Rebuild auto/configure
-       # (3) Notice auto/configure is newer than auto/config.mk
-       # (4) Run ./configure (with wrong args) to remake auto/config.mk
-       sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed 
failed"
-       rm src/auto/configure || die "rm failed"
-       emake -j1 -C src autoconf
-
-       # This should fix a sandbox violation (see bug 24447). The hvc
-       # things are for ppc64, see bug 86433.
-       for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-               if [[ -e "${file}" ]]; then
-                       addwrite $file
-               fi
-       done
-
-       if use minimal; then
-               myconf=(
-                       --with-features=tiny
-                       --disable-nls
-                       --disable-multibyte
-                       --disable-acl
-                       --enable-gui=no
-                       --without-x
-                       --disable-darwin
-                       --disable-luainterp
-                       --disable-perlinterp
-                       --disable-pythoninterp
-                       --disable-mzschemeinterp
-                       --disable-rubyinterp
-                       --disable-selinux
-                       --disable-tclinterp
-                       --disable-gpm
-               )
-       else
-               use debug && append-flags "-DDEBUG"
-
-               myconf=(
-                       --with-features=huge
-                       --enable-multibyte
-                       $(use_enable acl)
-                       $(use_enable cscope)
-                       $(use_enable gpm)
-                       $(use_enable lua luainterp)
-                       $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
-                       $(use_with luajit)
-                       $(use_enable nls)
-                       $(use_enable perl perlinterp)
-                       $(use_enable python pythoninterp)
-                       $(use_enable python python3interp)
-                       $(use_enable racket mzschemeinterp)
-                       $(use_enable ruby rubyinterp)
-                       $(use_enable selinux)
-                       $(use_enable tcl tclinterp)
-                       $(use_enable terminal)
-               )
-
-               # --with-features=huge forces on cscope even if we --disable 
it. We need
-               # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-               if ! use cscope; then
-                       sed -i -e \
-                               '/# define FEAT_CSCOPE/d' src/feature.h || die 
"sed failed"
-               fi
-
-               # don't test USE=X here ... see bug #19115
-               # but need to provide a way to link against X ... see bug #20093
-               myconf+=(
-                       --enable-gui=no
-                       --disable-darwin
-                       $(use_with X x)
-               )
-       fi
-
-       # let package manager strip binaries
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # keep prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       # The following allows emake to be used
-       emake -j1 -C src auto/osdef.h objects
-
-       emake
-}
-
-src_test() {
-       einfo
-       einfo "Starting vim tests. Several error messages will be shown"
-       einfo "while the tests run. This is normal behaviour and does not"
-       einfo "indicate a fault."
-       einfo
-       ewarn "If the tests fail, your terminal may be left in a strange"
-       ewarn "state. Usually, running 'reset' will fix this."
-       einfo
-
-       # Don't let vim talk to X
-       unset DISPLAY
-
-       emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-       einfo "Calling eselect vi update..."
-       eselect vi update --if-unset
-       eend $?
-}
-
-src_install() {
-       local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-       # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-       #       managed by eselect-vi
-       dobin src/vim
-       dosym vim /usr/bin/vimdiff
-       dosym vim /usr/bin/rvim
-       dosym vim /usr/bin/rview
-       if use vim-pager ; then
-               dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-               dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-               insinto ${vimfiles}/macros
-               doins runtime/macros/manpager.sh
-               fperms a+x ${vimfiles}/macros/manpager.sh
-       fi
-
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # keep in sync with 'complete ... -F' list
-       bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Call eselect vi update
-       eselect_vi_update
-}

Reply via email to