[gentoo-commits] repo/gentoo:master commit in: app-vim/vim-nftables/, app-vim/vim-nftables/files/

[gentoo-commits] repo/gentoo:master commit in: app-vim/vim-nftables/, app-vim/vim-nftables/files/

[Patrick McLean]

commit:     43e5ed3b4b5563caff23faeeb77e9cd5a4e5aa6c
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Tue Feb 25 02:49:56 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 02:49:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e5ed3b

app-vim/vim-nftables-0_pre20200224: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-vim/vim-nftables/Manifest                      |  2 +-
 ...vim-nftables-0_pre20200220-extra-keywords.patch | 22 ----------------------
 ...20.ebuild => vim-nftables-0_pre20200224.ebuild} |  6 +-----
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/app-vim/vim-nftables/Manifest b/app-vim/vim-nftables/Manifest
index 7cda0a9521b..376e4ff0160 100644
--- a/app-vim/vim-nftables/Manifest
+++ b/app-vim/vim-nftables/Manifest
@@ -1 +1 @@
-DIST vim-nftables-0_pre20200220.tar.gz 2419 BLAKE2B 7ee16e013f0873f5bd5d1e6beb3c824eabe38b759145a20aa0c9bb16b0abbb640d10eed59ffdc77ae0b4a7091158cc6d732cdec2589886edf52a8f6574f1145e SHA512 061b4410f261ea5449c366261ff8b3fd9ab15995ab73ac2f77a6de58e0d8764a0828973cbde152eb637f4bc6a8882c56efecdda65c7ecd6ca69df4f92fd190fe
+DIST vim-nftables-0_pre20200224.tar.gz 2427 BLAKE2B a17780ffcabd1d323f3ccaa52e9726c2d8dc04583003fd8eaa799c897d1ccb1718a2ef28c2c06f0108785bdcc90addfb27d54f73db8d9f59b225e34c244cf179 SHA512 05dab5d9bdaed4ae1de9e00f2d6996f4350d859af73062d00417ee6567041c0a3fa6f50996fefa64e7a2410779b254ddeac1d5a893aa2f664504278b67fa2fd9

diff --git a/app-vim/vim-nftables/files/vim-nftables-0_pre20200220-extra-keywords.patch b/app-vim/vim-nftables/files/vim-nftables-0_pre20200220-extra-keywords.patch
deleted file mode 100644
index b0634911578..00000000000
--- a/app-vim/vim-nftables/files/vim-nftables-0_pre20200220-extra-keywords.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e378b1484a85399032ff32d86ad2a5bde936762f Mon Sep 17 00:00:00 2001
-From: adrian5 <adrian5@users.noreply.github.com>
-Date: Mon, 17 Feb 2020 22:13:50 +0100
-Subject: [PATCH] Add icmpv6 keyword
-
----
- syntax/nftables.vim | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/syntax/nftables.vim b/syntax/nftables.vim
-index c80eb9d..d5d0e3f 100644
---- a/syntax/nftables.vim
-+++ b/syntax/nftables.vim
-@@ -23,7 +23,7 @@ syn keyword Function table chain
- syn keyword Statement type hook
- syn keyword Type ip ip6 inet arp bridge
- syn keyword Type filter nat route
--syn keyword Type ether vlan arp ip ip6 tcp udp udplite sctp dccp ah esp ipcomp icmp
-+syn keyword Type ether vlan arp ip ip6 tcp udp udplite sctp dccp ah esp ipcomp icmp icmpv6 igmp
- syn keyword Type ct
- syn keyword Type length protocol priority mark iif iifname iiftype oif oifname oiftype skuid skgid rtclassid
- syn keyword Constant prerouting input forward output postrouting

diff --git a/app-vim/vim-nftables/vim-nftables-0_pre20200220.ebuild b/app-vim/vim-nftables/vim-nftables-0_pre20200224.ebuild
similarity index 77%
rename from app-vim/vim-nftables/vim-nftables-0_pre20200220.ebuild
rename to app-vim/vim-nftables/vim-nftables-0_pre20200224.ebuild
index 779cf131057..733427968a9 100644
--- a/app-vim/vim-nftables/vim-nftables-0_pre20200220.ebuild
+++ b/app-vim/vim-nftables/vim-nftables-0_pre20200224.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit vim-plugin
 
-COMMIT_ID="aad8540ef56f495baa589f646edc1253db990f1a"
+COMMIT_ID="01c7b97eff12fd4b624e6efa2c0468163db61ebc"
 
 DESCRIPTION="vim plugin: "
 HOMEPAGE="https://github.com/nfnty/vim-nftables"
@@ -15,10 +15,6 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 
-PATCHES=(
-	"${FILESDIR}/vim-nftables-0_pre20200220-extra-keywords.patch"
-)
-
 src_prepare() {
 	default
 

[gentoo-commits] repo/gentoo:master commit in: app-vim/vim-nftables/, app-vim/vim-nftables/files/

[Patrick McLean]

commit:     6ddfac61399a512dc360a62f6a7546999ac10c0e
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 07:20:11 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 07:20:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ddfac61

app-vim/vim-nftables-0_pre20200629-r1: revbump, add patch to disable expandtabs

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 ...vim-nftables-0_pre2020062901-no-expandtab.patch | 28 ++++++++++++++++++++++
 ...ebuild => vim-nftables-0_pre20200629-r1.ebuild} |  4 ++++
 2 files changed, 32 insertions(+)

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 00000000000..582f41b2858
--- /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
similarity index 86%
rename from app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild
rename to app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild
index 46857be2a72..3073736b57a 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