From 6ddfac61399a512dc360a62f6a7546999ac10c0e Mon Sep 17 00:00:00 2001
From: Patrick McLean <chutzpah@gentoo.org>
Date: Tue, 28 Jul 2020 00:20:11 -0700
Subject: 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@gentoo.org>
---
 ...vim-nftables-0_pre2020062901-no-expandtab.patch | 28 ++++++++++++++++++++++
 .../vim-nftables-0_pre20200629-r1.ebuild           | 27 +++++++++++++++++++++
 .../vim-nftables/vim-nftables-0_pre20200629.ebuild | 23 ------------------
 3 files changed, 55 insertions(+), 23 deletions(-)
 create mode 100644 app-vim/vim-nftables/files/vim-nftables-0_pre2020062901-no-expandtab.patch
 create mode 100644 app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild
 delete mode 100644 app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild

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-r1.ebuild b/app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild
new file mode 100644
index 000000000000..3073736b57a5
--- /dev/null
+++ b/app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT_ID="26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff"
+
+DESCRIPTION="vim plugin: "
+HOMEPAGE="https://github.com/nfnty/vim-nftables"
+SRC_URI="https://github.com/nfnty/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/vim-nftables-0_pre2020062901-no-expandtab.patch"
+)
+
+src_prepare() {
+	default
+
+	# will install license file by default
+	rm LICENSE || die
+}
diff --git a/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild b/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild
deleted file mode 100644
index 46857be2a72c..000000000000
--- a/app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-COMMIT_ID="26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff"
-
-DESCRIPTION="vim plugin: "
-HOMEPAGE="https://github.com/nfnty/vim-nftables"
-SRC_URI="https://github.com/nfnty/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	default
-
-	# will install license file by default
-	rm LICENSE || die
-}
-- 
cgit v1.2.3-65-gdbad