summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2016-03-16 21:31:54 -0400
committerTim Harder <radhermit@gentoo.org>2016-03-16 22:10:06 -0400
commit3e00bcfb037f3bcb461f6981ae5139fdaf4c9061 (patch)
tree5828ff0fef24930411c0a7ad792a7cf58b13de63 /app-editors/gvim/gvim-9999.ebuild
parentapp-editors/vim: version bump to 7.4.1583 (diff)
downloadgentoo-3e00bcfb037f3bcb461f6981ae5139fdaf4c9061.tar.gz
gentoo-3e00bcfb037f3bcb461f6981ae5139fdaf4c9061.tar.bz2
gentoo-3e00bcfb037f3bcb461f6981ae5139fdaf4c9061.zip
app-editors/gvim: version bump to 7.4.1583
Diffstat (limited to 'app-editors/gvim/gvim-9999.ebuild')
-rw-r--r--app-editors/gvim/gvim-9999.ebuild24
1 files changed, 8 insertions, 16 deletions
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 315b9dd2c12e..543f69541838 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -36,7 +36,7 @@ REQUIRED_USE="
RDEPEND="
~app-editors/vim-core-${PV}
>=app-eselect/eselect-vi-1.1
- >=sys-libs/ncurses-5.2-r2:=
+ >=sys-libs/ncurses-5.2-r2:0=
x11-libs/libXext
x11-libs/libXt
acl? ( kernel_linux? ( sys-apps/acl ) )
@@ -292,23 +292,15 @@ src_test() {
# 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
+ # 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 || die
- # 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
+ # Make sure our VIMPROG is used.
+ sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
- # 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
+ # Don't do additional GUI tests.
+ emake -j1 VIMPROG=../testvim -C src/testdir nongui
}
# Make convenience symlinks, hopefully without stepping on toes. Some