--- /var/db/repos/gentoo/app-editors/vim/vim-8.2.3428-r1.ebuild	2021-11-03 12:40:06.000000000 -0700
+++ vim-8.2.3428-r1.ebuild	2021-11-05 18:11:13.863552791 -0700
@@ -24,11 +24,11 @@
 
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+IUSE="X acl crypt cscope debug gpm lua nls perl python racket ruby selinux sound tcl terminal tiny vim-pager"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
+	tiny? ( !lua !perl !python !vim-pager )
 "
 
 RDEPEND="
@@ -42,8 +42,7 @@
 	lua? ( ${LUA_DEPS}
 		$(lua_gen_impl_dep 'deprecated' lua5-1)
 	)
-	!minimal? ( ~app-editors/vim-core-${PV} )
-	vim-pager? ( app-editors/vim-core[-minimal] )
+	vim-pager? ( app-editors/vim-core[-tiny] )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
@@ -51,6 +50,7 @@
 	selinux? ( sys-libs/libselinux )
 	sound? ( media-libs/libcanberra )
 	tcl? ( dev-lang/tcl:0= )
+	!tiny? ( ~app-editors/vim-core-${PV} )
 	X? ( x11-libs/libXt )
 "
 
@@ -176,69 +176,49 @@
 		fi
 	done
 
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-canberra
-			--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
-			$(use_enable sound canberra)
-			$(use_enable acl)
-			$(use_enable crypt libsodium)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python python3interp)
-			$(use_with python python3-command "${PYTHON}")
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
+	use debug && append-flags "-DDEBUG"
 
-		# --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
+	myconf=(
+		--with-features=$(usex tiny tiny huge)
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable crypt libsodium)
+		$(use_enable cscope)
+		$(use_enable gpm)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command "${PYTHON}")
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable tcl tclinterp)
+		$(use_enable terminal)
+	)
 
-		if use lua; then
-			myconf+=(
-				--enable-luainterp
-				$(use_with lua_single_target_luajit luajit)
-				--with-lua-prefix="${EPREFIX}/usr"
-			)
-		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 -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
+	if use lua; then
 		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
+			--enable-luainterp
+			$(use_with lua_single_target_luajit luajit)
+			--with-lua-prefix="${EPREFIX}/usr"
 		)
 	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)
+	)
+
 	# let package manager strip binaries
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 
@@ -301,7 +281,7 @@
 	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
 	#       managed by eselect-vi
 	dobin src/vim
-	if ! use minimal ; then
+	if ! use tiny ; then
 		dosym vim /usr/bin/vimdiff
 	fi
 	dosym vim /usr/bin/rvim
@@ -320,6 +300,7 @@
 
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
+
 }
 
 pkg_postinst() {