diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
commit | 401101f9c8077911929d3f2b60a37098460a5d89 (patch) | |
tree | c2bef4719f6787550f0916aeaa8f4f403a9296af /app-editors/vim-core | |
parent | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff) |
gentoo resync : 25.03.2022
Diffstat (limited to 'app-editors/vim-core')
-rw-r--r-- | app-editors/vim-core/Manifest | 4 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-8.2.4328-r1.ebuild | 2 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-8.2.4586.ebuild | 231 |
3 files changed, 235 insertions, 2 deletions
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 5227788a44ae..15d433548184 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -11,6 +11,7 @@ DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df03 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651 +DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 EBUILD vim-core-8.2.0814.ebuild 7300 BLAKE2B aa73cad9bed04545abbfa8924022ec5e9a796b0f02f838bd5284d2da95de34b7665d24078a94e35e9d04bafcc2fa33a923c96c9a087081cb4d690fed25a6c3f5 SHA512 09b438dece9441fde5509fdc1091deccb4c5c90b12a71036eb71cdd45c320f50bb6abc6746b04eedf640e101c30c0c84cda9dbf3727c55254c1a5c448283db7e EBUILD vim-core-8.2.3428.ebuild 7366 BLAKE2B c6a15417c64899f67f0b0d2f24e1aca6926567bf06aa0a3ad02b6d4e4e97b2a18a2519bd33a90812cbd74edee79771897d5c36a12e4e693279e5ba260f9f81a8 SHA512 9d7ba3b42a87e3b73a089e43befb8db1d6cf0319de605bcee5296feb83c516a32890409ed47caf20ede9593e1cf16f190f9c2d77a211f1398b0d71cdcad0047f EBUILD vim-core-8.2.3567.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb @@ -19,6 +20,7 @@ EBUILD vim-core-8.2.3669.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84 EBUILD vim-core-8.2.3741.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7 EBUILD vim-core-8.2.3950.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb EBUILD vim-core-8.2.4285.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb -EBUILD vim-core-8.2.4328-r1.ebuild 7141 BLAKE2B 5dbd10e1b6301b82b99b047e17e60b21941ba9aebbf8ad4b3fc1a09ca0665aed704abdb58d388079a548a5cc6ae8bfa2313aa287f864f9871bc31152241ff210 SHA512 e45fbae1333a3704169896d29605603250746300a5d27955401832650722ada8a7a274c2de3abdcd332c85caf0067f3c3c8e7a837d82618d85cb578dd44a353f +EBUILD vim-core-8.2.4328-r1.ebuild 7140 BLAKE2B 093fc33e2b30e6f09f5d4b6482b178332fa06b7a4b93eb050f16c9b38d8dec2c478b1db65cd925600dd85bb145bb694ff0f3b436be0128d1f869a2b6f9e55979 SHA512 e38b568ed73d6ea120c597a62c622618125dfcbd614cb1b0c58d696ebf7d5ff4ea98ecc62d0c57b0ba156e172773aac172ab2d7a66ac45d96e045a384df0a331 +EBUILD vim-core-8.2.4586.ebuild 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575 EBUILD vim-core-9999.ebuild 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7 diff --git a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild index 09a0e4d7f51c..995864198e71 100644 --- a/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild +++ b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.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 S="${WORKDIR}"/vim-${PV} diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild new file mode 100644 index 000000000000..37b1be63841c --- /dev/null +++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="8.2" +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.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 +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +BDEPEND="sys-devel/autoconf" +# Avoid icon file collision, bug #673880 +RDEPEND="!!<app-editors/gvim-8.1.0648 + !<app-editors/vim-8.2.4328-r1" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +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 -p failed" + export HOME="${T}"/home +} + +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 "sed failed" + + # See bug #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # 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 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug #43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # 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" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + 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" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure 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 + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + + eshopts_pop + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} |