summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2020-07-28 00:20:11 -0700
committerPatrick McLean <chutzpah@gentoo.org>2020-07-28 00:20:26 -0700
commit6ddfac61399a512dc360a62f6a7546999ac10c0e (patch)
tree118aa8ff85c2850eaed00fd58f2bdcb2df3b5d52 /app-vim
parentdev-util/bats: Dropped old maintainers (diff)
downloadgentoo-6ddfac61399a512dc360a62f6a7546999ac10c0e.tar.gz
gentoo-6ddfac61399a512dc360a62f6a7546999ac10c0e.tar.bz2
gentoo-6ddfac61399a512dc360a62f6a7546999ac10c0e.zip
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>
Diffstat (limited to 'app-vim')
-rw-r--r--app-vim/vim-nftables/files/vim-nftables-0_pre2020062901-no-expandtab.patch28
-rw-r--r--app-vim/vim-nftables/vim-nftables-0_pre20200629-r1.ebuild (renamed from app-vim/vim-nftables/vim-nftables-0_pre20200629.ebuild)4
2 files changed, 32 insertions, 0 deletions
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