From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- app-editors/vim/Manifest | 20 +- app-editors/vim/vim-8.2.0814-r100.ebuild | 8 +- app-editors/vim/vim-8.2.3428-r1.ebuild | 8 +- app-editors/vim/vim-8.2.3567.ebuild | 8 +- app-editors/vim/vim-8.2.3582.ebuild | 8 +- app-editors/vim/vim-8.2.3669.ebuild | 8 +- app-editors/vim/vim-8.2.3741.ebuild | 6 +- app-editors/vim/vim-8.2.3950.ebuild | 6 +- app-editors/vim/vim-8.2.4285.ebuild | 357 +++++++++++++++++++++++++++++++ app-editors/vim/vim-8.2.4328-r1.ebuild | 350 ++++++++++++++++++++++++++++++ app-editors/vim/vim-9999.ebuild | 11 +- 11 files changed, 755 insertions(+), 35 deletions(-) create mode 100644 app-editors/vim/vim-8.2.4285.ebuild create mode 100644 app-editors/vim/vim-8.2.4328-r1.ebuild (limited to 'app-editors/vim') diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 677dc34a9e0c..858901ed49e2 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -7,12 +7,16 @@ DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7f DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be -EBUILD vim-8.2.0814-r100.ebuild 9440 BLAKE2B dca3174687b35b94074b4dd1c6c33b663b1163204a349c64a19ba25e9a4227c9e5135dbd7491308a30dcd669339598fe86a6b779c2ba03378c049766a9e11f2b SHA512 af81e0e1e8eb32bbed0551440181d73b29308b3540d9b5b649ca4b29713b5e92572fd750262f3832589216590163a2067d8deb4fe99598e4165c4174049db7b3 -EBUILD vim-8.2.3428-r1.ebuild 10129 BLAKE2B 90c5110d69abc6e14bed2dab61fc8c944c47b6cc9931b16eaeb615e81945f65977c2fa89bf065ec5bda38ca99e0764ced63c0502824ab675df0c2bc9bf03b026 SHA512 e159ccca71dc187bb53d6d97db2f8401eba0b9ea0be129d7299019d3ee6566d416a29630f907a4a0c7dd196758eceb62cadf87ebc912f4ebb71b7283394e8525 -EBUILD vim-8.2.3567.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96 -EBUILD vim-8.2.3582.ebuild 10201 BLAKE2B 19b74948c229fed51d4a5d668f97b2f3320c274aaec01658e5b3fdab11d244bdcca10df3cd14760e01f380c4058ebf53937fb0da84cd739d4c6f6f9cbcdefb02 SHA512 833011e1b757031021804b6c36911358f508b9318c82030c260be99efc631dabb6c6cd5c71695d9c448c44475354d3106a50825dca98e41bdb58045048690f18 -EBUILD vim-8.2.3669.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96 -EBUILD vim-8.2.3741.ebuild 10201 BLAKE2B bb7832ea899f26ea0c1de4d86142a17a18097092bb1128f144a5fdb1f747891e25f62f20ece63c67adcc7e5e7f8382b2b9c6a96388e0a4bfddd52aec127af4ed SHA512 1d320804780c62cf5a1cdc0dd65ebb4e5f6b0a0746c4ea0d339983aaae33da1d87df82be949839a85b15906b59dbbad5e529dcc5e02763c668a4940be7c11117 -EBUILD vim-8.2.3950.ebuild 10209 BLAKE2B ec10b49d5a770f3334739e38447652bbd06c6266c481d3696327f8ef9cb32c42916c98755a74ba9edbf0a609004d43ebcdd9f1d4b3714670017aa9e76603c2c1 SHA512 f6c90b20a2042b6a6d79fa57e9eb03f226db02393a3c6cf07c333b2fc1d11ddaddc3b2f9c55d0fc1237a4b32001c944bafb3daae45771b990109a8776e98b49c -EBUILD vim-9999.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96 +DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec +DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651 +EBUILD vim-8.2.0814-r100.ebuild 9496 BLAKE2B 77b6188e1c207b82cb341659ad28b8179bfef3d431126caeaa8eb32500b927d9e63caf606e63890597d47959ec5ed29af40c3e8c0130486c90ce2016515cd742 SHA512 da1b4a8c8e07d5dee976d36a523788f74aa7bbf10b99bc2f7e3dfe66a93bde46999c39f10466b9a3f72fef927743fe63f16883874dfdcc31fa8d1a5b0606e393 +EBUILD vim-8.2.3428-r1.ebuild 10185 BLAKE2B 2db77b2dae20412a5e2ea1d2a0192b49312619518114ae9de7dd1436d24f4f0ce8f86e49b125605396e8128050f46d69fa539c8194838a784418356cd1cb0a80 SHA512 f58dcfe5f137f712f205691f67302fad5e4e72a5836cc5e64713b26a1a44ee1d4ed4862f8bb17938a1639e27edc25605efd7d3d2cbd1bc92fd95cde294664fcd +EBUILD vim-8.2.3567.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.3582.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38 +EBUILD vim-8.2.3669.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.3741.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38 +EBUILD vim-8.2.3950.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.4285.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.4328-r1.ebuild 10089 BLAKE2B 3f7ec30b849bb9457e0ff55223913269c76cf4ed7aba2e2da29b50ea3c9bb269430dc93accab5df62cdf0959e9c12ab89e7772f8f2fd2b68586b3c2308fa053a SHA512 3347ed62ff99bc7d039f26a7bb7ea2975af9ebb5076493b17e10b41465aade46492a09b986d92f9ab39ce58652f6b2e7431e479d73eb8c12166715cc73e328b9 +EBUILD vim-9999.ebuild 10094 BLAKE2B 525197248b7938f4c79481cc3fa4a5920119e7c966a36b8d7d436e4f08aa8611e5c02c67ffdc182e662263348afd936c39f7ea7d508325c5e7ae0085f7cd4975 SHA512 d0187a2b5294cd1acc36f4324fb16199fecc7e3e02a8ea6d798d8b7b0233caa987f97a284df344b944235e06e3cecb39d66938e98241f71561bf4cc2d12494d9 MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild index 0f20c926a800..b0ae7e31e182 100644 --- a/app-editors/vim/vim-8.2.0814-r100.ebuild +++ b/app-editors/vim/vim-8.2.0814-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -306,8 +306,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild index 6a4b59f53ef1..376604185e2d 100644 --- a/app-editors/vim/vim-8.2.3428-r1.ebuild +++ b/app-editors/vim/vim-8.2.3428-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -318,8 +318,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3567.ebuild b/app-editors/vim/vim-8.2.3567.ebuild index 3ce917bf8851..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3567.ebuild +++ b/app-editors/vim/vim-8.2.3567.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3582.ebuild b/app-editors/vim/vim-8.2.3582.ebuild index a17b74f24534..53e69aee9488 100644 --- a/app-editors/vim/vim-8.2.3582.ebuild +++ b/app-editors/vim/vim-8.2.3582.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3669.ebuild b/app-editors/vim/vim-8.2.3669.ebuild index 3ce917bf8851..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3669.ebuild +++ b/app-editors/vim/vim-8.2.3669.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3741.ebuild b/app-editors/vim/vim-8.2.3741.ebuild index 08b5ddc82130..53e69aee9488 100644 --- a/app-editors/vim/vim-8.2.3741.ebuild +++ b/app-editors/vim/vim-8.2.3741.ebuild @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3950.ebuild b/app-editors/vim/vim-8.2.3950.ebuild index a15f1260d55d..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3950.ebuild +++ b/app-editors/vim/vim-8.2.3950.ebuild @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.4285.ebuild b/app-editors/vim/vim-8.2.4285.ebuild new file mode 100644 index 000000000000..2b7c3b0992cc --- /dev/null +++ b/app-editors/vim/vim-8.2.4285.ebuild @@ -0,0 +1,357 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +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" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + vim-pager? ( !minimal ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + !minimal? ( ~app-editors/vim-core-${PV} ) + vim-pager? ( app-editors/vim-core[-minimal] ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + sound? ( media-libs/libcanberra ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" + sys-devel/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir failed" + export HOME="${T}"/home + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + 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 + + if use lua; then + 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) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # 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\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + # Fix an issue of missing defaults.vim when USE=minimal. + if use minimal ; then + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi + fi + + domenu runtime/vim.desktop + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-8.2.4328-r1.ebuild b/app-editors/vim/vim-8.2.4328-r1.ebuild new file mode 100644 index 000000000000..67b5a1185774 --- /dev/null +++ b/app-editors/vim/vim-8.2.4328-r1.ebuild @@ -0,0 +1,350 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +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" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + vim-pager? ( !minimal ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~app-editors/vim-core-${PV} + !> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + 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 + + if use lua; then + 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) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # 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\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + domenu runtime/vim.desktop + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 3ce917bf8851..5d9a0aae046a 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,7 +45,8 @@ RDEPEND=" lua? ( ${LUA_DEPS} $(lua_gen_impl_dep 'deprecated' lua5-1) ) - !minimal? ( ~app-editors/vim-core-${PV} ) + ~app-editors/vim-core-${PV} + !