diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 8abe337a90a..637509a48d2 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,17 +1,17 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.2.0000
-revision=2
+version=8.2.0059
+revision=1
 hostmakedepends="glib-devel pkg-config"
 makedepends="acl-devel gtk+3-devel libXt-devel lua-devel ncurses-devel
- perl python-devel python3-devel ruby-devel"
+ perl python3-devel ruby-devel"
 depends="vim-common>=${version}"
 short_desc="Vim editor (vi clone)"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=8a72323817210daf40abe545bdf7637591b9b541a0fb3560baed76e436132dba
+checksum=e0883d510f5fa7e35cbafed266140cdf5c5f98fbd74293426935b187bc4e68bf
 
 subpackages="xxd vim-common vim-x11 gvim"
 # XXX vim-huge cannot be cross compiled for now.
@@ -65,20 +65,13 @@ do_configure() {
 	if [ -z "$CROSS_BUILD" ]; then
 		cd $wrksrc/vim-huge
 		./configure ${configure_args} ${args} --with-x=yes --enable-gui=no \
-			--with-features=huge --enable-perlinterp --enable-pythoninterp \
+			--with-features=huge --enable-perlinterp --enable-python3interp \
 			--enable-rubyinterp --enable-luainterp --enable-terminal
 
-		cd $wrksrc/vim-huge-python3
-		./configure ${configure_args} ${args} --with-x=yes --enable-gui=no \
-			--with-features=huge --enable-perlinterp \
-			--disable-pythoninterp --enable-python3interp \
-			--enable-rubyinterp --enable-luainterp \
-			--enable-terminal
-
 		cd $wrksrc/gvim-huge
 		./configure ${configure_args} ${args} \
 			--enable-gui=gtk3 --with-x --with-vim-name=gvim-huge \
-			--with-features=huge --enable-perlinterp --enable-pythoninterp \
+			--with-features=huge --enable-perlinterp --enable-python3interp \
 			--enable-rubyinterp --enable-luainterp --enable-terminal
 	fi
 }
@@ -162,9 +155,9 @@ gvim_package() {
 	}
 }
 gvim-huge_package() {
-	depends="python vim-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	depends="python3 vim-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
 	provides="vim-${version}_${revision}"
-	short_desc+=" - GTK+ GUI - Huge (all features enabled, using Python 2)"
+	short_desc+=" - GTK+ GUI - Huge (all features enabled)"
 	alternatives="vim:vim:/usr/bin/gvim-huge"
 	pkg_install() {
 		cd $wrksrc/gvim-huge
@@ -176,8 +169,8 @@ gvim-huge_package() {
 	}
 }
 vim-huge_package() {
-	depends="python vim-common-${version}_${revision}"
-	short_desc+=" - Huge (all features enabled, using Python 2)"
+	depends="python3 vim-common-${version}_${revision}"
+	short_desc+=" - Huge (all features enabled)"
 	provides="vim-${version}_${revision}"
 	alternatives="vim:vim:/usr/bin/vim-huge"
 	pkg_install() {
@@ -185,13 +178,10 @@ vim-huge_package() {
 	}
 }
 vim-huge-python3_package() {
-	depends="python3 vim-common-${version}_${revision}"
-	short_desc+=" - Huge (all features enabled, using Python 3)"
+	depends="vim-huge"
+	short_desc+=" - transitional packages"
+	build_style=meta
 	provides="vim-${version}_${revision}"
-	alternatives="vim:vim:/usr/bin/vim-huge-python3"
-	pkg_install() {
-		vbin $wrksrc/vim-huge-python3/src/vim vim-huge-python3
-	}
 }
 xxd_package() {
 	short_desc="Make a hexdump or do the reverse"