[patch] Replace minimal USE flag with a tiny USE flag

0001-Replaced-app-editors-vim-minimal-USE-flag-with-tiny-.patch (text/plain), 6.49 KB, created by Katherine Peeters on 2021-11-06 02:10:49 UTC

From 5712771cfd539dd26174f2a589a55c4701a7403c Mon Sep 17 00:00:00 2001
From: Katherine Peeters <[e-mail]>
Date: Fri, 5 Nov 2021 19:05:49 -0700
Subject: [PATCH] Replaced app-editors/vim minimal USE flag with tiny USE flag

---
 app-editors/vim/metadata.xml           |   1 +
 app-editors/vim/vim-8.2.3428-r1.ebuild | 111 ++++++++++---------------
 2 files changed, 46 insertions(+), 66 deletions(-)

diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index 4f3a37faf..0c45fe4e3 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="ipv6">Enable IPv6 support in channel</flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
     <flag name="terminal">Enable terminal emulation support</flag>
+    <flag name="tiny">Build with a reduced feature set</flag>
     <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
     <flag name="X">Link console vim against X11 libraries to enable title and
       clipboard features in xterm</flag>
diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild
index a9ea00b8b..d4d349fc4 100644
--- a/app-editors/vim/vim-8.2.3428-r1.ebuild
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
@@ -24,11 +24,11 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 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 @@ RDEPEND="
 	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 @@ RDEPEND="
 	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 @@ src_configure() {
 		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)
-		)
-
-		# --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
+	use debug && append-flags "-DDEBUG"
+
+	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"
 
@@ -282,9 +262,7 @@ src_test() {
 	# Looks in wrong location? (bug #742710)
 	# - Test_job_tty_in_out
 	# Fragile and depends on TERM(?)
-	# - Test_spelldump_bang
-	# Hangs.
-	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\)'
 
 	emake -j1 -C src/testdir nongui
 }
@@ -303,7 +281,7 @@ src_install() {
 	# 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
@@ -322,6 +300,7 @@ src_install() {
 
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
+
 }
 
 pkg_postinst() {
-- 
2.32.0