From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- app-editors/vim-core/Manifest | 10 +++++----- app-editors/vim-core/vim-core-8.2.0814.ebuild | 6 ++++++ app-editors/vim-core/vim-core-8.2.3428.ebuild | 8 +++++++- app-editors/vim-core/vim-core-8.2.3567.ebuild | 6 ++++++ app-editors/vim-core/vim-core-8.2.3582.ebuild | 8 +++++++- app-editors/vim-core/vim-core-9999.ebuild | 6 ++++++ 6 files changed, 37 insertions(+), 7 deletions(-) (limited to 'app-editors/vim-core') diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 17ebda758559..a11674f39751 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -6,9 +6,9 @@ DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6 DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7fe504b59158e2e7717b8025a59cb4d8948451d72418b29f2b7cf3619cd765ef43e1304d73f81a6cba405f9706e7 SHA512 f476f24390807b71a0e02729f1815b3743b6b42cdd28a414e9ceaf0aa3fd4cab91e3550a669b1c64b4cd83207515cfe2b4acf2358a6def60e216e101c979037e -EBUILD vim-core-8.2.0814.ebuild 6893 BLAKE2B dff4779f4d460315882b8bf65deec0af4cb1d1e52627bde1e707416dde0dd4d02d90fccd1ed733bf14b1c59ffa15ea1f15974bb2e75f63b936f447b89d1dcff9 SHA512 2d53b98af3206956a0bf224caaaf6b4ad233975fbd6b2e0fa5c53097132ab92d24109b671926436b32c109428dd1f2581d37e8bf942700c6e974b9a7039f7895 -EBUILD vim-core-8.2.3428.ebuild 6962 BLAKE2B f02e4dcad44807c1b4b8f47e0777021180fbf0e808b82fbce237d690b9ba82ebb81ff6f50b672b830bcf637b831e0c99c47399637060c92e426ad6e3dfc065da SHA512 60f42343922e16eaf21b5ec43be6211241dde8a09e40b86130a9b2a3981bc1418d9b1bd9c34276e424ee3ffc9e17264fc43ae55cbcb4c90ba3e13dc0f9816717 -EBUILD vim-core-8.2.3567.ebuild 6974 BLAKE2B 52c9746dd0acb3599109ac7cc30a71f808dd194ee0881c81ba9b52e7dec2ca1d40546a616e6713a4cad78da8b12f8446659bd6dea9b950e566bb69a7ad357223 SHA512 d62c507ba2d3f2c0c09e9b7f499c69eef38ad10d1997658c5065f76fd5e4f10d0aab54d2cc56cbc1bf7e7ce4b376e2530c37eed59a731141dcd27cd1ea1754c6 -EBUILD vim-core-8.2.3582.ebuild 6974 BLAKE2B 52c9746dd0acb3599109ac7cc30a71f808dd194ee0881c81ba9b52e7dec2ca1d40546a616e6713a4cad78da8b12f8446659bd6dea9b950e566bb69a7ad357223 SHA512 d62c507ba2d3f2c0c09e9b7f499c69eef38ad10d1997658c5065f76fd5e4f10d0aab54d2cc56cbc1bf7e7ce4b376e2530c37eed59a731141dcd27cd1ea1754c6 -EBUILD vim-core-9999.ebuild 6974 BLAKE2B 52c9746dd0acb3599109ac7cc30a71f808dd194ee0881c81ba9b52e7dec2ca1d40546a616e6713a4cad78da8b12f8446659bd6dea9b950e566bb69a7ad357223 SHA512 d62c507ba2d3f2c0c09e9b7f499c69eef38ad10d1997658c5065f76fd5e4f10d0aab54d2cc56cbc1bf7e7ce4b376e2530c37eed59a731141dcd27cd1ea1754c6 +EBUILD vim-core-8.2.0814.ebuild 7164 BLAKE2B f244a235e78abd3dd0880b3c13be3780186634adc7588fabc86de6b7e33823a1b6dfecdd36dcc9e81c3e13e01594b3bd555f988d5f42636d666e5abfa10922bc SHA512 0bdae6503815e79347fcd7cc010813047a7333388e19b765a43aaab7b87f08dcefa46e3daea24fb82c0774732c39429bad53fc80d34ab0a9234ec8031b5a2ee2 +EBUILD vim-core-8.2.3428.ebuild 7230 BLAKE2B 03d7b91e062a4b33dbfd7226f90fc60f4f30b5c48014435e30172b0fb5adca2d40e3afdb3223e1025c0099357341e611605e6159807e9ec0ced8fbd540af9525 SHA512 99da825ebd14a43c36eb5329cdfe51fe22aa2414f9ef7cae2c02831bff24deff169b8919edf47327a1286140d4898842b0283ba4f446741950f09fb0ae206e35 +EBUILD vim-core-8.2.3567.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6 +EBUILD vim-core-8.2.3582.ebuild 7237 BLAKE2B 57401e1c87a3382822347e140eae2411526842a5b16689c862f13d34ddef830b234d3acccf6e6850a13b20a3c3e30c323e4c2b787a353ff4fd91521ee4259a3c SHA512 1d8fc9df2432fea0c46acdf38e12653326a88a505f870f34e4e3d3bbc5f82ec4063a5721e048e9ab523f097dc3c826347ff988e965951cce670f9b0efbc7bea2 +EBUILD vim-core-9999.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7 diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild index 7cccceadd8e4..5c1fb6f93cb3 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild @@ -191,6 +191,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -199,6 +202,9 @@ src_install() { 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 diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild index a447b06887d7..40e298a032ae 100644 --- a/app-editors/vim-core/vim-core-8.2.3428.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3428.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} @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { 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 diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild index 7e80dc2f16f9..a6ac59db33c3 100644 --- a/app-editors/vim-core/vim-core-8.2.3567.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3567.ebuild @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { 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 diff --git a/app-editors/vim-core/vim-core-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild index 7e80dc2f16f9..d04960a41e81 100644 --- a/app-editors/vim-core/vim-core-8.2.3582.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3582.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} @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { 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 diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 7e80dc2f16f9..a6ac59db33c3 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { 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 -- cgit v1.2.3