gentoo resync : 25.08.2020

3 files changed, 34 insertions, 1 deletions

diff --git a/app-vim/vim-nftables/Manifest b/app-vim/vim-nftables/Manifest
index 4006c59023c7..37d10952c8ac 100644
--- a/app-vim/vim-nftables/Manifest
+++ b/app-vim/vim-nftables/Manifest
@@ -1,5 +1,6 @@
+AUX vim-nftables-0_pre2020062901-no-expandtab.patch 909 BLAKE2B db1bffe13e9ac6016b7da5586a751dbf1d96246fc9db4f819383a10b79ccfeccffc5be825e9275cb5ab49b30f6bbce2d9e55bbe098a26b145d33e53286cac990 SHA512 089ab6f14f8943741dc9d1f9429d07284ca08064cc76e5a53d1a2d9fc8088259f358b5b69ce42675c6cc86fb4c03222dd197c3fbb408cddb7f4e1ac67255a05c
 DIST vim-nftables-0_pre20200224.tar.gz 2427 BLAKE2B a17780ffcabd1d323f3ccaa52e9726c2d8dc04583003fd8eaa799c897d1ccb1718a2ef28c2c06f0108785bdcc90addfb27d54f73db8d9f59b225e34c244cf179 SHA512 05dab5d9bdaed4ae1de9e00f2d6996f4350d859af73062d00417ee6567041c0a3fa6f50996fefa64e7a2410779b254ddeac1d5a893aa2f664504278b67fa2fd9
 DIST vim-nftables-0_pre20200629.tar.gz 2440 BLAKE2B 39a80bfa54b378896918f3703edd452cc3d9d15d15bc6545dfeda362726e8dc1bcfb1f2008d5c1236f24b01dbc17df59ea14928550a3567b57c74407c7e97d73 SHA512 71ddc55158b7461dc71730f76c84ba4cf76490afe0c5323502341e97d7173a1607e9cc70e6a552cfb7491e485352c837d0aa2e6f9c46e81ef525bedc88e389ef
 EBUILD vim-nftables-0_pre20200224.ebuild 502 BLAKE2B 164a3201498bc9d2b9731257ec26c0fb7791a2c339c1a91e00d21dae349a902b415e5792c0bec89e5a2672681118ecca27a7c375cb584dece249e4b3c7b96a73 SHA512 26c2c3f39c08a4ac8ea2c5c63ceb62484bde70b847b6d4d013a56253955c4a9ee3a304dd612b8e2d6529ed8f677f04517069efc4d6a489f18d80a4a5b031830c
-EBUILD vim-nftables-0_pre20200629.ebuild 502 BLAKE2B f9d83816e66c852144476786018537c3481e3552e6e59aed4b03fb34d185907bcb6a7a6d2d817b1d6d94d688a61c93cdce7ad989b52ec4a17c15d7d32e2e3764 SHA512 1d64772cebb5ed368384c16c437644aa0ce3a395da028fe1c1f867bbd471c3760b75003e86b66225d0576c73b9fe6db4bfd4f2a8e5cc5b6de0189ef33bbec076
+EBUILD vim-nftables-0_pre20200629-r1.ebuild 578 BLAKE2B a33f495629114c7c1075f1e12aace65460392054504dc18fd8c00ff71fcb9dbb73dafc9ed801dd165731e47401896a9b372440adcd86bedcd62f099dc21d3c41 SHA512 e66a62b857f8acd7f6050742885c72517b43ec26fb8ffd36b22f84f6d076acafadb0d0b14c26e2e56d4ce8f343dd25c58a678c79821b6fcd7515d13e8cacca2f
 MISC metadata.xml 335 BLAKE2B e6d888e72998d7db2b4e8edfaeaa8de23bab3f0219feb2417efbbfc2eed225a462e261ba50330930e2b7f2dcbfba24423a6e7ed45c663e39c4a4d572f95e61e6 SHA512 6e1a94c30c49afdd2b7183033fac6c3dd47dd5bb6863a572a03634ec2f44ad520465b2cb1d677681ba23fc1235f3f5269b0783923f1d012ba5ab55e29dd2eef1
diff --git a/app-vim/vim-nftables/files/vim-nftables-0_pre2020062901-no-expandtab.patch b/app-vim/vim-nftables/files/vim-nftables-0_pre2020062901-no-expandtab.patch
new file mode 100644
index 000000000000..582f41b28586
--- /dev/null
+++ b/app-vim/vim-nftables/files/vim-nftables-0_pre2020062901-no-expandtab.patch
@@ -0,0 +1,28 @@
+From 1461d7cb0eedb3b53cfcea3dfd34352bc83f5c3d Mon Sep 17 00:00:00 2001
+From: Joachim Desroches <joachim.desroches@epfl.ch>
+Date: Fri, 24 Jul 2020 12:18:07 +0200
+Subject: [PATCH] Remove expantab options.
+
+These options have nothing to do with nftables and should be left to the
+user to configure with an autocommand if desired.
+---
+ ftplugin/nftables.vim | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/ftplugin/nftables.vim b/ftplugin/nftables.vim
+index f330cb8..a09509f 100644
+--- a/ftplugin/nftables.vim
++++ b/ftplugin/nftables.vim
+@@ -12,12 +12,10 @@ setlocal formatoptions-=t formatoptions+=croqnlj
+ 
+ setlocal comments=b:#
+ 
+-setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
+ setlocal textwidth=99
+ 
+ let b:undo_ftplugin = '
+     \ setlocal formatoptions< comments< commentstring<
+-    \|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
+     \'
+ 
+ let &cpoptions = s:save_cpo
diff --git a/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild b/app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild
index 46857be2a72c..3073736b57a5 100644
--- a/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild
+++ b/app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild
@@ -15,6 +15,10 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}/vim-nftables-0_pre2020062901-no-expandtab.patch"
+)
+
 src_prepare() {
 	default