gentoo auto-resync : 28:07:2022 - 03:03:20

5 files changed, 69 insertions, 78 deletions

diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 5b3803bc360b..2e95af750599 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -7,8 +7,8 @@ DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
-EBUILD vim-core-8.2.4586.ebuild 7145 BLAKE2B b80dc1b8ef8b8b8601445d66396d0e3ee4a13115552930cacf8de13be456cd54c474025a7e45de83926d691ba0c4850524e5a076ec6905a5cdcfc117185d6adb SHA512 86e425f416065660943f5ef7f34bad34e5fe97ae95c07d3c17f391abc99f0326515ac4718d10a2e8b6dccf3197397cd84fe78f3e4a5bc2b27be6107a1c3c14f5
-EBUILD vim-core-8.2.5066-r2.ebuild 7215 BLAKE2B 3915017e4f5bb0241f83045433e18c8155da47b11020d189635c5942dff09ef743924b03d49dc45849045e387b4229d88fdcfe6ef7bf70aea5a5b0e275e59bd1 SHA512 4cd36bdb6bf47e22014498bbd7979b8cd74235dee275c66de44f53339b2d2eaee8259739448787896b138bc70a386d2d0dd9d257ed1ad76c725fefe71aa5a8d8
-EBUILD vim-core-9.0.0049-r1.ebuild 7138 BLAKE2B f44bbec015c986fcda81624f067c6dc947e1956b375efd17f16bf0564a08005252405b36e49a2de9e194f1acd3cfc3d9dac7ad6cdfaf33ae7cee3326f73d563e SHA512 313564150510a92c6ddf724a8b08984cc3c54044e760d8737e9e7b1b69c756946e2d086f17a4633d04db2d91ec2faa867fb8e39c24c3c2297ee87f448c5c264a
-EBUILD vim-core-9999.ebuild 7138 BLAKE2B f44bbec015c986fcda81624f067c6dc947e1956b375efd17f16bf0564a08005252405b36e49a2de9e194f1acd3cfc3d9dac7ad6cdfaf33ae7cee3326f73d563e SHA512 313564150510a92c6ddf724a8b08984cc3c54044e760d8737e9e7b1b69c756946e2d086f17a4633d04db2d91ec2faa867fb8e39c24c3c2297ee87f448c5c264a
+EBUILD vim-core-8.2.4586.ebuild 7060 BLAKE2B 3833f51bdbe7eb68035a36797ad39aac82377ee8ad578aeccf2444e6f199055850f38c1ccb79bfba1afc28927df10784a3f4a5f2916d135266ec3351828b69f8 SHA512 2b4ecaebbca12e1c53cbb0659a12911db64666a04ceb38de6c2ae769ac36536eafeda2451134defd634c06971673d587cccca7f52dc7fb89848dfae0152aff27
+EBUILD vim-core-8.2.5066-r2.ebuild 7002 BLAKE2B 18d0d3115af5efb7392c9a0b44311d5d96a15ba8c811e4ccb3109d3e2a0fd42ca6fe82b73d099cff0ccdf9b132ee6ea52c08ca95c79c133e99a0b4c347d2ddc4 SHA512 66fca357c4dc61d443baa0b49100aa3104bf55137d37d4bb57aafd2cf19e01ee43f6058e36adb393df2fd39ca3ad7a2179f05d8608fb9ef34a564a36cf7c308a
+EBUILD vim-core-9.0.0049-r1.ebuild 6925 BLAKE2B b447b47be2018f52609880b7bb06597f5c940fd7441e105d9af396e778ee8c2ee6645ca97980af50f76dbcea7b840de61632f561945a2043ba4fa1247f88fdf0 SHA512 cc52a48f196b3703ce7cf92adb9131983697a1cae48b5bee2d42147717d9f3423975cdabd462452191baa9205b5ac9491aaba73ba771167dd86ce616ae2cd87e
+EBUILD vim-core-9999.ebuild 6925 BLAKE2B b447b47be2018f52609880b7bb06597f5c940fd7441e105d9af396e778ee8c2ee6645ca97980af50f76dbcea7b840de61632f561945a2043ba4fa1247f88fdf0 SHA512 cc52a48f196b3703ce7cf92adb9131983697a1cae48b5bee2d42147717d9f3423975cdabd462452191baa9205b5ac9491aaba73ba771167dd86ce616ae2cd87e
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild
index 0d7a502efa63..ab6f035d555a 100644
--- a/app-editors/vim-core/vim-core-8.2.4586.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild
@@ -6,7 +6,7 @@ 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
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -188,24 +188,24 @@ src_install() {
 	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 )
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 
 		# 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
+		sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
index a9c02a3dfc36..c11d467f2a5a 100644
--- a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # 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
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -189,24 +189,21 @@ src_install() {
 	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
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild b/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
index e808fd2a2495..555b9e91b8db 100644
--- a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim
 
 VIM_VERSION="9.0"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -185,24 +185,21 @@ src_install() {
 	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
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index e808fd2a2495..555b9e91b8db 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Please bump with app-editors/vim and app-editors/gvim
 
 VIM_VERSION="9.0"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -185,24 +185,21 @@ src_install() {
 	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
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
 	fi
 
 	newbashcomp "${FILESDIR}"/xxd-completion xxd