gentoo resync : 18.08.2019

9 files changed, 3 insertions, 476 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 091eaa5a3c40..c766b14b5f7b 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 3909583ea2d1..5f674d26e39e 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,5 +1,3 @@
-AUX firewalld-0.5.1-errorcodes1.patch 1491 BLAKE2B 63e10fa5628fdb766b03f544ec16f095a0c1ff0de92af0d2f959f209e842af0cd53a24165e4fc06e15dea35f933387c25a3289049e828409d2aede00d1dfa3cf SHA512 3f293d48455f9ecfd454eb2cb950b853b0bc43fd709de291a963e9a62cddb1685c7a8bffb735178f79966fc2a8031fdb382c61fdadf8dd0134741741461e7ba6
-AUX firewalld-0.5.1-errorcodes2.patch 1465 BLAKE2B 67da2f57a445113ac0334af5f58cd8425e11153d7b6be6183614d31897527afa5d24dec72a6102805ec14f1fe18ab72684e545d352672c950077e26d842f279b SHA512 92c34604f4e22e4e647255ffa51528c7daed9fc738c3fe118e51a2263732c24c416ab0604dbacb86601d9e9b247cef56c74024fc0eb2550c42b9b57b999fcd39
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
deleted file mode 100644
index 0bf8aacc8395..000000000000
--- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7cf8dc935db45bc382930c6f2c9b11b5f9910283 Mon Sep 17 00:00:00 2001
-From: Eric Garver <e@erig.me>
-Date: Mon, 5 Feb 2018 10:20:54 -0500
-Subject: [PATCH] doc/xml: remove errorcodes ENITITY inclusion from docs that
- don't use it
-
----
- doc/xml/firewall-applet.xml      | 1 -
- doc/xml/firewall-config.xml      | 1 -
- doc/xml/firewall-offline-cmd.xml | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/doc/xml/firewall-applet.xml b/doc/xml/firewall-applet.xml
-index 831ec320..b86a62ad 100644
---- a/doc/xml/firewall-applet.xml
-+++ b/doc/xml/firewall-applet.xml
-@@ -4,7 +4,6 @@
- <!ENTITY authors SYSTEM "authors.xml">
- <!ENTITY seealso SYSTEM "seealso.xml">
- <!ENTITY notes SYSTEM "notes.xml">
--<!ENTITY errorcodes SYSTEM "errorcodes.xml">
- ]>
- 
- <!--
-diff --git a/doc/xml/firewall-config.xml b/doc/xml/firewall-config.xml
-index ae0fb549..2e7627cc 100644
---- a/doc/xml/firewall-config.xml
-+++ b/doc/xml/firewall-config.xml
-@@ -4,7 +4,6 @@
- <!ENTITY authors SYSTEM "authors.xml">
- <!ENTITY seealso SYSTEM "seealso.xml">
- <!ENTITY notes SYSTEM "notes.xml">
--<!ENTITY errorcodes SYSTEM "errorcodes.xml">
- ]>
- 
- <!--
-diff --git a/doc/xml/firewall-offline-cmd.xml b/doc/xml/firewall-offline-cmd.xml
-index e157f675..85757b4e 100644
---- a/doc/xml/firewall-offline-cmd.xml
-+++ b/doc/xml/firewall-offline-cmd.xml
-@@ -4,7 +4,6 @@
- <!ENTITY authors SYSTEM "authors.xml">
- <!ENTITY seealso SYSTEM "seealso.xml">
- <!ENTITY notes SYSTEM "notes.xml">
--<!ENTITY errorcodes SYSTEM "errorcodes.xml">
- ]>
- 
- <!--
diff --git a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch b/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
deleted file mode 100644
index e2b31e3936fd..000000000000
--- a/net-firewall/firewalld/files/firewalld-0.5.1-errorcodes2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 61286b73e21a75492abc8672e3812da9f85bfc35 Mon Sep 17 00:00:00 2001
-From: Eric Garver <e@erig.me>
-Date: Mon, 5 Feb 2018 10:25:21 -0500
-Subject: [PATCH] doc/xml/Makefile: firewallctl docs depend on errorcodes
-
-Fixes the below build error:
-
-$ make -C doc/xml ../html/firewallctl.html
-...
-xsltproc -o ../html/firewallctl.html --nonet --xinclude  transform-html.xsl firewallctl.xml
-warning: failed to load external entity "errorcodes.xml"
-firewallctl.xml:1937: parser error : Failure to process entity errorcodes
-            &errorcodes;
-                        ^
-firewallctl.xml:1937: parser error : Entity 'errorcodes' not defined
-            &errorcodes;
-                        ^
-unable to parse firewallctl.xml
----
- doc/xml/Makefile.am | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am
-index be89d803..129ec501 100644
---- a/doc/xml/Makefile.am
-+++ b/doc/xml/Makefile.am
-@@ -46,9 +46,11 @@ all: $(man_MANS) $(HTMLS)
- clean:
- 	-test -z "$(CLEAN_FILES)" || rm -f $(CLEAN_FILES)
- 
--../man/man1/firewall-cmd.1: errorcodes.xml firewall-cmd.xml
-+../man/man1/firewallctl.1: errorcodes.xml
-+../html/firewallctl.html: errorcodes.xml
- 
--../html/firewall-cmd.html: errorcodes.xml firewall-cmd.xml
-+../man/man1/firewall-cmd.1: errorcodes.xml
-+../html/firewall-cmd.html: errorcodes.xml
- 
- ../man/man1/%.1: %.xml authors.xml notes.xml seealso.xml transform-man.xsl
- 	$(XSLTPROC) -o $@ $(XSLTPROC_MAN_FLAGS) $<
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index a2335e5816e2..f393a766f369 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,9 +1,7 @@
 AUX rsyslog/ufw.logrotate 178 BLAKE2B 488f56cb61e3d708e771e927b0c92ce354ebd7aa65c70c26f7473b23fa2ee2387bcea2505f157b87597cb9ccef741d5df27a4a26c2dc9a23ec91877c28595737 SHA512 d381a34b23d8656c316af69c07d49042d6c4def4cea3e51367210bce20681376fd0259a95b6b9403171c5d80732927a8880f3d401e13e6f76b505324eecb146b
 AUX syslog-ng/syslog-ng.example 381 BLAKE2B 01026130ac3aec7bb4b3862e9567c225073d5f467eced4701c711842f2aa8ff7b566874e64e302728a5bff15d848325040e3df900776950269d431dda6763950 SHA512 f48d2487679fe179ea216bb4259affbf5ab4c86725b45942581ada8dac24dd0c978f755182805ff5350ab169972fcee7bb54a6d14df760d4b5f62c485af1e49e
 AUX syslog-ng/ufw.logrotate 269 BLAKE2B 6dd614ec033e8b9fd6d95e7a6fc69252e5a7fd33da6e760320b7f9fb519936a94f2f46e7833189601ddfa7fa080402237831fab9daf1b18a0872cc49c56715b1 SHA512 22d89f04b68a8b4deeb60aca263239255dd01b9c6e6d23a5d77514daf7bb9dc3910a28cfe9c606f70d2a50f0365bb19c3cf00c5859ee2630c00f0df451ee9c5d
-AUX ufw-0.31.1-move-path.patch 7071 BLAKE2B 51c4dcd41f1411771e6e59dcdd39f62d59fabae8700e6f63e0d3e63ab998bed73f0ce01611a7e9f175feb4d057a548ce7a58b99e993312e3378e042d587b86e7 SHA512 66382ded35437e563c874dc01417a2735a2aa136a1e670fd3707c3311516a6d9a0e62a20679a4f5dcaa2edc0225535cf2410d7f86676b1e10eb309ecc3e24bc2
 AUX ufw-0.33-dont-check-iptables.patch 1659 BLAKE2B 2e99b686c1bd556055904b080026d44c49885b2acfa37e22dfa6ea756619a8dc22fd0d54277c5a66ab769fc16d810218caafd5fabd656cabc055a115cde6feb9 SHA512 8f92d4b79f1caf01cb97ec64014c7607a410fb0a36e5e87376707c026d714a060ae554591b6e5b3834b671acd4145dcca68a9373aa41051ef60c9dd409dd008d
-AUX ufw-0.34_pre805-bash-completion.patch 255 BLAKE2B 7d4f916a30b893997e5b9f27eafb3530659ed4184cd8d3474b869df5cae580abd53ac2c882d5eb3977a784183e0a54f74d19137a74e40d19a90787d3c08bc244 SHA512 e3fceb0cbf683b82e9d9aa0aa0c41b1cde9aee59b6dd2d06ca80de0b980231fd999bdff3b2705f7ff8e90c9f2cc84a4ee11b34530630cf77a170ecfbf028550f
 AUX ufw-0.34_pre805-shebang.patch 675 BLAKE2B b6197588687ab9ecea071be057adf14d47dac994415894a6cc4a9943f2f8dceae77a429a0ebbbfc49bf4a4eba2aa5a63cb153e290bdea33626939f054bdb9a4c SHA512 8954f679a993d65cb880ffce09b448626fd64dea93257f0faa97b8bec76dcbbda4fb0d19408655d6db387066a0ac94b962dca2e5febcc5b5685e9b16b97b4cad
 AUX ufw-0.35-bash-completion.patch 259 BLAKE2B bb20b7af317c2e36023e28b85d51cdccde43354db39d26e65a721983478c7d39e1e3c71c36f2c8c5c2515db929f50a1edc1c84d9c4294662d8601e0136a98019 SHA512 9a59ff192e6fb3365c8585b984f4743a05f7cb18ae581a8b79c4afe39e43f12d993febf1319e1ee810483d610d970649e75c4b9dde891be728869b69c80b4709
 AUX ufw-0.35-move-path.patch 7386 BLAKE2B 022c734deaa24316e3e72cf83110a7cff5f9f763f713a61c17ee74ba57724cd94c1dbb6741904d68ad7f3874c21015b87fae239811b84928b35aa4c4019ac430 SHA512 eac6e0c96e7b0e501b3792671a21306049f40869fafc1d9c579c2424fb32b91987a846b3562c30513326433031ff46bc4df2bbb5706f7af18e6216f8f2b7546f
@@ -14,10 +12,8 @@ AUX ufw-0.36-shebang.patch 714 BLAKE2B adfbc135b1ec2e51a6df59c7caf4b081568eb77fc
 AUX ufw-2.initd 2611 BLAKE2B b6a75e023ad0efeeef168e7e074c716ec66f40d3bde9f99cf1a02e63800b4a42c3ff7d35fe9503e51859f98cdf500db4c1900a9436f642c0af7350c9d1256692 SHA512 f6cb7f6f7713d6f2c78c0b0254f385701f28b997931007997f0702af0dcd0d1b1bf08617dbb3abd21219c23a63ec3286e019896253ff7e9bdbb218a5bb17dd80
 AUX ufw.confd 219 BLAKE2B 8ed5dec5dd9acc84715918240e31398268ff36f73bb2cfc10e64e0593e59cc7f5b988f8545ddea37f19d9b40e870d743bea66edd7da1e3d2753b6edda8afa352 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7
 AUX ufw.service 329 BLAKE2B e817fc85b3bdb21b47a3089c6f2204292a019eaeae510832530f0e09f8784a312dd636fa3cf90610bb3159d52b4bdaadf803699ac4bff31576b566a3e977b2d2 SHA512 a365e704ca958c83c86f8a6b1623ce3f9ad72dcfb0cfc7758bfc787e0877f897ccf8b200db83df17130ca5dcc54f938178b8cabfe3ee0c0896c814ee7d2439c7
-DIST ufw-0.34_pre805.tar.gz 335875 BLAKE2B a2b654fe35a299ffd9978ef14a8d5667f799b654b6285bc81756c8081d9f4417b2fa9c05a234351d42709c2c57ff624b4fe7bca8ffe4d13cd12436feead6e4da SHA512 b8bba3bb8c423070d6434d1df7274423edf3a356415f54c6448fa0ff2d13a4b2ac21c4bb627cba01d6955b04f793eeaf2fc535c6221e7de48f11bef745035263
 DIST ufw-0.35.tar.gz 375310 BLAKE2B 3babf22e860ead6970c1386b0ab9fc3de364ba3f5c8bc0237be4a9446358fe058d216e7928d16eed8a148fbee5b82fc1d9e3b358f357c2fac236ae6f6b942a01 SHA512 b36c82559910634505648f717d19eb5a0cb1ce739a804359087e74c966869d0375c4ed5811954b32d2b5b51866f6ae1bec62a4a464f226b2eecc56b096f303fc
 DIST ufw-0.36.tar.gz 580338 BLAKE2B a7e07ac11539061a69bb83d45c0affc54793503b31c9e9f9f8b34fa890a3fe97682f9133102e74e5f6e1eb372a929cfc8619baa2cc9efc1dc289d9f4a1766efd SHA512 b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3
-EBUILD ufw-0.34_pre805-r2.ebuild 5366 BLAKE2B d69ad68267ea2c9f5d895b61556216ce6050e65af50ff87685ff10f37060453d95d7fb75c62c23e40ebd7633ad6e2a29348a59be78d641f3d0060334d30f2f19 SHA512 35de933ed90973de520e74c99d3049957b3027c4f605f84c16e61289bdd3bdb2da3b5855099d5693625948cb7dd0e244e97a0470724b17192c000bc7fd69386e
 EBUILD ufw-0.35-r1.ebuild 5633 BLAKE2B c341332bb14990b28cb2a00a67069ed4b9369ea69b6f3b655c5379e0ceea48560b475442e431e5a16c8b1c2811fb124bed52bcee1c254fd4a30cc03abf04e9cb SHA512 4ae8fe284f05e22f86bfefbdc048594f8eef2ba55b0a990b4d0f9796e92497aa3462f35dac78a49073ba71c7631fabc5b849c2616746ce477e18112efd533046
-EBUILD ufw-0.36.ebuild 5724 BLAKE2B 2b24fbc2b668063fdb4b4c294fd0212e853acbe6e495d4ccdd9d112d415c05d42d925d30ab6730959178094957d175bd633b3e87e110c789b7571bbc56807a7b SHA512 0aa8224ca490a6c295df5070a2017824cb6078131efbd3b5787005f19c289dc67e274801e24173ebcde917c53458eb11901f57aef2d59715ebb5ecd13df454e2
+EBUILD ufw-0.36.ebuild 5719 BLAKE2B a789b61f2ac8c99f81d57a7e9caaa7427b8c976f76c28c8f42b1840f5eae2f5a2db8bdd3d131f1cd69846263f1cf8c7763d377f9be2d3b3af864e8453d25f958 SHA512 9f0fa61626454d44b01eb9fecde3728ba3a243da74d9b1643e07fb6d19772d16baf3657ae99fc9db9e39cf8b71d0b36d9aa5b1fe046fb192607812aa4e1adde9
 MISC metadata.xml 867 BLAKE2B 803f1809161a81c013989270661d5e17bc74c9f02dd7c2cf9e7847b86072ea56fc5ad980a6f2d285ee1d806902621ff1100ac20bbc27465e828aec4537e846c6 SHA512 e11ddde14aa8fb8aa187537f3cfeb01b26b4421489d69223fc77ab4400b002105d2b8161ebf489748eb42b615899f87c1abc65d10d7ef40b2f107f0d85c17c77
diff --git a/net-firewall/ufw/files/ufw-0.31.1-move-path.patch b/net-firewall/ufw/files/ufw-0.31.1-move-path.patch
deleted file mode 100644
index 24d00ea68ccd..000000000000
--- a/net-firewall/ufw/files/ufw-0.31.1-move-path.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -Naur ufw-0.31.orig/doc/ufw-framework.8 ufw-0.31/doc/ufw-framework.8
---- ufw-0.31.orig/doc/ufw-framework.8	2012-03-10 00:07:11.000000000 +0100
-+++ ufw-0.31/doc/ufw-framework.8	2012-03-12 16:55:50.680992962 +0100
-@@ -18,7 +18,7 @@
- parameters and configuration of IPv6. The framework consists of the following
- files:
- .TP
--#STATE_PREFIX#/ufw\-init
-+#SHARE_DIR#/ufw\-init
- initialization script
- .TP
- #CONFIG_PREFIX#/ufw/before[6].rules
-@@ -41,7 +41,7 @@
- 
- .SH "BOOT INITIALIZATION"
- .PP
--\fBufw\fR is started on boot with #STATE_PREFIX#/ufw\-init. This script is a
-+\fBufw\fR is started on boot with #SHARE_DIR#/ufw\-init. This script is a
- standard SysV style initscript used by the \fBufw\fR command and should not be
- modified. It supports the following arguments:
- .TP
-diff -Naur ufw-0.31.orig/README ufw-0.31/README
---- ufw-0.31.orig/README	2012-03-10 00:07:11.000000000 +0100
-+++ ufw-0.31/README	2012-03-12 16:55:50.681993089 +0100
-@@ -58,7 +58,7 @@
- on your needs, this can be as simple as adding the following to a startup
- script (eg rc.local for systems that use it):
- 
--# /lib/ufw/ufw-init start
-+# /usr/share/ufw/ufw-init start
- 
- For systems that use SysV initscripts, an example script is provided in
- doc/initscript.example. See doc/upstart.example for an Upstart example. Consult
-@@ -72,9 +72,9 @@
- /etc/defaults/ufw 		high level configuration
- /etc/ufw/before[6].rules 	rules evaluated before UI added rules
- /etc/ufw/after[6].rules 	rules evaluated after UI added rules
--/lib/ufw/user[6].rules		UI added rules (not to be modified)
-+/etc/ufw/user/user[6].rules		UI added rules (not to be modified)
- /etc/ufw/sysctl.conf 		kernel network tunables
--/lib/ufw/ufw-init		start script
-+/usr/share/ufw/ufw-init		start script
- 
- 
- Usage
-@@ -149,7 +149,7 @@
- that the primary chains don't move around other non-ufw rules and chains. To
- completely flush the built-in chains with this configuration, you can use:
- 
--# /lib/ufw/ufw-init flush-all
-+# /usr/share/ufw/ufw-init flush-all
- 
- Alternately, ufw may also take full control of the firewall by setting
- MANAGE_BUILTINS=yes in /etc/defaults/ufw. This will flush all the built-in
-@@ -247,7 +247,7 @@
- 
- Remote Management
- -----------------
--On /lib/ufw/ufw-init start and 'ufw enable' the chains are flushed, so
-+On /usr/share/ufw/ufw-init start and 'ufw enable' the chains are flushed, so
- ssh may drop. This is needed so ufw is in a consistent state. Once the ufw is
- 'enabled' it will insert rules into the existing chains, and therefore not
- flush the chains (but will when modifying a rule or changing the default
-@@ -290,7 +290,7 @@
- 
- Distributions
- -------------
--While it certainly ok to use /lib/ufw/ufw-init as the initscript for
-+While it certainly ok to use /usr/share/ufw/ufw-init as the initscript for
- ufw, this script is meant to be used by ufw itself, and therefore not
- particularly user friendly. See doc/initscript.example for a simple
- implementation that can be adapted to your distribution.
-diff -Naur ufw-0.31.orig/setup.py ufw-0.31/setup.py
---- ufw-0.31.orig/setup.py	2012-03-10 00:07:11.000000000 +0100
-+++ ufw-0.31/setup.py	2012-03-12 16:55:50.682993216 +0100
-@@ -54,7 +54,8 @@
-             return
- 
-         real_confdir = os.path.join('/etc')
--        real_statedir = os.path.join('/lib', 'ufw')
-+        # real_statedir = os.path.join('/lib', 'ufw')
-+        real_statedir = os.path.join('/etc', 'ufw', 'user')
-         real_prefix = self.prefix
-         if self.home != None:
-             real_confdir = self.home + real_confdir
-@@ -116,7 +117,7 @@
-         self.copy_file('doc/ufw.8', manpage)
-         self.copy_file('doc/ufw-framework.8', manpage_f)
- 
--        # Install state files and helper scripts
-+        # Install state files
-         statedir = real_statedir
-         if self.root != None:
-             statedir = self.root + real_statedir
-@@ -127,8 +128,14 @@
-         self.copy_file('conf/user.rules', user_rules)
-         self.copy_file('conf/user6.rules', user6_rules)
- 
--        init_helper = os.path.join(statedir, 'ufw-init')
--        init_helper_functions = os.path.join(statedir, 'ufw-init-functions')
-+        # Install helper scripts
-+        sharedir = real_sharedir
-+        if self.root != None:
-+            sharedir = self.root + real_sharedir
-+        self.mkpath(sharedir)
-+
-+        init_helper = os.path.join(sharedir, 'ufw-init')
-+        init_helper_functions = os.path.join(sharedir, 'ufw-init-functions')
-         self.copy_file('src/ufw-init', init_helper)
-         self.copy_file('src/ufw-init-functions', init_helper_functions)
- 
-@@ -199,13 +206,18 @@
- 
-             subprocess.call(["sed",
-                              "-i",
-+                             "s%#SHARE_DIR#%" + real_sharedir + "%g",
-+                             file])
-+
-+            subprocess.call(["sed",
-+                             "-i",
-                              "s%#VERSION#%" + ufw_version + "%g",
-                              file])
- 
-         # Install pristine copies of rules files
--        sharedir = real_sharedir
--        if self.root != None:
--            sharedir = self.root + real_sharedir
-+        #sharedir = real_sharedir
-+        #if self.root != None:
-+        #    sharedir = self.root + real_sharedir
-         rulesdir = os.path.join(sharedir, 'iptables')
-         self.mkpath(rulesdir)
-         for file in [ before_rules, after_rules, \
-diff -Naur ufw-0.31.orig/src/backend_iptables.py ufw-0.31/src/backend_iptables.py
---- ufw-0.31.orig/src/backend_iptables.py	2012-03-10 00:07:11.000000000 +0100
-+++ ufw-0.31/src/backend_iptables.py	2012-03-12 16:58:36.879115890 +0100
-@@ -22,7 +22,7 @@
- import sys
- import time
- 
--from ufw.common import UFWError, UFWRule, config_dir, state_dir
-+from ufw.common import UFWError, UFWRule, config_dir, state_dir, share_dir
- from ufw.util import warn, debug, msg, cmd, cmd_pipe
- import ufw.backend
- 
-@@ -40,7 +40,7 @@
-         files['rules6'] = os.path.join(state_dir, 'user6.rules')
-         files['before6_rules'] = os.path.join(config_dir, 'ufw/before6.rules')
-         files['after6_rules'] = os.path.join(config_dir, 'ufw/after6.rules')
--        files['init'] = os.path.join(state_dir, 'ufw-init')
-+        files['init'] = os.path.join(share_dir, 'ufw-init')
- 
-         ufw.backend.UFWBackend.__init__(self, "iptables", dryrun, files)
- 
-diff -Naur ufw-0.31.orig/src/ufw-init ufw-0.31/src/ufw-init
---- ufw-0.31.orig/src/ufw-init	2012-03-10 00:07:11.000000000 +0100
-+++ ufw-0.31/src/ufw-init	2012-03-12 16:55:50.687993851 +0100
-@@ -18,8 +18,8 @@
- #
- set -e
- 
--if [ -s "#STATE_PREFIX#/ufw-init-functions" ]; then
--    . "#STATE_PREFIX#/ufw-init-functions"
-+if [ -s "#SHARE_DIR#/ufw-init-functions" ]; then
-+    . "#SHARE_DIR#/ufw-init-functions"
- else
-     echo "Could not find $s (aborting)"
-     exit 1
-@@ -56,7 +56,7 @@
-     flush_builtins || exit "$?"
-     ;;
- *)
--    echo "Usage: #STATE_PREFIX#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}"
-+    echo "Usage: #SHARE_DIR#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}"
-     exit 1
-     ;;
- esac
diff --git a/net-firewall/ufw/files/ufw-0.34_pre805-bash-completion.patch b/net-firewall/ufw/files/ufw-0.34_pre805-bash-completion.patch
deleted file mode 100644
index dc922435de10..000000000000
--- a/net-firewall/ufw/files/ufw-0.34_pre805-bash-completion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- shell-completion/bash
-+++ shell-completion/bash
-@@ -52,7 +52,6 @@
-     echo "numbered verbose"
- }
- 
--have ufw &&
- _ufw()
- {
-     cur=${COMP_WORDS[COMP_CWORD]}
-@@ -83,5 +82,5 @@
-     fi
- }
- 
--[ "$have" ] && complete -F _ufw ufw
-+complete -F _ufw ufw
- 
diff --git a/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild b/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
deleted file mode 100644
index 73f230e669df..000000000000
--- a/net-firewall/ufw/ufw-0.34_pre805-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit bash-completion-r1 eutils linux-info distutils-r1 systemd
-
-DESCRIPTION="A program used to manage a netfilter firewall"
-HOMEPAGE="https://launchpad.net/ufw"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc ~x86"
-IUSE="examples ipv6"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=">=net-firewall/iptables-1.4[ipv6?]
-	!<kde-misc/kcm-ufw-0.4.2
-	!<net-firewall/ufw-frontends-0.3.2
-"
-
-# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
-RESTRICT="test"
-
-PATCHES=(
-	# Remove unnecessary build time dependency on net-firewall/iptables.
-	"${FILESDIR}"/${PN}-0.33-dont-check-iptables.patch
-	# Move files away from /lib/ufw.
-	"${FILESDIR}"/${PN}-0.31.1-move-path.patch
-	# Remove shebang modification.
-	"${FILESDIR}"/${P}-shebang.patch
-	# Fix bash completions, bug #526300
-	"${FILESDIR}"/${P}-bash-completion.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~PROC_FS
-		~NETFILTER_XT_MATCH_COMMENT ~NETFILTER_XT_MATCH_HL
-		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT
-		~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
-
-	if kernel_is -ge 2 6 39; then
-		CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
-	else
-		CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
-	fi
-
-	# https://bugs.launchpad.net/ufw/+bug/1076050
-	if kernel_is -ge 3 4; then
-		CONFIG_CHECK+=" ~NETFILTER_XT_TARGET_LOG"
-	else
-		CONFIG_CHECK+=" ~IP_NF_TARGET_LOG"
-		use ipv6 && CONFIG_CHECK+=" ~IP6_NF_TARGET_LOG"
-	fi
-
-	CONFIG_CHECK+=" ~IP_NF_TARGET_REJECT"
-	use ipv6 && CONFIG_CHECK+=" ~IP6_NF_TARGET_REJECT"
-
-	check_extra_config
-
-	# Check for default, useful optional features.
-	if ! linux_config_exists; then
-		ewarn "Cannot determine configuration of your kernel."
-		return
-	fi
-
-	local nf_nat_ftp_ok="yes"
-	local nf_conntrack_ftp_ok="yes"
-	local nf_conntrack_netbios_ns_ok="yes"
-
-	linux_chkconfig_present \
-		NF_NAT_FTP || nf_nat_ftp_ok="no"
-	linux_chkconfig_present \
-		NF_CONNTRACK_FTP || nf_conntrack_ftp_ok="no"
-	linux_chkconfig_present \
-		NF_CONNTRACK_NETBIOS_NS || nf_conntrack_netbios_ns_ok="no"
-
-	# This is better than an essay for each unset option...
-	if [[ ${nf_nat_ftp_ok} = no ]] || [[ ${nf_conntrack_ftp_ok} = no ]] \
-		|| [[ ${nf_conntrack_netbios_ns_ok} = no ]]
-	then
-		echo
-		local mod_msg="Kernel options listed below are not set. They are not"
-		mod_msg+=" mandatory, but they are often useful."
-		mod_msg+=" If you don't need some of them, please remove relevant"
-		mod_msg+=" module name(s) from IPT_MODULES in"
-		mod_msg+=" '${EROOT}etc/default/ufw' before (re)starting ufw."
-		mod_msg+=" Otherwise ufw may fail to start!"
-		ewarn "${mod_msg}"
-		if [[ ${nf_nat_ftp_ok} = no ]]; then
-			ewarn "NF_NAT_FTP: for better support for active mode FTP."
-		fi
-		if [[ ${nf_conntrack_ftp_ok} = no ]]; then
-			ewarn "NF_CONNTRACK_FTP: for better support for active mode FTP."
-		fi
-		if [[ ${nf_conntrack_netbios_ns_ok} = no ]]; then
-			ewarn "NF_CONNTRACK_NETBIOS_NS: for better Samba support."
-		fi
-	fi
-}
-
-python_prepare_all() {
-	# Set as enabled by default. User can enable or disable
-	# the service by adding or removing it to/from a runlevel.
-	sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
-		|| die "sed failed (ufw.conf)"
-
-	sed -i "s/^IPV6=yes/IPV6=$(usex ipv6)/" conf/ufw.defaults || die
-
-	# If LINGUAS is set install selected translations only.
-	if [[ -n ${LINGUAS+set} ]]; then
-		_EMPTY_LOCALE_LIST="yes"
-		pushd locales/po > /dev/null || die
-
-		local lang
-		for lang in *.po; do
-			if ! has "${lang%.po}" ${LINGUAS}; then
-				rm "${lang}" || die
-			else
-				_EMPTY_LOCALE_LIST="no"
-			fi
-		done
-
-		popd > /dev/null || die
-	else
-		_EMPTY_LOCALE_LIST="no"
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	newconfd "${FILESDIR}"/ufw.confd ufw
-	newinitd "${FILESDIR}"/ufw-2.initd ufw
-	systemd_dounit "${FILESDIR}/ufw.service"
-
-	exeinto /usr/share/${PN}
-	doexe tests/check-requirements
-
-	# users normally would want it
-	insinto /usr/share/doc/${PF}/logging/syslog-ng
-	doins "${FILESDIR}"/syslog-ng/*
-
-	insinto /usr/share/doc/${PF}/logging/rsyslog
-	doins "${FILESDIR}"/rsyslog/*
-	doins doc/rsyslog.example
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-	newbashcomp shell-completion/bash ${PN}
-
-	[[ $_EMPTY_LOCALE_LIST != yes ]] && domo locales/mo/*.mo
-
-	distutils-r1_python_install_all
-	python_replicate_script "${D}usr/sbin/ufw"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "To enable ufw, add it to boot sequence and activate it:"
-		elog "-- # rc-update add ufw boot"
-		elog "-- # /etc/init.d/ufw start"
-		echo
-		elog "If you want to keep ufw logs in a separate file, take a look at"
-		elog "/usr/share/doc/${PF}/logging."
-	fi
-	if [[ -z ${REPLACING_VERSIONS} ]] \
-		|| [[ ${REPLACING_VERSIONS} < 0.34 ]];
-	then
-		echo
-		elog "/usr/share/ufw/check-requirements script is installed."
-		elog "It is useful for debugging problems with ufw. However one"
-		elog "should keep in mind that the script assumes IPv6 is enabled"
-		elog "on kernel and net-firewall/iptables, and fails when it's not."
-	fi
-	echo
-	ewarn "Note: once enabled, ufw blocks also incoming SSH connections by"
-	ewarn "default. See README, Remote Management section for more information."
-}
diff --git a/net-firewall/ufw/ufw-0.36.ebuild b/net-firewall/ufw/ufw-0.36.ebuild
index 6621087845da..cfddceb52bb1 100644
--- a/net-firewall/ufw/ufw-0.36.ebuild
+++ b/net-firewall/ufw/ufw-0.36.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/ufw/${PV}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="examples ipv6"
 
 DEPEND=""
@@ -90,7 +90,7 @@ pkg_pretend() {
 		mod_msg+=" mandatory, but they are often useful."
 		mod_msg+=" If you don't need some of them, please remove relevant"
 		mod_msg+=" module name(s) from IPT_MODULES in"
-		mod_msg+=" '${EROOT}etc/default/ufw' before (re)starting ufw."
+		mod_msg+=" '${EROOT}/etc/default/ufw' before (re)starting ufw."
 		mod_msg+=" Otherwise ufw may fail to start!"
 		ewarn "${mod_msg}"
 		if [[ "${nf_nat_ftp_ok}" == "no" ]]; then