app-editors/vim: drop unnecessary test hacks

diff --git a/app-editors/vim/vim-7.4.1583.ebuild b/app-editors/vim/vim-7.4.1583.ebuild
index d0e5706af1cf32be56862adae860bef5808c3bb6..d711d5e20a50e697f930473dcf4d7596f4b2b0b1 100644 (file)
--- a/app-editors/vim/vim-7.4.1583.ebuild
+++ b/app-editors/vim/vim-7.4.1583.ebuild
@@ -271,19 +271,7 @@ 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
-
-       # 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
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../vim nongui
+       emake -j1 -C src/testdir nongui
 }
 
 # Make convenience symlinks, hopefully without stepping on toes.  Some

diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index d0e5706af1cf32be56862adae860bef5808c3bb6..09e7b11859840cd7c8ff062295428ce76ee83799 100644 (file)
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
 
 RDEPEND="
        >=app-eselect/eselect-vi-1.1
-       >=sys-libs/ncurses-5.2-r2:=
+       >=sys-libs/ncurses-5.2-r2:0=
        nls? ( virtual/libintl )
        acl? ( kernel_linux? ( sys-apps/acl ) )
        cscope? ( dev-util/cscope )
@@ -271,19 +271,7 @@ 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
-
-       # 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
-
-       # Don't try to do the additional GUI test
-       emake -j1 VIMPROG=../vim nongui
+       emake -j1 -C src/testdir nongui
 }
 
 # Make convenience symlinks, hopefully without stepping on toes.  Some