Attachment #748899 for bug #503732

Lines 11-16 Link Here

(-)a/app-editors/vim/metadata.xml (+1 lines)
11	<flag name="ipv6">Enable IPv6 support in channel</flag>	11	<flag name="ipv6">Enable IPv6 support in channel</flag>
12	<flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>	12	<flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
13	<flag name="terminal">Enable terminal emulation support</flag>	13	<flag name="terminal">Enable terminal emulation support</flag>
		14	<flag name="tiny">Build with a reduced feature set</flag>
14	<flag name="vim-pager">Install vimpager and vimmanpager links</flag>	15	<flag name="vim-pager">Install vimpager and vimmanpager links</flag>
15	<flag name="X">Link console vim against X11 libraries to enable title and	16	<flag name="X">Link console vim against X11 libraries to enable title and
16	clipboard features in xterm</flag>	17	clipboard features in xterm</flag>




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"
fi

DESCRIPTION="Vim, an improved vi-style text editor"


SLOT="0"
LICENSE="vim"
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} )
	tiny? ( !lua !perl !python !vim-pager )
"

RDEPEND="

	lua? ( ${LUA_DEPS}
		$(lua_gen_impl_dep 'deprecated' lua5-1)
	)
	vim-pager? ( app-editors/vim-core[-tiny] )
	vim-pager? ( app-editors/vim-core[-minimal] )
	perl? ( dev-lang/perl:= )
	python? ( ${PYTHON_DEPS} )
	racket? ( dev-scheme/racket )

	selinux? ( sys-libs/libselinux )
	sound? ( media-libs/libcanberra )
	tcl? ( dev-lang/tcl:0= )
	!tiny? ( ~app-editors/vim-core-${PV} )
	X? ( x11-libs/libXt )
"


		fi
	done

	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)
	)
		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

	# --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
		fi

	if use lua; then
		# but need to provide a way to link against X ... see bug #20093
		myconf+=(
			--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"


	# Looks in wrong location? (bug #742710)
	# - Test_job_tty_in_out
	# Fragile and depends on TERM(?)
	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\)'
	# Hangs.
	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)'

	emake -j1 -C src/testdir nongui
}

	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
	#       managed by eselect-vi
	dobin src/vim
	if ! use tiny ; then
		dosym vim /usr/bin/vimdiff
	fi
	dosym vim /usr/bin/rvim


	# keep in sync with 'complete ... -F' list
	bashcomp_alias vim ex vi view rvim rview vimdiff

}

pkg_postinst() {
- 

Return to bug 503732

Lines 16-22 if [[ ${PV} == 9999* ]] ; then Link Here

(-)a/app-editors/vim/vim-8.2.3428-r1.ebuild (-67 / +45 lines)
16	else	16	else
17	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz	17	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
18	https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"	18	https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
19	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"	19	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"
20	fi	20	fi
21		21
22	DESCRIPTION="Vim, an improved vi-style text editor"	22	DESCRIPTION="Vim, an improved vi-style text editor"
Lines 24-34 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" Link Here
24		24
25	SLOT="0"	25	SLOT="0"
26	LICENSE="vim"	26	LICENSE="vim"
27	IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"	27	IUSE="X acl crypt cscope debug gpm lua nls perl python racket ruby selinux sound tcl terminal tiny vim-pager"
28	REQUIRED_USE="	28	REQUIRED_USE="
29	lua? ( ${LUA_REQUIRED_USE} )	29	lua? ( ${LUA_REQUIRED_USE} )
30	python? ( ${PYTHON_REQUIRED_USE} )	30	python? ( ${PYTHON_REQUIRED_USE} )
31	vim-pager? ( !minimal )	31	tiny? ( !lua !perl !python !vim-pager )
32	"	32	"
33		33
34	RDEPEND="	34	RDEPEND="
Lines 42-49 RDEPEND=" Link Here
42	lua? ( ${LUA_DEPS}	42	lua? ( ${LUA_DEPS}
43	$(lua_gen_impl_dep 'deprecated' lua5-1)	43	$(lua_gen_impl_dep 'deprecated' lua5-1)
44	)	44	)
45	!minimal? ( ~app-editors/vim-core-${PV} )	45	vim-pager? ( app-editors/vim-core[-tiny] )
46	vim-pager? ( app-editors/vim-core[-minimal] )
47	perl? ( dev-lang/perl:= )	46	perl? ( dev-lang/perl:= )
48	python? ( ${PYTHON_DEPS} )	47	python? ( ${PYTHON_DEPS} )
49	racket? ( dev-scheme/racket )	48	racket? ( dev-scheme/racket )
Lines 51-56 RDEPEND=" Link Here
51	selinux? ( sys-libs/libselinux )	50	selinux? ( sys-libs/libselinux )
52	sound? ( media-libs/libcanberra )	51	sound? ( media-libs/libcanberra )
53	tcl? ( dev-lang/tcl:0= )	52	tcl? ( dev-lang/tcl:0= )
		53	!tiny? ( ~app-editors/vim-core-${PV} )
54	X? ( x11-libs/libXt )	54	X? ( x11-libs/libXt )
55	"	55	"
56		56
Lines 176-244 src_configure() { Link Here
176	fi	176	fi
177	done	177	done
178		178
179	if use minimal; then	179	use debug && append-flags "-DDEBUG"
180	myconf=(	180
181	--with-features=tiny	181	myconf=(
182	--disable-nls	182	--with-features=$(usex tiny tiny huge)
183	--disable-canberra	183	$(use_enable sound canberra)
184	--disable-acl	184	$(use_enable acl)
185	--enable-gui=no	185	$(use_enable crypt libsodium)
186	--without-x	186	$(use_enable cscope)
187	--disable-darwin	187	$(use_enable gpm)
188	--disable-luainterp	188	$(use_enable nls)
189	--disable-perlinterp	189	$(use_enable perl perlinterp)
190	--disable-pythoninterp	190	$(use_enable python python3interp)
191	--disable-mzschemeinterp	191	$(use_with python python3-command "${PYTHON}")
192	--disable-rubyinterp	192	$(use_enable racket mzschemeinterp)
193	--disable-selinux	193	$(use_enable ruby rubyinterp)
194	--disable-tclinterp	194	$(use_enable selinux)
195	--disable-gpm	195	$(use_enable tcl tclinterp)
196	)	196	$(use_enable terminal)
197	else	197	)
198	use debug && append-flags "-DDEBUG"
199
200	myconf=(
201	--with-features=huge
202	$(use_enable sound canberra)
203	$(use_enable acl)
204	$(use_enable crypt libsodium)
205	$(use_enable cscope)
206	$(use_enable gpm)
207	$(use_enable nls)
208	$(use_enable perl perlinterp)
209	$(use_enable python python3interp)
210	$(use_with python python3-command "${PYTHON}")
211	$(use_enable racket mzschemeinterp)
212	$(use_enable ruby rubyinterp)
213	$(use_enable selinux)
214	$(use_enable tcl tclinterp)
215	$(use_enable terminal)
216	)
217
218	# --with-features=huge forces on cscope even if we --disable it. We need
219	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
220	if ! use cscope; then
221	sed -i -e \
222	'/# define FEAT_CSCOPE/d' src/feature.h \|\| die "sed failed"
223	fi
224		198
225	if use lua; then	199	# --with-features=huge forces on cscope even if we --disable it. We need
226	myconf+=(	200	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
227	--enable-luainterp	201	if ! use cscope; then
228	$(use_with lua_single_target_luajit luajit)	202	sed -i -e \
229	--with-lua-prefix="${EPREFIX}/usr"	203	'/# define FEAT_CSCOPE/d' src/feature.h \|\| die "sed failed"
230	)	204	fi
231	fi
232		205
233	# don't test USE=X here ... see bug #19115	206	if use lua; then
234	# but need to provide a way to link against X ... see bug #20093
235	myconf+=(	207	myconf+=(
236	--enable-gui=no	208	--enable-luainterp
237	--disable-darwin	209	$(use_with lua_single_target_luajit luajit)
238	$(use_with X x)	210	--with-lua-prefix="${EPREFIX}/usr"
239	)	211	)
240	fi	212	fi
241		213
		214	# don't test USE=X here ... see bug #19115
		215	# but need to provide a way to link against X ... see bug #20093
		216	myconf+=(
		217	--enable-gui=no
		218	--disable-darwin
		219	$(use_with X x)
		220	)
		221
242	# let package manager strip binaries	222	# let package manager strip binaries
243	export ac_cv_prog_STRIP="$(type -P true ) faking strip"	223	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
244		224
Lines 282-290 src_test() { Link Here
282	# Looks in wrong location? (bug #742710)	262	# Looks in wrong location? (bug #742710)
283	# - Test_job_tty_in_out	263	# - Test_job_tty_in_out
284	# Fragile and depends on TERM(?)	264	# Fragile and depends on TERM(?)
285	# - Test_spelldump_bang	265	export TEST_SKIP_PAT='\(Test_expand_star_star\\|Test_exrc\\|Test_job_tty_in_out\)'
286	# Hangs.
287	export TEST_SKIP_PAT='\(Test_expand_star_star\\|Test_exrc\\|Test_job_tty_in_out\\|Test_spelldump_bang\)'
288		266
289	emake -j1 -C src/testdir nongui	267	emake -j1 -C src/testdir nongui
290	}	268	}
Lines 303-309 src_install() { Link Here
303	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are	281	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
304	# managed by eselect-vi	282	# managed by eselect-vi
305	dobin src/vim	283	dobin src/vim
306	if ! use minimal ; then	284	if ! use tiny ; then
307	dosym vim /usr/bin/vimdiff	285	dosym vim /usr/bin/vimdiff
308	fi	286	fi
309	dosym vim /usr/bin/rvim	287	dosym vim /usr/bin/rvim
Lines 322-327 src_install() { Link Here
322		300
323	# keep in sync with 'complete ... -F' list	301	# keep in sync with 'complete ... -F' list
324	bashcomp_alias vim ex vi view rvim rview vimdiff	302	bashcomp_alias vim ex vi view rvim rview vimdiff
		303
325	}	304	}
326		305
327	pkg_postinst() {	306	pkg_postinst() {
328	-