Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/ufw/files/, net-firewall/ufw/
Date: Fri, 01 Jul 2022 09:02:57
Message-Id: 1656666162.4047ed24fa5760811d57809d634524a96e6bd8d3.flow@gentoo
1 commit: 4047ed24fa5760811d57809d634524a96e6bd8d3
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 1 08:54:09 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 1 09:02:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4047ed24
7
8 net-firewall/ufw: remove duplicate bash completion patch
9
10 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
11
12 net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch | 16 ----------------
13 net-firewall/ufw/ufw-0.36.1.ebuild | 2 +-
14 2 files changed, 1 insertion(+), 17 deletions(-)
15
16 diff --git a/net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch b/net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch
17 deleted file mode 100644
18 index 927af244eef1..000000000000
19 --- a/net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch
20 +++ /dev/null
21 @@ -1,16 +0,0 @@
22 ---- a/shell-completion/bash 2018-12-14 21:25:55.000000000 +0300
23 -+++ b/shell-completion/bash 2019-03-21 01:26:46.152181981 +0300
24 -@@ -57,7 +57,6 @@
25 - echo "numbered verbose"
26 - }
27 -
28 --_have ufw &&
29 - _ufw()
30 - {
31 - cur=${COMP_WORDS[COMP_CWORD]}
32 -@@ -91,4 +90,4 @@
33 - fi
34 - }
35 -
36 --_have ufw && complete -F _ufw ufw
37 -+complete -F _ufw ufw
38
39 diff --git a/net-firewall/ufw/ufw-0.36.1.ebuild b/net-firewall/ufw/ufw-0.36.1.ebuild
40 index 8eca27c146a6..e2c1d375da38 100644
41 --- a/net-firewall/ufw/ufw-0.36.1.ebuild
42 +++ b/net-firewall/ufw/ufw-0.36.1.ebuild
43 @@ -29,7 +29,7 @@ PATCHES=(
44 # Remove shebang modification.
45 "${FILESDIR}/${P}-shebang.patch"
46 # Fix bash completions, bug #526300
47 - "${FILESDIR}/${P}-bash-completion.patch"
48 + "${FILESDIR}/${PN}-0.36-bash-completion.patch"
49 )
50
51 pkg_pretend() {