commit:     0011e0a0bc24a0323dc5aa81f4eba42270c5b6fb
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 03:22:34 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 03:24:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0011e0a0

app-editors/gvim: remove old

 app-editors/gvim/Manifest            |   5 -
 app-editors/gvim/gvim-7.4.591.ebuild | 414 ----------------------------------
 app-editors/gvim/gvim-7.4.622.ebuild | 420 ----------------------------------
 app-editors/gvim/gvim-7.4.670.ebuild | 420 ----------------------------------
 app-editors/gvim/gvim-7.4.712.ebuild | 421 -----------------------------------
 app-editors/gvim/gvim-7.4.738.ebuild | 416 ----------------------------------
 6 files changed, 2096 deletions(-)

diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index fa9f84d..ff2b1fe 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,9 +1,4 @@
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 
0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 
446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9
 WHIRLPOOL 
cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
-DIST vim-7.4.591.patch.xz 805892 SHA256 
6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 
fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968
 WHIRLPOOL 
47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
-DIST vim-7.4.622.patch.xz 816104 SHA256 
f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 
544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3
 WHIRLPOOL 
2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
-DIST vim-7.4.670.patch.xz 845000 SHA256 
5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 
04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536
 WHIRLPOOL 
6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
-DIST vim-7.4.712.patch.xz 890304 SHA256 
fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 
639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0
 WHIRLPOOL 
f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9
-DIST vim-7.4.738.tar.gz 12178346 SHA256 
f95cf39278ca67837538f8146dd4701de4a4da610d95687da252d458137dcb40 SHA512 
4ef990c5b869a571f0ddafac7c14ef17b62e2a9e2e74f1adaa8a69f92f3c6f56a21f60a3b53cbb64922df8c709d4e8ba9aee081476ce90f5665b1124a7de9a3a
 WHIRLPOOL 
92e9c019f2e0677fb2db99995f56b49a034abe5da2051d0012c05e6f74ab88070b635e5159c09c6635d69c23fc81afafdc11e37e17e9338a9ca41de9381cd1a1
 DIST vim-7.4.769.tar.gz 12189506 SHA256 
d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 
ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c
 WHIRLPOOL 
230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947
 DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 
1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 
122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988
 WHIRLPOOL 
23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
 DIST vim-7.4.827.tar.gz 12203128 SHA256 
8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 
e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a
 WHIRLPOOL 
e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5

diff --git a/app-editors/gvim/gvim-7.4.591.ebuild 
b/app-editors/gvim/gvim-7.4.591.ebuild
deleted file mode 100644
index c59b23e..0000000
--- a/app-editors/gvim/gvim-7.4.591.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 
prefix python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit mercurial
-       EHG_REPO_URI="https://vim.googlecode.com/hg/";
-       EHG_PROJECT="vim"
-else
-       VIM_ORG_PATCH="vim-${PV}.patch.xz"
-       SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-               https://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-               
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="http://www.vim.org/";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
-REQUIRED_USE="
-       python? ( ${PYTHON_REQUIRED_USE} )
-       luajit? ( lua )
-"
-
-RDEPEND="
-       ~app-editors/vim-core-${PV}
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2
-       x11-libs/libXext
-       x11-libs/libXt
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       !aqua? (
-               gtk? (
-                       >=x11-libs/gtk+-2.6:2
-                       x11-libs/libXft
-                       gnome? ( >=gnome-base/libgnomeui-2.6 )
-               )
-               !gtk? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               neXt? ( x11-libs/neXtaw )
-                               !neXt? ( x11-libs/libXaw )
-                       )
-               )
-       )
-       cscope? ( dev-util/cscope )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       nls? ( virtual/libintl )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-       selinux? ( sys-libs/libselinux )
-       session? ( x11-libs/libSM )
-       tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-       dev-util/ctags
-       sys-devel/autoconf
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-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
-
-       use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       if [[ ${PV} != 9999* ]] ; then
-               if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
-                       # Apply any patches available from vim.org for this 
version
-                       epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
-               fi
-
-               if [[ -d "${WORKDIR}"/patches/ ]]; then
-                       # Gentoo patches to fix runtime issues, cross-compile 
errors, etc
-                       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches/
-               fi
-       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.in || 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.in || 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
-
-       # 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
-
-       epatch_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.in 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
-
-       use debug && append-flags "-DDEBUG"
-
-       myconf=(
-               --with-features=huge
-               --disable-gpm
-               --enable-multibyte
-               $(use_enable acl)
-               $(use_enable cscope)
-               $(use_enable lua luainterp)
-               $(use_with luajit)
-               $(use_enable netbeans)
-               $(use_enable nls)
-               $(use_enable perl perlinterp)
-               $(use_enable racket mzschemeinterp)
-               $(use_enable ruby rubyinterp)
-               $(use_enable selinux)
-               $(use_enable session xsmp)
-               $(use_enable tcl tclinterp)
-       )
-
-       if use python ; then
-               if [[ ${EPYTHON} == python3* ]] ; then
-                       myconf+=( --enable-python3interp )
-                       export vi_cv_path_python3="${PYTHON}"
-               else
-                       myconf+=( --enable-pythoninterp )
-                       export vi_cv_path_python="${PYTHON}"
-               fi
-       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
-
-       # gvim's GUI preference order is as follows:
-       # aqua                          CARBON (not tested)
-       # -aqua gtk gnome               GNOME2
-       # -aqua gtk -gnome              GTK2
-       # -aqua -gtk  motif             MOTIF
-       # -aqua -gtk -motif neXt        NEXTAW
-       # -aqua -gtk -motif -neXt       ATHENA
-       echo ; echo
-       if use aqua ; then
-               einfo "Building gvim with the Carbon GUI"
-               myconf+=(
-                       --enable-darwin
-                       --enable-gui=carbon
-               )
-       elif use gtk ; then
-               myconf+=( --enable-gtk2-check )
-               if use gnome ; then
-                       einfo "Building gvim with the Gnome 2 GUI"
-                       myconf+=( --enable-gui=gnome2 )
-               else
-                       einfo "Building gvim with the gtk+-2 GUI"
-                       myconf+=( --enable-gui=gtk2 )
-               fi
-       elif use motif ; then
-               einfo "Building gvim with the MOTIF GUI"
-               myconf+=( --enable-gui=motif )
-       elif use neXt ; then
-               einfo "Building gvim with the neXtaw GUI"
-               myconf+=( --enable-gui=nextaw )
-       else
-               einfo "Building gvim with the Athena GUI"
-               myconf+=( --enable-gui=athena )
-       fi
-       echo ; echo
-
-       # Let Portage do the stripping. Some people like that.
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # Keep Gentoo Prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               # avoid finding of this function, to avoid having to patch 
either
-               # configure or the source, which would be much more hackish.
-               # after all vim does it right, only interix is badly broken 
(again)
-               export ac_cv_func_sigaction=no
-       fi
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               --with-vim-name=gvim \
-               --with-x \
-               "${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
-
-       # We've got to call make test from within testdir, since the Makefiles
-       # don't pass through our VIMPROG argument
-       cd "${S}"/src/testdir
-
-       # Test 49 won't work inside a portage environment
-       einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-       sed -i 's~test49.out~~g' Makefile
-
-       # We don't want to rebuild vim before running the tests
-       sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-       # Make gvim not try to connect to X. See :help gui-x11-start
-       # in vim for how this evil trickery works.
-       ln -s "${S}"/src/gvim "${S}"/src/testvim
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../testvim 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/.}
-
-       dobin src/gvim
-       dosym gvim /usr/bin/gvimdiff
-       dosym gvim /usr/bin/evim
-       dosym gvim /usr/bin/eview
-       dosym gvim /usr/bin/gview
-       dosym gvim /usr/bin/rgvim
-       dosym gvim /usr/bin/rgview
-
-       dodir /usr/share/man/man1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
-
-       insinto /etc/vim
-       newins "${FILESDIR}"/gvimrc-r1 gvimrc
-       eprefixify "${ED}"/etc/vim/gvimrc
-
-       newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-       doicon "${FILESDIR}"/gvim.xpm
-
-       # bash completion script, bug #79018.
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # 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
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "Vim 7 includes an integrated spell checker. You need to 
install"
-               elog "word list files before you can use it. There are ebuilds 
for"
-               elog "some of these named app-vim/vim-spell-*. If your language 
of"
-               elog "choice is not included, please consult vim-spell.eclass 
for"
-               elog "instructions on how to make a package."
-               echo
-               ewarn "Note that the English word lists are no longer installed 
by"
-               ewarn "default."
-               echo
-       fi
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}

diff --git a/app-editors/gvim/gvim-7.4.622.ebuild 
b/app-editors/gvim/gvim-7.4.622.ebuild
deleted file mode 100644
index a8c49e3..0000000
--- a/app-editors/gvim/gvim-7.4.622.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 
prefix python-r1
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit mercurial
-       EHG_REPO_URI="https://vim.googlecode.com/hg/";
-       EHG_PROJECT="vim"
-else
-       VIM_ORG_PATCH="vim-${PV}.patch.xz"
-       SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-               https://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-               
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="http://www.vim.org/";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
-REQUIRED_USE="
-       luajit? ( lua )
-       python? (
-               || ( $(python_gen_useflags '*') )
-               ?? ( $(python_gen_useflags 'python2*') )
-               ?? ( $(python_gen_useflags 'python3*') )
-       )
-"
-
-RDEPEND="
-       ~app-editors/vim-core-${PV}
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2
-       x11-libs/libXext
-       x11-libs/libXt
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       !aqua? (
-               gtk? (
-                       >=x11-libs/gtk+-2.6:2
-                       x11-libs/libXft
-                       gnome? ( >=gnome-base/libgnomeui-2.6 )
-               )
-               !gtk? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               neXt? ( x11-libs/neXtaw )
-                               !neXt? ( x11-libs/libXaw )
-                       )
-               )
-       )
-       cscope? ( dev-util/cscope )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       nls? ( virtual/libintl )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-       selinux? ( sys-libs/libselinux )
-       session? ( x11-libs/libSM )
-       tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-       dev-util/ctags
-       sys-devel/autoconf
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-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
-               if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
-                       # Apply any patches available from vim.org for this 
version
-                       epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
-               fi
-
-               if [[ -d "${WORKDIR}"/patches/ ]]; then
-                       # Gentoo patches to fix runtime issues, cross-compile 
errors, etc
-                       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches/
-               fi
-       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.in || 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.in || 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
-
-       # 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
-
-       epatch_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.in 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
-
-       use debug && append-flags "-DDEBUG"
-
-       myconf=(
-               --with-features=huge
-               --disable-gpm
-               --enable-multibyte
-               $(use_enable acl)
-               $(use_enable cscope)
-               $(use_enable lua luainterp)
-               $(use_with luajit)
-               $(use_enable netbeans)
-               $(use_enable nls)
-               $(use_enable perl perlinterp)
-               $(use_enable racket mzschemeinterp)
-               $(use_enable ruby rubyinterp)
-               $(use_enable selinux)
-               $(use_enable session xsmp)
-               $(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
-
-       # gvim's GUI preference order is as follows:
-       # aqua                          CARBON (not tested)
-       # -aqua gtk gnome               GNOME2
-       # -aqua gtk -gnome              GTK2
-       # -aqua -gtk  motif             MOTIF
-       # -aqua -gtk -motif neXt        NEXTAW
-       # -aqua -gtk -motif -neXt       ATHENA
-       echo ; echo
-       if use aqua ; then
-               einfo "Building gvim with the Carbon GUI"
-               myconf+=(
-                       --enable-darwin
-                       --enable-gui=carbon
-               )
-       elif use gtk ; then
-               myconf+=( --enable-gtk2-check )
-               if use gnome ; then
-                       einfo "Building gvim with the Gnome 2 GUI"
-                       myconf+=( --enable-gui=gnome2 )
-               else
-                       einfo "Building gvim with the gtk+-2 GUI"
-                       myconf+=( --enable-gui=gtk2 )
-               fi
-       elif use motif ; then
-               einfo "Building gvim with the MOTIF GUI"
-               myconf+=( --enable-gui=motif )
-       elif use neXt ; then
-               einfo "Building gvim with the neXtaw GUI"
-               myconf+=( --enable-gui=nextaw )
-       else
-               einfo "Building gvim with the Athena GUI"
-               myconf+=( --enable-gui=athena )
-       fi
-       echo ; echo
-
-       # Let Portage do the stripping. Some people like that.
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # Keep Gentoo Prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               # avoid finding of this function, to avoid having to patch 
either
-               # configure or the source, which would be much more hackish.
-               # after all vim does it right, only interix is badly broken 
(again)
-               export ac_cv_func_sigaction=no
-       fi
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               --with-vim-name=gvim \
-               --with-x \
-               "${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
-
-       # We've got to call make test from within testdir, since the Makefiles
-       # don't pass through our VIMPROG argument
-       cd "${S}"/src/testdir
-
-       # Test 49 won't work inside a portage environment
-       einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-       sed -i 's~test49.out~~g' Makefile
-
-       # We don't want to rebuild vim before running the tests
-       sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-       # Make gvim not try to connect to X. See :help gui-x11-start
-       # in vim for how this evil trickery works.
-       ln -s "${S}"/src/gvim "${S}"/src/testvim
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../testvim 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/.}
-
-       dobin src/gvim
-       dosym gvim /usr/bin/gvimdiff
-       dosym gvim /usr/bin/evim
-       dosym gvim /usr/bin/eview
-       dosym gvim /usr/bin/gview
-       dosym gvim /usr/bin/rgvim
-       dosym gvim /usr/bin/rgview
-
-       dodir /usr/share/man/man1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
-
-       insinto /etc/vim
-       newins "${FILESDIR}"/gvimrc-r1 gvimrc
-       eprefixify "${ED}"/etc/vim/gvimrc
-
-       newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-       doicon "${FILESDIR}"/gvim.xpm
-
-       # bash completion script, bug #79018.
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # 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
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "Vim 7 includes an integrated spell checker. You need to 
install"
-               elog "word list files before you can use it. There are ebuilds 
for"
-               elog "some of these named app-vim/vim-spell-*. If your language 
of"
-               elog "choice is not included, please consult vim-spell.eclass 
for"
-               elog "instructions on how to make a package."
-               echo
-               ewarn "Note that the English word lists are no longer installed 
by"
-               ewarn "default."
-               echo
-       fi
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}

diff --git a/app-editors/gvim/gvim-7.4.670.ebuild 
b/app-editors/gvim/gvim-7.4.670.ebuild
deleted file mode 100644
index a8c49e3..0000000
--- a/app-editors/gvim/gvim-7.4.670.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 
prefix python-r1
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit mercurial
-       EHG_REPO_URI="https://vim.googlecode.com/hg/";
-       EHG_PROJECT="vim"
-else
-       VIM_ORG_PATCH="vim-${PV}.patch.xz"
-       SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-               https://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-               
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="http://www.vim.org/";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
-REQUIRED_USE="
-       luajit? ( lua )
-       python? (
-               || ( $(python_gen_useflags '*') )
-               ?? ( $(python_gen_useflags 'python2*') )
-               ?? ( $(python_gen_useflags 'python3*') )
-       )
-"
-
-RDEPEND="
-       ~app-editors/vim-core-${PV}
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2
-       x11-libs/libXext
-       x11-libs/libXt
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       !aqua? (
-               gtk? (
-                       >=x11-libs/gtk+-2.6:2
-                       x11-libs/libXft
-                       gnome? ( >=gnome-base/libgnomeui-2.6 )
-               )
-               !gtk? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               neXt? ( x11-libs/neXtaw )
-                               !neXt? ( x11-libs/libXaw )
-                       )
-               )
-       )
-       cscope? ( dev-util/cscope )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       nls? ( virtual/libintl )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-       selinux? ( sys-libs/libselinux )
-       session? ( x11-libs/libSM )
-       tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-       dev-util/ctags
-       sys-devel/autoconf
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-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
-               if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
-                       # Apply any patches available from vim.org for this 
version
-                       epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
-               fi
-
-               if [[ -d "${WORKDIR}"/patches/ ]]; then
-                       # Gentoo patches to fix runtime issues, cross-compile 
errors, etc
-                       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches/
-               fi
-       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.in || 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.in || 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
-
-       # 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
-
-       epatch_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.in 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
-
-       use debug && append-flags "-DDEBUG"
-
-       myconf=(
-               --with-features=huge
-               --disable-gpm
-               --enable-multibyte
-               $(use_enable acl)
-               $(use_enable cscope)
-               $(use_enable lua luainterp)
-               $(use_with luajit)
-               $(use_enable netbeans)
-               $(use_enable nls)
-               $(use_enable perl perlinterp)
-               $(use_enable racket mzschemeinterp)
-               $(use_enable ruby rubyinterp)
-               $(use_enable selinux)
-               $(use_enable session xsmp)
-               $(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
-
-       # gvim's GUI preference order is as follows:
-       # aqua                          CARBON (not tested)
-       # -aqua gtk gnome               GNOME2
-       # -aqua gtk -gnome              GTK2
-       # -aqua -gtk  motif             MOTIF
-       # -aqua -gtk -motif neXt        NEXTAW
-       # -aqua -gtk -motif -neXt       ATHENA
-       echo ; echo
-       if use aqua ; then
-               einfo "Building gvim with the Carbon GUI"
-               myconf+=(
-                       --enable-darwin
-                       --enable-gui=carbon
-               )
-       elif use gtk ; then
-               myconf+=( --enable-gtk2-check )
-               if use gnome ; then
-                       einfo "Building gvim with the Gnome 2 GUI"
-                       myconf+=( --enable-gui=gnome2 )
-               else
-                       einfo "Building gvim with the gtk+-2 GUI"
-                       myconf+=( --enable-gui=gtk2 )
-               fi
-       elif use motif ; then
-               einfo "Building gvim with the MOTIF GUI"
-               myconf+=( --enable-gui=motif )
-       elif use neXt ; then
-               einfo "Building gvim with the neXtaw GUI"
-               myconf+=( --enable-gui=nextaw )
-       else
-               einfo "Building gvim with the Athena GUI"
-               myconf+=( --enable-gui=athena )
-       fi
-       echo ; echo
-
-       # Let Portage do the stripping. Some people like that.
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # Keep Gentoo Prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               # avoid finding of this function, to avoid having to patch 
either
-               # configure or the source, which would be much more hackish.
-               # after all vim does it right, only interix is badly broken 
(again)
-               export ac_cv_func_sigaction=no
-       fi
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               --with-vim-name=gvim \
-               --with-x \
-               "${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
-
-       # We've got to call make test from within testdir, since the Makefiles
-       # don't pass through our VIMPROG argument
-       cd "${S}"/src/testdir
-
-       # Test 49 won't work inside a portage environment
-       einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-       sed -i 's~test49.out~~g' Makefile
-
-       # We don't want to rebuild vim before running the tests
-       sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-       # Make gvim not try to connect to X. See :help gui-x11-start
-       # in vim for how this evil trickery works.
-       ln -s "${S}"/src/gvim "${S}"/src/testvim
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../testvim 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/.}
-
-       dobin src/gvim
-       dosym gvim /usr/bin/gvimdiff
-       dosym gvim /usr/bin/evim
-       dosym gvim /usr/bin/eview
-       dosym gvim /usr/bin/gview
-       dosym gvim /usr/bin/rgvim
-       dosym gvim /usr/bin/rgview
-
-       dodir /usr/share/man/man1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
-
-       insinto /etc/vim
-       newins "${FILESDIR}"/gvimrc-r1 gvimrc
-       eprefixify "${ED}"/etc/vim/gvimrc
-
-       newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-       doicon "${FILESDIR}"/gvim.xpm
-
-       # bash completion script, bug #79018.
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # 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
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "Vim 7 includes an integrated spell checker. You need to 
install"
-               elog "word list files before you can use it. There are ebuilds 
for"
-               elog "some of these named app-vim/vim-spell-*. If your language 
of"
-               elog "choice is not included, please consult vim-spell.eclass 
for"
-               elog "instructions on how to make a package."
-               echo
-               ewarn "Note that the English word lists are no longer installed 
by"
-               ewarn "default."
-               echo
-       fi
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}

diff --git a/app-editors/gvim/gvim-7.4.712.ebuild 
b/app-editors/gvim/gvim-7.4.712.ebuild
deleted file mode 100644
index 6290e39..0000000
--- a/app-editors/gvim/gvim-7.4.712.ebuild
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 
prefix python-r1
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit mercurial
-       EHG_REPO_URI="https://vim.googlecode.com/hg/";
-       EHG_PROJECT="vim"
-else
-       VIM_ORG_PATCH="vim-${PV}.patch.xz"
-       SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-               https://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-               
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="http://www.vim.org/";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
-REQUIRED_USE="
-       luajit? ( lua )
-       python? (
-               || ( $(python_gen_useflags '*') )
-               ?? ( $(python_gen_useflags 'python2*') )
-               ?? ( $(python_gen_useflags 'python3*') )
-       )
-"
-
-RDEPEND="
-       ~app-editors/vim-core-${PV}
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2
-       x11-libs/libXext
-       x11-libs/libXt
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       !aqua? (
-               gtk? (
-                       >=x11-libs/gtk+-2.6:2
-                       x11-libs/libXft
-                       gnome? ( >=gnome-base/libgnomeui-2.6 )
-               )
-               !gtk? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               neXt? ( x11-libs/neXtaw )
-                               !neXt? ( x11-libs/libXaw )
-                       )
-               )
-       )
-       cscope? ( dev-util/cscope )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       nls? ( virtual/libintl )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-       selinux? ( sys-libs/libselinux )
-       session? ( x11-libs/libSM )
-       tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-       dev-util/ctags
-       sys-devel/autoconf
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-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
-               if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
-                       # Apply any patches available from vim.org for this 
version
-                       epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
-               fi
-
-               if [[ -d "${WORKDIR}"/patches/ ]]; then
-                       # Gentoo patches to fix runtime issues, cross-compile 
errors, etc
-                       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches/
-               fi
-       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.in || 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.in || 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
-
-       # 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
-
-       epatch_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.in 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
-
-       use debug && append-flags "-DDEBUG"
-
-       myconf=(
-               --with-features=huge
-               --disable-gpm
-               --enable-multibyte
-               $(use_enable acl)
-               $(use_enable cscope)
-               $(use_enable lua luainterp)
-               $(use_with luajit)
-               $(use_enable netbeans)
-               $(use_enable nls)
-               $(use_enable perl perlinterp)
-               $(use_enable racket mzschemeinterp)
-               $(use_enable ruby rubyinterp)
-               $(use_enable selinux)
-               $(use_enable session xsmp)
-               $(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
-
-       # gvim's GUI preference order is as follows:
-       # aqua                          CARBON (not tested)
-       # -aqua gtk gnome               GNOME2
-       # -aqua gtk -gnome              GTK2
-       # -aqua -gtk  motif             MOTIF
-       # -aqua -gtk -motif neXt        NEXTAW
-       # -aqua -gtk -motif -neXt       ATHENA
-       echo ; echo
-       if use aqua ; then
-               einfo "Building gvim with the Carbon GUI"
-               myconf+=(
-                       --enable-darwin
-                       --enable-gui=carbon
-               )
-       elif use gtk ; then
-               myconf+=( --enable-gtk2-check )
-               if use gnome ; then
-                       einfo "Building gvim with the Gnome 2 GUI"
-                       myconf+=( --enable-gui=gnome2 )
-               else
-                       einfo "Building gvim with the gtk+-2 GUI"
-                       myconf+=( --enable-gui=gtk2 )
-               fi
-       elif use motif ; then
-               einfo "Building gvim with the MOTIF GUI"
-               myconf+=( --enable-gui=motif )
-       elif use neXt ; then
-               einfo "Building gvim with the neXtaw GUI"
-               myconf+=( --enable-gui=nextaw )
-       else
-               einfo "Building gvim with the Athena GUI"
-               myconf+=( --enable-gui=athena )
-       fi
-       echo ; echo
-
-       # Let Portage do the stripping. Some people like that.
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # Keep Gentoo Prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               # avoid finding of this function, to avoid having to patch 
either
-               # configure or the source, which would be much more hackish.
-               # after all vim does it right, only interix is badly broken 
(again)
-               export ac_cv_func_sigaction=no
-       fi
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               --with-vim-name=gvim \
-               --with-x \
-               "${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
-
-       # We've got to call make test from within testdir, since the Makefiles
-       # don't pass through our VIMPROG argument
-       cd "${S}"/src/testdir
-
-       # Test 49 won't work inside a portage environment
-       einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-       sed -i 's~test49.out~~g' Makefile
-
-       # We don't want to rebuild vim before running the tests
-       sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-       # Make gvim not try to connect to X. See :help gui-x11-start
-       # in vim for how this evil trickery works.
-       ln -s "${S}"/src/gvim "${S}"/src/testvim
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../testvim 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/.}
-
-       dobin src/gvim
-       dosym gvim /usr/bin/gvimdiff
-       dosym gvim /usr/bin/evim
-       dosym gvim /usr/bin/eview
-       dosym gvim /usr/bin/gview
-       dosym gvim /usr/bin/rgvim
-       dosym gvim /usr/bin/rgview
-
-       dodir /usr/share/man/man1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
-
-       insinto /etc/vim
-       newins "${FILESDIR}"/gvimrc-r1 gvimrc
-       eprefixify "${ED}"/etc/vim/gvimrc
-
-       newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-       doicon "${FILESDIR}"/gvim.xpm
-       doicon -s scalable "${FILESDIR}"/gvim.svg
-
-       # bash completion script, bug #79018.
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # 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
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "Vim 7 includes an integrated spell checker. You need to 
install"
-               elog "word list files before you can use it. There are ebuilds 
for"
-               elog "some of these named app-vim/vim-spell-*. If your language 
of"
-               elog "choice is not included, please consult vim-spell.eclass 
for"
-               elog "instructions on how to make a package."
-               echo
-               ewarn "Note that the English word lists are no longer installed 
by"
-               ewarn "default."
-               echo
-       fi
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}

diff --git a/app-editors/gvim/gvim-7.4.738.ebuild 
b/app-editors/gvim/gvim-7.4.738.ebuild
deleted file mode 100644
index f14e66e..0000000
--- a/app-editors/gvim/gvim-7.4.738.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 
prefix python-r1
-
-MY_PV=${PV//./-}
-
-if [[ ${PV} == 9999* ]] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/vim/vim.git";
-       EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV}
-else
-       SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> 
vim-${PV}.tar.gz
-               
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="http://www.vim.org/";
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl 
python racket ruby selinux session tcl"
-REQUIRED_USE="
-       luajit? ( lua )
-       python? (
-               || ( $(python_gen_useflags '*') )
-               ?? ( $(python_gen_useflags 'python2*') )
-               ?? ( $(python_gen_useflags 'python3*') )
-       )
-"
-
-RDEPEND="
-       ~app-editors/vim-core-${PV}
-       >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2
-       x11-libs/libXext
-       x11-libs/libXt
-       acl? ( kernel_linux? ( sys-apps/acl ) )
-       !aqua? (
-               gtk? (
-                       >=x11-libs/gtk+-2.6:2
-                       x11-libs/libXft
-                       gnome? ( >=gnome-base/libgnomeui-2.6 )
-               )
-               !gtk? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               neXt? ( x11-libs/neXtaw )
-                               !neXt? ( x11-libs/libXaw )
-                       )
-               )
-       )
-       cscope? ( dev-util/cscope )
-       lua? (
-               luajit? ( dev-lang/luajit:2= )
-               !luajit? ( dev-lang/lua:0[deprecated] )
-       )
-       nls? ( virtual/libintl )
-       perl? ( dev-lang/perl:= )
-       python? ( ${PYTHON_DEPS} )
-       racket? ( dev-scheme/racket )
-       ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-       selinux? ( sys-libs/libselinux )
-       session? ( x11-libs/libSM )
-       tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-       dev-util/ctags
-       sys-devel/autoconf
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim-${MY_PV}
-
-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
-               if [[ -d "${WORKDIR}"/patches/ ]]; then
-                       # Gentoo patches to fix runtime issues, cross-compile 
errors, etc
-                       EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-                               epatch "${WORKDIR}"/patches/
-               fi
-       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.in || 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.in || 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
-
-       # 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
-
-       epatch_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.in 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
-
-       use debug && append-flags "-DDEBUG"
-
-       myconf=(
-               --with-features=huge
-               --disable-gpm
-               --enable-multibyte
-               $(use_enable acl)
-               $(use_enable cscope)
-               $(use_enable lua luainterp)
-               $(use_with luajit)
-               $(use_enable netbeans)
-               $(use_enable nls)
-               $(use_enable perl perlinterp)
-               $(use_enable racket mzschemeinterp)
-               $(use_enable ruby rubyinterp)
-               $(use_enable selinux)
-               $(use_enable session xsmp)
-               $(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
-
-       # gvim's GUI preference order is as follows:
-       # aqua                          CARBON (not tested)
-       # -aqua gtk gnome               GNOME2
-       # -aqua gtk -gnome              GTK2
-       # -aqua -gtk  motif             MOTIF
-       # -aqua -gtk -motif neXt        NEXTAW
-       # -aqua -gtk -motif -neXt       ATHENA
-       echo ; echo
-       if use aqua ; then
-               einfo "Building gvim with the Carbon GUI"
-               myconf+=(
-                       --enable-darwin
-                       --enable-gui=carbon
-               )
-       elif use gtk ; then
-               myconf+=( --enable-gtk2-check )
-               if use gnome ; then
-                       einfo "Building gvim with the Gnome 2 GUI"
-                       myconf+=( --enable-gui=gnome2 )
-               else
-                       einfo "Building gvim with the gtk+-2 GUI"
-                       myconf+=( --enable-gui=gtk2 )
-               fi
-       elif use motif ; then
-               einfo "Building gvim with the MOTIF GUI"
-               myconf+=( --enable-gui=motif )
-       elif use neXt ; then
-               einfo "Building gvim with the neXtaw GUI"
-               myconf+=( --enable-gui=nextaw )
-       else
-               einfo "Building gvim with the Athena GUI"
-               myconf+=( --enable-gui=athena )
-       fi
-       echo ; echo
-
-       # Let Portage do the stripping. Some people like that.
-       export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-       # Keep Gentoo Prefix env contained within the EPREFIX
-       use prefix && myconf+=( --without-local-dir )
-
-       if [[ ${CHOST} == *-interix* ]]; then
-               # avoid finding of this function, to avoid having to patch 
either
-               # configure or the source, which would be much more hackish.
-               # after all vim does it right, only interix is badly broken 
(again)
-               export ac_cv_func_sigaction=no
-       fi
-
-       econf \
-               --with-modified-by=Gentoo-${PVR} \
-               --with-vim-name=gvim \
-               --with-x \
-               "${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
-
-       # We've got to call make test from within testdir, since the Makefiles
-       # don't pass through our VIMPROG argument
-       cd "${S}"/src/testdir
-
-       # Test 49 won't work inside a portage environment
-       einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-       sed -i 's~test49.out~~g' Makefile
-
-       # We don't want to rebuild vim before running the tests
-       sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-       # Make gvim not try to connect to X. See :help gui-x11-start
-       # in vim for how this evil trickery works.
-       ln -s "${S}"/src/gvim "${S}"/src/testvim
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../testvim 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/.}
-
-       dobin src/gvim
-       dosym gvim /usr/bin/gvimdiff
-       dosym gvim /usr/bin/evim
-       dosym gvim /usr/bin/eview
-       dosym gvim /usr/bin/gview
-       dosym gvim /usr/bin/rgvim
-       dosym gvim /usr/bin/rgview
-
-       dodir /usr/share/man/man1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-       echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-       echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
-
-       insinto /etc/vim
-       newins "${FILESDIR}"/gvimrc-r1 gvimrc
-       eprefixify "${ED}"/etc/vim/gvimrc
-
-       newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-       doicon "${FILESDIR}"/gvim.xpm
-       doicon -s scalable "${FILESDIR}"/gvim.svg
-
-       # bash completion script, bug #79018.
-       newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-       # 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
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "Vim 7 includes an integrated spell checker. You need to 
install"
-               elog "word list files before you can use it. There are ebuilds 
for"
-               elog "some of these named app-vim/vim-spell-*. If your language 
of"
-               elog "choice is not included, please consult vim-spell.eclass 
for"
-               elog "instructions on how to make a package."
-               echo
-               ewarn "Note that the English word lists are no longer installed 
by"
-               ewarn "default."
-               echo
-       fi
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}
-
-pkg_postrm() {
-       # Update documentation tags (from vim-doc.eclass)
-       update_vim_helptags
-
-       # Update fdo mime stuff, bug #78394
-       fdo-mime_mime_database_update
-
-       # Make convenience symlinks
-       update_vim_symlinks
-}

Reply via email to