gentoo resync : 24.02.2018

13 files changed, 664 insertions, 11 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 8d5db38fb081..a6bc138654fc 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ferm/Manifest b/net-firewall/ferm/Manifest
index ae4795ca0201..56a759a116c0 100644
--- a/net-firewall/ferm/Manifest
+++ b/net-firewall/ferm/Manifest
@@ -1,5 +1,5 @@
 DIST ferm-2.4.1.tar.xz 71324 BLAKE2B 290cd2f6fbb1ca1c1f060f998d84eaed2ba2a6ec8f736375a460a3ae81c6f5e67c174774065a09fbe155347f6dc1b7977321d65ac753f4c28f8a47cda8409dd8 SHA512 beea4b8dd04e00662ef380442f8249c2d2dadf6d35b90e415038df807c8d08295d2575efbf3265f48f5e92afa174135a9c662f74d52545dd3e1c55a1436aa5bb
 DIST ferm-2.4.tar.gz 128776 BLAKE2B 0b7df0c38ed5d311c4cbeba7da02dd9a366161f542f24bcecb88584ea081e2815bcdaeaa9dd2731d12d7e3982cd4f2caad38def41a087451b783e1c7853f66c8 SHA512 0b36b95a5ebb4cd306f9ab84ea12ce16c15d56ecc70c895261c74310f2474946ec1e73d63e7cda5becbfa875091c1362c715226776793c5b6ed179bf543ab27e
-EBUILD ferm-2.4.1.ebuild 802 BLAKE2B dcaf599027133d95a92263b09a453d53fbbec8da76c646fba5388a733b7424b2d6bf6eaec70f556b27459df4de7e0e8b9debc1e3549389ee61779e16fc343e16 SHA512 814fa6ac687ac32a5c9398417bde1a91e6d1f5bb35ac1c0ed0e3c4ecd457f076aff97edf0cc8ccae40d4a1804dee85be9c73c21716b65001d38782c98a5eb505
+EBUILD ferm-2.4.1.ebuild 800 BLAKE2B 2bb6052c54f948ceb17b5e8db199e8749c56ba50549a5c95acf5eec76a89557b96e0338ef6c6e9117eca30128dae47c04d3b8fa70e97951bd0d1d9f069f0d7c4 SHA512 5cb4dd2ba44ff315e768b96e251e560b923a4887e1a8a57b92455864e2e0006df0bf8004daf9ef0c81aac57df3ae4941001b07cca630c143f003eb18216a431b
 EBUILD ferm-2.4.ebuild 760 BLAKE2B 82735e1a66814888b5268c33a30e4a49da6fb6276bef089f2643765d8d04e31f86bd0b127a74e47fff53652ee615ee491b2b756847f3af366631da6364e3112e SHA512 b27bc01b9c69a416f26b9a4282e8d8602de4f3a2b2b596f5a675bddb6e85d7ed00a9c92fb0572dcd411fbfdda61db070b83de3b5e4846a70cb0e56ed350a1364
 MISC metadata.xml 450 BLAKE2B a42e7896b2269a0fbb904ced374899d3a3b87d38cb08c0c6f55f570ff476d42ede3b9316b69a86a5d46b64c5d7050348efdb72c2e9b68440c4a991078ae56e42 SHA512 23ffc755aba9f3ce1acb92f3de86ec1f788bd868227b7ace77b3b7accfe891036da7e3e87254fc0bd693d7777e4c932b663e0b1118a8804b0ac2d63624a4ecac
diff --git a/net-firewall/ferm/ferm-2.4.1.ebuild b/net-firewall/ferm/ferm-2.4.1.ebuild
index 339938cb9200..52d689b233b4 100644
--- a/net-firewall/ferm/ferm-2.4.1.ebuild
+++ b/net-firewall/ferm/ferm-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 # does not install any perl libs
 RDEPEND="dev-lang/perl:*
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index ba3e16f31370..f9e55f89504d 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -4,17 +4,17 @@ AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c122516
 AUX iptables-1.4.21-configure.patch 1066 BLAKE2B 59bf725aeaae131b57e04b556957dd3316f2282ea5a1d9e931f63865dd48484831c9f7674085b7134e2ef4c2dcddbc3b06c8f8e85a45840746a25e386c390f86 SHA512 45445d1460072ed19ba617be983be82094fdd0535a25de4f6159173de4a08be9bee9da13c7aeea419291beb92402ca25efba3a0e269510e221f7eacc8bcd5176
 AUX iptables-1.4.21-static-connlabel-config.patch 2195 BLAKE2B 237c59c2fd3312efa26181f363c2ad4dfe19b0cb494f90048e50ff464ed8abbb8ec46d406df51b9f3ba75f717a045ebb4fa38cc0ca5741f5efbfc3322171e04f SHA512 d838773bf2db9f97548d2f7eaab0ce3205265a7ec8b274df479fcecb474ba09ed061abae50534c0379a1290479c2e94927595eca0f4570b27744ec165348b6b1
 AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db
-AUX systemd/ip6tables-restore.service 398 BLAKE2B 0e58d701ae7213fb539f2c6e4a7964157854fc9b4983b6eb22329cffb92b03e21882f646633159f7dd29adb7635472916f87b612ac68406eaf810ca4a23301cf SHA512 4df4f73b14e123c463003656631d1affa431f722c9f598cdde6a63a531432aa3f97635b32c59aa2e1ddc4b45f500169c88da1c055fccac6c8ce89db23d015a7a
+AUX systemd/ip6tables-restore.service 404 BLAKE2B 35cdf804e787aa5cc382cc638de523735ab47b878168c41d8eef85eb592e5bebd9319e75a10db28f0eba6618efae355c90f03ac0798239edeb80d01108e98a47 SHA512 34730df7464354bce11ca5bdceb5cf305e8ab7e2ded2c2689448379e74ff93252e7a83cfe05c2f3238f59a2ade69cd9c328291c28c43b6612bfb7b29fcb0feee
 AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a1a48c681b77b6e3e1b2fa6f2ada7204f23df0f0894218599e95c2ccea71024e86cda7c82b6ff5a55d016d04d71cb1487 SHA512 7cee224f91d4c8348606ba176d0d689749a59229958cfdf4e75451d77271363e7cff71dbb7e30dbc4a5a837363a72d70d6960d2dfb218f3ad16456ae109cba10
 AUX systemd/ip6tables.service 133 BLAKE2B 28a81d41464015e0af5621612b0738f22d8afc8a1817a1303281c7440375e0f5fef1947a2e5ead4abffedbab0fb902748a8ed6f13dc77631b510a128fdc543c5 SHA512 f871e694a8c666a59840c4c7ae1f355dc47f481501b3472601b65460c1d6e163a7e33f7a6c42a84ac33131ddb96170b316e83507a43f1ede54d61446f81950dc
-AUX systemd/iptables-restore.service 394 BLAKE2B a1f0f75a20f55b13d6ed658b6028f6df20f825cc3769232eb32807af53b23ef9e68fdf1db7759a65836563ee0599421c3f6702e12b5598704350458b1ba3bcb6 SHA512 f0d042b487beaaa0dab0884ccb12c1cb63f9f5949b58187dcd4fcdb28a5b9874fd7b9cc8c14862f8a311a6e4016e2472edc51a776904c9940e1280da7dd3c01b
+AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 AUX systemd/iptables.service 130 BLAKE2B 1b4881253eae9fd24c831931e5836efc3d3bb6f7ebb1762ca5aabb31813e3298e02d66d557efa73e6f252bf3f67898a2b646c863879dd993a613796b4c057019 SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef
 DIST iptables-1.4.21.tar.bz2 547439 BLAKE2B e30f25581a118b91781dcc02761d4c8c420fb19876ec9e8ade3aff22b574931065f9a1c1ec31983a444c406dd928c47673d02698553da85c3db4f31484b1597d SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b
 DIST iptables-1.6.1.tar.bz2 620890 BLAKE2B b45ac26e1fb7e8b17a6df0afab3b6c0e2f0a5df9191367548136b3ce9aadc1bcb875b8bc0403e6f12fcf487054e96418f4ef34da827af8989fd4dcf83cd3cd8d SHA512 12280db6e6ef8e68da2537e9da59fc601790fd02b1ba38a37c90dbb56272018329dccb8be995f96ecd5d94fafa6043204f3e8f8ee96531685d9e3c55359d2ee8
 DIST iptables-1.6.2.tar.bz2 639785 BLAKE2B 3d129756fd33c8c73d56d57e3c5595896db86ded14834a45db21b964d82840b62216ce3cea4ae4960e8c5f0671df3cc6bfb222f68d29cf3a8c99e0eee14bf017 SHA512 04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0
 EBUILD iptables-1.4.21-r1.ebuild 2440 BLAKE2B 2461853963f0ea8a513b3a5a461cf6e442c43d89bfec47e65589e6dd37dbf8120789840cc97ca27cb285d16857acd400fa3f9b04cf30502d56b194d8f4ce22df SHA512 b8cc233407d3cdec4ac916c61f7dcacd0ab23ca344205d48be9ab1a6be52275e595c1a64ba48b0e2e122d6ad762b8ae73883cb3c98c646e0d2ec233a8ccc8155
-EBUILD iptables-1.4.21-r4.ebuild 2973 BLAKE2B 8ff2eb8f918305868dc7cba0b513f6b52b993458c41e5870be29e5940cad400d5f4b6aae333859ed1505b8db7ded733ba2179b5473038ad2da10a7949d83ab27 SHA512 a8ac1de33f16d4d5b2b21aa145ec33a05dae62ba045d269a84e5f58539900d23d39b9a923dab9a1b61514009a263ecacb50563eeb0b6e4e1b3ba673d76fb0594
-EBUILD iptables-1.6.1-r2.ebuild 3106 BLAKE2B d274cdef11246ea65582f7e6d3a8ee93528f95e268b621e3210bc48ebefb58dbbfe8d3b408c92a78fb9bcfbc58de915f69494951ccd5b3326168af273cee5028 SHA512 bc2a83e6c80c4a200a1fcba808fec62f9985a67a08a3293dd70554fbd0652aca6c63b624b89eac7f75735ae81d8152c3b5dad621a7e39588c5a3ef6ee66e9bfb
-EBUILD iptables-1.6.2.ebuild 3136 BLAKE2B dbe3dcb2b92c8130e3b51e97b9ed59058db61efa7530206a2cc83c40ab2d10abcc1132a06f9a1e1b3cece9cf9c323d92462132673f90bdb9b188c3c5e4622c65 SHA512 cc88a0e1e271049f21422fc65410be25a39ef6d0dc986f97d71dbf2de33703ba225f8a3fafa3199144278f4475d47086c0062228d9ab68ba2aa4b6ce789e141c
+EBUILD iptables-1.4.21-r5.ebuild 2973 BLAKE2B 2e700eebb6d87385f9eae1290751abc24435b4077873a233dfed6be3d1c54c7b558183fed04dda950e0915f55e41ad66d72474b009d1b8bfd531a087c90a4d45 SHA512 97ed570fa03b3766127390becbb60bb2585f23e95b6e4969c810bbaad32eec266d913a26fb4d98e689a9bb7433e92bd1399e13126f75c13ec9f0ea4212e4b117
+EBUILD iptables-1.6.1-r3.ebuild 3106 BLAKE2B d274cdef11246ea65582f7e6d3a8ee93528f95e268b621e3210bc48ebefb58dbbfe8d3b408c92a78fb9bcfbc58de915f69494951ccd5b3326168af273cee5028 SHA512 bc2a83e6c80c4a200a1fcba808fec62f9985a67a08a3293dd70554fbd0652aca6c63b624b89eac7f75735ae81d8152c3b5dad621a7e39588c5a3ef6ee66e9bfb
+EBUILD iptables-1.6.2-r1.ebuild 3136 BLAKE2B dbe3dcb2b92c8130e3b51e97b9ed59058db61efa7530206a2cc83c40ab2d10abcc1132a06f9a1e1b3cece9cf9c323d92462132673f90bdb9b188c3c5e4622c65 SHA512 cc88a0e1e271049f21422fc65410be25a39ef6d0dc986f97d71dbf2de33703ba225f8a3fafa3199144278f4475d47086c0062228d9ab68ba2aa4b6ce789e141c
 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987
diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index c149e92ba900..921b691296d8 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
+ExecStart=/sbin/ip6tables-restore -w -- /var/lib/ip6tables/rules-save
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service
index 2474ee3ec419..a9e56793548c 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
+ExecStart=/sbin/iptables-restore -w -- /var/lib/iptables/rules-save
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/iptables/iptables-1.4.21-r4.ebuild b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
index b873bc7ffcfa..7861dad2a4f3 100644
--- a/net-firewall/iptables/iptables-1.4.21-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-firewall/iptables/iptables-1.6.1-r2.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
index 67f06ce7ac09..67f06ce7ac09 100644
--- a/net-firewall/iptables/iptables-1.6.1-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
diff --git a/net-firewall/iptables/iptables-1.6.2.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
index b6c9ab99f6ba..b6c9ab99f6ba 100644
--- a/net-firewall/iptables/iptables-1.6.2.ebuild
+++ b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 1f3a7237d321..3ada49a82a0e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -14,18 +14,26 @@ AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b1
 AUX shorewallrc-r1 2075 BLAKE2B 7aeaa263ea5c318d3c2b29262e655929f87e36de17e347e613bb9ac4141deea5ba983695b4279effb3ba8b4a5da706a2213209571866e8bdb844c9619f1df85d SHA512 9cf87d5b5807b224a325c9d038f159e55d277ad3eca62a1fd82d06d9ec1d0f71e58b239c57532b9b081271c7ab6f90b281cea1dca0bb9ea26e1e1c8ddaf3a691
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
 DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
+DIST shorewall-5.1.12.2.tar.bz2 555472 BLAKE2B 4eaf7cf1256c4edd5d5bc134a501077d3705d6dd32717234d14566e556267d63181506e9498d50f168b0ebf9c2bebe50dc4087dcd8f2aea5834870fdfe1fb476 SHA512 7cfff999f245da3fa992cd67f18f8b13919e31d95da3dda1920cb0f883766bd5bf8e514a2db09f3fd386b7780dfdc0b811c4fbafa82f459f96dc78dd2e6fc4a4
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
 DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
+DIST shorewall-core-5.1.12.2.tar.bz2 86246 BLAKE2B c1e14fd42aadf97298ffe4ebee666ba1098142ef076a5086b45632b2f1063389756fadfbd4e35dd7958300da97d1c01e77fe234987119579d6e5588a409bbeff SHA512 457bf0db6c7b5d83895b471bcd40fa21f2f60007a819be4f9a805f79a0ba268b9ac522374519e8c95e21c99e80dbc27f8d7dc87ac078a9c8c8353cde526211fd
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
 DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
+DIST shorewall-docs-html-5.1.12.2.tar.bz2 4281009 BLAKE2B 6b16fd7556e7985b95a9c7cbf3c2dc9e9bb6988989569558f09dc7210b14f4624a9d4d75682325a3e4427c9d7fde8c5285dbe0673259122c8b7a806e08f85bb2 SHA512 1460a06fccda7e32a0ebb9f7ce0628c7a50abed37d48148222aa587b87ece249f8e3722c6628590f3d47d3b5ec25e7d2cfc246b42777e15e8a11565dbdbec070
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
 DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
+DIST shorewall-init-5.1.12.2.tar.bz2 41371 BLAKE2B 1ab0101c7d456aa21031d8aceab978e6cb98a5a14a30cb75fa46bef97ac0222418f94079433bb09e9d908eb44e9cd13a5a2bb42983054d4c09a96fe23fd83bd5 SHA512 ef6d3283023117f7c990d75f0569b06edb72568e7c6a848f9d77ef812951c54322771360bc2004fd6d74d0d9f3e8fc91b0b4ddeda6232e91173c5ca5b13d686e
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
 DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
+DIST shorewall-lite-5.1.12.2.tar.bz2 47045 BLAKE2B 09d8881848fab61501e7bb5b993fb0dd2b58fc7323aa741bf6847e40c9ffdfaa0dca965785a8f7c18405b434fd0cea15c434b46f42988027bd99c881996e42ae SHA512 e9a2596430b89e6356ec211d6eb94d2815041c269603274f5c102249a0ec1b24d5d3787dbdc876045a0ba41af76afa514f13e6e199358e045ab4ecb4d2b5e2f5
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
 DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
+DIST shorewall6-5.1.12.2.tar.bz2 197371 BLAKE2B 3a171bc819e8d4cd757c843222168f8b5b5749baf064d53a42d4d2f8dfcc75e9d8782b5fc31a4a2d520bdc332164197c5c893de47e5abdad6a036ba06db2d1bf SHA512 fe99cd78cd96a8ad78b46ea9c41858c915eee33dea993054ac6ddfe6ab50d2e90fa7af4c9d1e8efdd8153b5ff37f9c8fc831447a5997e819c82f8497a24a1d52
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
 DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
+DIST shorewall6-lite-5.1.12.2.tar.bz2 46746 BLAKE2B e38af0dff71fb3fc00ca7d7b5ba034650016060be3202f6284ff1ca82070eeb5e0e5cb448230b4e8614bdf0ddd71d28c3d0b022d30d6ed0ea0446c85e07cb0b3 SHA512 133409bf4dc004e4eb80c28e6e035331232dddd87b6fd512077947fcb05f10390360cb3f1918d441ed268f20f09c3bfd0a7952f9252cd8e39de9c6d617f2399d
 EBUILD shorewall-5.1.11.2.ebuild 16131 BLAKE2B 7d84ec26d9331f14660a6fa5add471302d608c09202a6a05dbecebe3efe1de29c7783f33ec872d52bb0c1a21c147f36c3704fef3846491de9efb196ecb357ff1 SHA512 759b68fe29ea4fc9a412da40823a021067ee27d746733a24f323a45516cd13c34c6dfee70d7179ba132942df8dfd6c6339aae75146f30444ed0ced31199166ab
 EBUILD shorewall-5.1.12.1.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
+EBUILD shorewall-5.1.12.2.ebuild 16138 BLAKE2B ae9bb119f6c9797e18652aef9ac50e0f8715fe4701e3626f1f0ca8f635b330f697cab44c11cfa3372cfe40dc5d23f138eddbc6dd58c780e576fac58ac819aa39 SHA512 5c72f544bd6cc12d0966822fd7ae9b9f133d06df8ab65eab03f021c891b343760f3804c70ed78941e8dff71482dda107b77b153e63e421d151e74f6e13ece4a0
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.1.12.2.ebuild b/net-firewall/shorewall/shorewall-5.1.12.2.ebuild
new file mode 100644
index 000000000000..d073bcb9296f
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.12.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+		keepdir /var/lib/shorewall
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+		keepdir /var/lib/shorewall6
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+		keepdir /var/lib/shorewall-lite
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+		keepdir /var/lib/shorewall6-lite
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index b20412eb8672..8f2b9a844ba7 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,5 +1,7 @@
 DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497
 DIST xtables-addons-2.14.tar.xz 322296 BLAKE2B f739951ff535f73be8c96b271f929821fd708cb4615a3e6c2528d9bd2574c8d801c6ac6b59f23f5054b29c31a94f90c7d3f7628b09fb78dc2e7f7da87e5af0a1 SHA512 f3d49c53aa01fadc334906e580f16605849fe7be83637fa73d51b48ded0e77c368c544ad69fa97b53a6688eaa3ba63bab489c150a9e02205e8044cdd521f4752
+DIST xtables-addons-3.0.tar.xz 321960 BLAKE2B ce6e034ab42fda319217b464a2c3c639787a696d58739cc7ba8e1c699894c46590c34490c8ccc41c29b8dbfb4ad01859050bdeccbac08d09f297a49cdc920c6e SHA512 164b43ff23f33187b5f557bedf765fbad21721b236ac5f5e982c5fdf88cdcbf8ca106810d2df31d9ab79e9c518f7fec3d7dae297540d0b00326a0dfffd04cfec
 EBUILD xtables-addons-2.13.ebuild 5448 BLAKE2B 42744cf3bd258d865f55e2728ea16e8d9e17c35ead18ed04253d7dfed04c8db177cf02d06790b120961c19c066ab84e78bf4155fcec1399874705fcaad316927 SHA512 2fddc069312fa3ae39a1e67e95627b7c1eca04bac181012a462f5f596e052ba94497a8bf003c7bd6fbf701429ea16f8c6db348d6df515c3fb5fa631962732bc4
 EBUILD xtables-addons-2.14.ebuild 5450 BLAKE2B eb2d92c49d602c772f5b50f75bd35036e6821fe1a775f6de4e344e898da2310029355abe271f44856b7a8bb63a0504798ae0aa8d341c29dc38d4f829cbf21faa SHA512 ed2c3706933d22a85bed5cb2d009141afd0a6d3057372c0c9f8dc4f51a8b9401f27889539c60f235d40b927d137db2b4dac5da9ff3f9f00dcb67e5e6e39d97f2
+EBUILD xtables-addons-3.0.ebuild 5452 BLAKE2B d0f1523187898971dd4f22634fe646379921d5fa71f1e3fd253ef61fa0174b48e74e76fe022e4777e497f3d68be33b4665aaea9278fdc0fe8fb1a361869df20e SHA512 d64b370048ec2a0b3c233b780604cef5fc50d2ee6183619fd5f34a09034bb6561c403edd1a073a914d6b6cc0cf2fb87a214ca6e5c1ad79c950cc93bcf69ecda6
 MISC metadata.xml 775 BLAKE2B 3462baf963682f15042f1fe9a985fdce50d46abb5fbe1080f6ce5285314a3e24581d780d84112a5bed0a4a132ce17f29678983711a38745d0fd7969091e76182 SHA512 85474ba552703d77bc7cc18ccef424f5eeb68e23eb41e14a8c360afcdcb2632a99420fda2dca57ea15dbda3f850d939c16b18cbdc96dbfcf31a6af3f40743f0c
diff --git a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
new file mode 100644
index 000000000000..fe13a6f14f18
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils linux-info linux-mod multilib
+
+DESCRIPTION="iptables extensions not yet accepted in the main kernel"
+HOMEPAGE="http://xtables-addons.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="modules"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.6.0"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? (
+		app-arch/unzip
+		dev-perl/Text-CSV_XS
+		virtual/perl-Getopt-Long
+	)
+"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+XA_check4internal_module() {
+	local mod=${1}
+	local version=${3}
+	local kconfigname=${3}
+
+	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
+		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
+		if ! linux_chkconfig_present ${kconfigname}; then
+			ewarn "Please enable ${kconfigname} target in your kernel
+			configuration or disable checksum module in ${PN}."
+		fi
+		# SKIP_MODULES in case we need to disable building of everything
+		# like having this USE disabled
+		SKIP_MODULES+=" ${mod}"
+	fi
+}
+
+pkg_setup()	{
+	if use modules; then
+		get_version
+		check_modules_supported
+		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+		linux-mod_pkg_setup
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		kernel_is -lt 4 15 && die "${P} requires kernel version >= 4.15, if you have older kernel please use 2.x version instead"
+	fi
+}
+
+# Helper for maintainer: cheks if all possible MODULES are listed.
+XA_qa_check() {
+	local all_modules
+	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
+	if [[ ${all_modules} != ${MODULES} ]]; then
+		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
+		ewarn "Please, update MODULES in ebuild."
+		ewarn "'${all_modules}'"
+	fi
+}
+
+# Is there any use flag set?
+XA_has_something_to_build() {
+	local mod
+	for mod in ${MODULES}; do
+		use xtables_addons_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS to any combination of"
+	eerror "${MODULES}"
+	die "All modules are disabled."
+}
+
+# Parse Kbuid files and generates list of sources
+XA_get_module_name() {
+	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
+	local mod objdir build_mod sources_list
+	mod=${1}
+	objdir=${S}/extensions
+	# Take modules name from mconfig
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	# strip .o, = and everything before = and print
+	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
+		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+
+	if [[ -d ${S}/extensions/${sources_list} ]]; then
+		objdir=${S}/extensions/${sources_list}
+		sources_list=$(sed -n "/^obj-m/\
+			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+	fi
+	for mod_src in ${sources_list}; do
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+# Die on modules known to fail on certain kernel version.
+XA_known_failure() {
+	local module_name=$1
+	local KV_max=$2
+
+	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
+		eerror
+		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
+		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
+		eerror
+		die
+	fi
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	# Bug #553630#c2.  echo fails on linux-4 and above.
+	# This appears to be fixed, at least as of linux-4.2
+	# XA_known_failure "echo" 4
+
+	local mod module_name
+	if use modules; then
+		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	fi
+	for mod in ${MODULES}; do
+		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			if use modules; then
+				for module_name in $(XA_get_module_name ${mod}); do
+					MODULE_NAMES+=" ${module_name}"
+				done
+			fi
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+	einfo "${MODULE_NAMES}" # for debugging
+
+	sed -e 's/depmod -a/true/' -i Makefile.in || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.in || die
+
+	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
+
+	eapply_user
+}
+
+src_configure() {
+	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use modules && linux-mod_src_install
+	dodoc -r README doc/*
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}