gentoo resync : 06.05.2018

9 files changed, 330 insertions, 17 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index b24dee8198ce..7534020e9089 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 9b316a7439a9..8746dac0bd3b 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,3 +1,5 @@
+AUX shorewall-5.2.0.1-AUTOMAKE-SAVE.patch 1418 BLAKE2B a86b0a81757b0d55f82b62acffdf40888aea4ca4b5e6339f454d8c26170d5e4807dd38a12d63954c387dfc9b24c5255e7ede789484d4289298bd316a3b957452 SHA512 7f3893eb0b797c8253774af6adc5594fd950ea4f04db3f73fc33413dd3e522ff4b31f25c74f0458644cda150569b6b624f6eca04632b4faa04671469ff65782b
+AUX shorewall-5.2.0.1-YESNO.patch 971 BLAKE2B 1428fcafb60e937fba19583c3980be7e37b540d27e1e0101910099366b287161bd644eb09ccb48e6b435090a41a8387a10e0c8d3a3a67d920a9356a8abbe1e05 SHA512 8d9e58a6f10523c51f796c2c5e944ce9e6b0322c4520b52f8e41ae48134a44a17e2b151bd474bd7b17793fd7eed659b0cb533e9bc4e673b4d2a0f432a8ce0c60
 AUX shorewall-init-01_remove-ipset-functionality-r1.patch 799 BLAKE2B 5cbf0835d291464eca10356fcfe1de13bc90cf0e3b9869d0daf8e3ad3864a44939774179047cbf5e192f0e294d8e8765c6d7b60a02178c9c149cbda4d3342b83 SHA512 c8686cb9345abd1036a8fdc6cbdaacc21a69df9dc536393a65675a2ae19c9cfb71d71cc66a9776135ad923414bde783f01dfa69600d1cfaafd618fcea65c8dcf
 AUX shorewall-init.confd 152 BLAKE2B b670db8a1da8e37c9d0f856c27ceb9644ec7baebf82e8d053c02a6f133df15a04087340ac430c8dddc57295332834c3e8e1c6fcb994e96e7224452a5a039d1c4 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b
 AUX shorewall-init.initd 4357 BLAKE2B 192e36a9e488c510783454852e65e2963e400fcabc96a07201c9cc72e09bcb63171cd56665f4cc9e4b4631202f8bed3d618866bccdaf194dee25814241381739 SHA512 5cb410e0fe0391fd467f212b3e1cf3ec4c7fa3289de2341edbf301ce9087e7cba05a36999a8203d7bce28ac35a429c10bc017a96b750aec1bf257987aec23245
@@ -5,27 +7,30 @@ AUX shorewall-init.readme 1233 BLAKE2B a0603996cba908f3ff101ea82761c5acc279ee590
 AUX shorewall-init.systemd 389 BLAKE2B fe2ba4c0be798fb994643ff050bb3fdce5c97f43dd38d5c1e38eae010c32df80bbf065b654721ceb98c344a67d59324545b5155e16d01ce1f8e94b2bff768732 SHA512 458c5fb5d894f307cec27fd42d05a1b16f10d556afd11a7b73f75be8eb072aa5256ba6095b4e3454694b9bc3e6cf80d7f40314bbe368ebfd4646074a12669f4c
 AUX shorewall-lite.confd-r1 197 BLAKE2B efd61f07ee3b601e7f2510e19a9ea065cf30fa414c23eb0d6e036b9bea6cff72ea5fa606033dfad4bd2f08db6d1a2a28b60ba3018e64e8f9d75366ed9f32d5bd SHA512 fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b
 AUX shorewall-lite.initd-r2 2236 BLAKE2B 2ab64ec540c4ea32e8e696d1f0773d3663cc2b077e72a58a7a3012d28b552a1774a1e89cb4ad5e6b5ad1baaee29ad073842762f11c8902c4a1b6bfa3a12ebe86 SHA512 3277922dd65ea573ddc210f07f42831b18275157a595c95517e7306cccd75e2884d30acd36288b2082becf3879977a85efdd0456fc27466d2acff3cd921f6d0f
+AUX shorewall-lite.initd-r3 2238 BLAKE2B 4a1c559589a9e0f6a332879cc8c61228cc65f1fe6d648452009348a6b2a6578028a03e764518ed63b7994615149cec0524cffe66daa13b1805e0d155addf2352 SHA512 215a33cf378a12b6d1563b0b9fa95d372e069aa1cf7904a067c12cdfef80f1ba46910d37ba1be8f4ea6a272e5bf4d7ad37563257139d014f7f12ad91021b599b
 AUX shorewall-lite.systemd 603 BLAKE2B 527572f0d110ee94d8398789fb1d55acd6d91fbaf4ddf4c0bd8e606679beef5d9a3ce382cde1c5424813f04df14e98f9c71b0d0ef941826132c66143ca3d5361 SHA512 b9ac8ca1f31d29dfbd6a3e9387932ebf954e18c634df7e6118c55e3eaaf20a835e47e0bad07bb4ae1c47e76cda91bb3d03cd59f61805e48c194833b86d14a54d
 AUX shorewall.confd-r1 197 BLAKE2B efd61f07ee3b601e7f2510e19a9ea065cf30fa414c23eb0d6e036b9bea6cff72ea5fa606033dfad4bd2f08db6d1a2a28b60ba3018e64e8f9d75366ed9f32d5bd SHA512 fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b
 AUX shorewall.initd-r2 2652 BLAKE2B 67ec5b68284e7524a9fd03e552af2b51b11a5ff1aec7bab87f5a1e7f5d1fd894173a24f8676aafbae26d0ea6ee5c3a0187c309f7a797a46c44670c04b145858f SHA512 aee8747282dd8e7ecc7cd50ce358d8701f7bff3e5325d3da474aaa31edbf0833345338774fa51648498e398672f9a0ddefc49f3c2c09f5bf075571d9247c6858
+AUX shorewall.initd-r3 2394 BLAKE2B af8d12c9eac3e0f9fbdfeb44b125bfdd949c8310307ad52334f51b89865c02dd843fc850e2784bc8a56af5656e22e00b226563be02df2508debacbb6c363c063 SHA512 4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771
 AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b3966eadd971d5927310cf251dc706687e1af26938bed049074495f57b566c47ee82fbc32ca5bcf957b26 SHA512 eee635ce7818c416f3563fa8453d580a77451bc87bf12a285649ab22eb68c8d001ce54a8ba70742f46c7b1104acc3e2b9aba4878267992ad84f9042b625b0634
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r2 2035 BLAKE2B e130d1d45427f5d5fba36e75e88ce9cafd3d3a207e63e006ed869c4b9cabc37e0ee1573f89ba8a1c4879a701baccba1a8c6c45c051b4ddd1043a0afac534aa03 SHA512 0a446beabc540bead854c141cc0e19ded5da548f7cbb83f99cbcce58227311579c7f03f3b94f51851ed689b8c904085a2fd32478f18729f34c1aabfc1ea9b577
-DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
+AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
 DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
-DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
+DIST shorewall-5.2.0.1.tar.bz2 535180 BLAKE2B 4e7e1d1f43b1bd5a9e683d6ab4e0dde5201dce0616c66c38b518838210bcc69c31a5bb586933ac3d83f8852704166cb7376dd07d8ee4d74e777c483a5178db34 SHA512 9896836e709f728a2320c805cae588dbea37621587bbb0f11937be911c80d0302f63a230642089cdb9839cc55f16b67341392c5d76a71406e0cfadb7b99b4cc5
 DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
-DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
+DIST shorewall-core-5.2.0.1.tar.bz2 74523 BLAKE2B b4b204a9802a3fd0a69498acd7bb52a0fe0010a38df6feca5c98f15150e3924346911862745950269af60dd4ee2102a8e935a5c8d9f26edc8e726203bb8c3df2 SHA512 ebb184b33ade8111b961679c3aa90907ddc23410c17dd1fe49848425c465725a5f4c24f6bfbd158e759df6f651046db30120310a3edd7e594399721770cc9471
 DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
-DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2aa923d6a14bbe4104eb27720b863cf8553a4121c99899621da529861272a12aa6b35b6d2f77e1754968f6b628ac7d5342a6 SHA512 a72a58e10f37e5400ef809abc601505d9c53031d82061c37d2bc4fc65ece0b5e886e4fa5a20ba7e794f6447be4adfd0e8e918d214e82bf75f734b858dacf9a46
+DIST shorewall-docs-html-5.2.0.1.tar.bz2 4294859 BLAKE2B 317d1e014f94e040154617a355619317efed4c318e14a6c2a6cfabeb1ee2c5fb0bf49a7e9a80ca8ffbd5828798d33617fdcf18af0bc6ec8333a2a1b8231136c1 SHA512 52c5af9c682bbb233be3e779a45f7d09ca874849e6a118271bf90d6791cceaa31740dee8cdfd08a50807565fb9f8d6191ca1096ab31d1419b7088668c349c71c
 DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
-DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
+DIST shorewall-init-5.2.0.1.tar.bz2 29381 BLAKE2B 6c0c937a8fd7499ce07f9ef0f1ef07c892e3d0585e2d29506377ca311ffa5939160aa62bd4e9602d346bfec2698865228ba69cdfbf6229520288485ced1e7f39 SHA512 ce9ba1a8bec5823650022f80db70b60930fa4b5c65462e4e8317f71ee467f75ff3af2b658c1d3bbe0cb7cb41acd4226cb2cfb657afde1375740c737f4528256f
 DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
-DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
+DIST shorewall-lite-5.2.0.1.tar.bz2 35244 BLAKE2B b4983c21bb46c684adecb4d771839bc4a31a6737827e68944e75752fc4296aa458f24f9cdba46f19d09308634b00368e7fe5ec7a6417c1348cc083f7d8d437c0 SHA512 5562c41993a6047b5a334ab26d296df836976749da24796f005e12afc1e987b4f784ec25ffe176c81b8e9f129930c91a5869335d15eca649bb7a03c214b700ad
 DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
-DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874
+DIST shorewall6-5.2.0.1.tar.bz2 184727 BLAKE2B ff9502e2ff84af146ba42cbfe4a7e383e6e2c56f43cd53c21085908660c672d8e579fd8615f841a202bb6bd796d434f7a462d684e45496880599902a3a3a0acb SHA512 dd34968d2e074e0460aeb562a2c4ab857e6c9a680d4d9f41cf006bfddfffc647d472693401c6a8f03da25af2f1117ae61c640fa7db099af3e5b5cd27be74ecef
 DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32
-EBUILD shorewall-5.1.12.3-r1.ebuild 16274 BLAKE2B ec3a48d6ca7da8e553c0771bff4ffad54ff2ddaf61dda8a5d781d59f53075f637303eead6ffdcdba940a7db38e6099a3a070dcfcfd3bec0167af369e082b6cf7 SHA512 7ac1aa7e32c815499a49c0a97427359db8fed3fc135026593ff724d53e42a566a5ec023bdd760ad9959768a84ad453df1a88973c018b7f45b543efa6bfa0e969
-EBUILD shorewall-5.1.12.4.ebuild 16281 BLAKE2B 6f2b7ae851dd53b75875388904a5d03bb4bfe1b065fe3a3f429be47be7adb879f15278771e10a9e9abc29fb38a8509833c8bb0e205699867306abd28a425baee SHA512 7d35e754c669e0ed9f72b8ead5d15cc40f3be2bbbcc63c3996d28c593a035190433290d374f751306651405623266b4cb857df2c74518693184a5f0618bed0d2
+DIST shorewall6-lite-5.2.0.1.tar.bz2 34931 BLAKE2B 94155a21be8d8aba07d9742b2d92428285588dbf33f1b522644dd7be4a05dd25b93ad4d3bbc3fd147f544a7d9ce8bf01dbadaee642bcb014f43aef6ba61f1596 SHA512 dc2f1c61efd8673335b117771baf8cec2145b5afc4a6b74b80834daa321f22475e2ec9baa23358c5e2d4787b5ec1cc092b17617cdfe9a921bd0075328eb0cdd5
+EBUILD shorewall-5.1.12.4.ebuild 16274 BLAKE2B ec3a48d6ca7da8e553c0771bff4ffad54ff2ddaf61dda8a5d781d59f53075f637303eead6ffdcdba940a7db38e6099a3a070dcfcfd3bec0167af369e082b6cf7 SHA512 7ac1aa7e32c815499a49c0a97427359db8fed3fc135026593ff724d53e42a566a5ec023bdd760ad9959768a84ad453df1a88973c018b7f45b543efa6bfa0e969
+EBUILD shorewall-5.2.0.1.ebuild 16391 BLAKE2B 5478af9a3d7ed636e4768c1335c019ceef42e072042ff8e4b4e609f1e62d22916c0a0ee845188d01ed96435dce02cbd56f7faad10451bee2b13114cf6c4f0426 SHA512 36f12bb143a763931650de55ce0a9ed06ba6440401cd28813ba012f04a1ecb880426bfd7f38173d3f9fbf5c808e8f301ee87854e384b2e95efd8853973f10c77
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch b/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
new file mode 100644
index 000000000000..2927d4c17ab9
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
@@ -0,0 +1,47 @@
+diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
+index 0e2de1525..60499180d 100644
+--- a/Shorewall-core/lib.cli
++++ b/Shorewall-core/lib.cli
+@@ -1201,11 +1201,17 @@ show_saves_command() {
+     echo
+ 
+     for f in ${VARDIR}/*-iptables; do
+-	fn=$(basename $f)
+-	fn=${fn%-iptables}
+-	mtime=$(ls -lt $f | tail -n 1 | cut -d ' ' -f '6 7 8' )
+-	[ $fn = "$RESTOREFILE" ] && fn="$fn (default)"
+-	echo "   $mtime ${fn%-iptables}"
++	case $f in
++	    *\**)
++	        ;;
++	    *)
++		fn=$(basename $f)
++		fn=${fn%-iptables}
++		mtime=$(ls -lt $f | tail -n 1 | cut -d ' ' -f '6 7 8' )
++		[ $fn = "$RESTOREFILE" ] && fn="$fn (default)"
++		echo "   $mtime ${fn%-iptables}"
++		;;
++	esac
+     done
+ 
+     echo
+diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
+index 2d8c7df67..46c932335 100644
+--- a/Shorewall/lib.cli-std
++++ b/Shorewall/lib.cli-std
+@@ -412,10 +412,14 @@ uptodate() {
+ 	    elif  [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print)" ]; then
+ 		return 1;
+ 	    fi
+-	elif [ $AUTOMAKE = recursive ]; then
++	elif [ "$AUTOMAKE" = recursive ]; then
+ 	    if [ -n "$(${find} ${dir} -newer $1 -print -quit)" ]; then
+ 		return 1;
+ 	    fi
++	elif [ -z "$AUTOMAKE" ]; then
++	    if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then
++		return 1;
++	    fi
+ 	elif [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print -quit)" ]; then
+ 	    return 1;
+ 	fi
diff --git a/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch b/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch
new file mode 100644
index 000000000000..91791e01c4d4
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch
@@ -0,0 +1,46 @@
+diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
+index 9896e18d4..2d8c7df67 100644
+--- a/Shorewall/lib.cli-std
++++ b/Shorewall/lib.cli-std
+@@ -1063,6 +1063,41 @@ restart_command() {
+     return $rc
+ }
+ 
++read_yesno_with_timeout() {
++    local timeout
++    timeout=${1:-60}
++
++    case $timeout in
++	*s)
++	    ;;
++	*m)
++	    timeout=$((${timeout%m} * 60))
++	    ;;
++	*h)
++	    timeout=$((${timeout%h} * 3600))
++	    ;;
++    esac
++
++    read -t $timeout yn 2> /dev/null
++    if [ $? -eq 2 ]
++    then
++	# read doesn't support timeout
++	test -x /bin/bash || return 2 # bash is not installed so the feature is not available
++	/bin/bash -c "read -t $timeout yn ; if [ \"\$yn\" == \"y\" ] ; then exit 0 ; else exit 1 ; fi" # invoke bash and use its version of read
++	return $?
++    else
++	# read supports timeout
++	case "$yn" in
++	    y|Y)
++		return 0
++		;;
++	    *)
++		return 1
++		;;
++	esac
++    fi
++}
++
+ #
+ # Safe-start/safe-reload/safe-restart Command Executor
+ #
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd-r3 b/net-firewall/shorewall/files/shorewall-lite.initd-r3
new file mode 100644
index 000000000000..ee304926f97c
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-lite.initd-r3
@@ -0,0 +1,90 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${RC_SVCNAME}" = "shorewall6-lite" ]; then
+	PRODUCT_NAME="Shorewall6-Lite"
+	command="/usr/sbin/shorewall-lite -6"
+else
+	PRODUCT_NAME="Shorewall-Lite"
+	command="/usr/sbin/shorewall-lite"
+fi
+
+description="The Shoreline Firewall Lite, more commonly known as \"${PRODUCT_NAME}\", is"
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="clear"
+extra_started_commands="reload reset"
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} ${PRODUCT_NAME}. The firewall is"
+description_clear="${description_clear} then wide open and unprotected."
+
+description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
+description_reload="${description_reload} that the firewall is already started."
+description_reload="${description_reload} Existing connections are maintained."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	provide firewall
+	after ulogd
+}
+
+clear() {
+	ebegin "Clearing all ${RC_SVCNAME} rules and setting policy to ACCEPT"
+	${command} ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
+	eend $?
+}
+
+reset() {
+	ebegin "Resetting the packet and byte counters in ${RC_SVCNAME}"
+	${command} ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
+
+restart() {
+	local _retval
+	ebegin "Restarting ${RC_SVCNAME}"
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		svc_start
+	else
+		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+start() {
+	ebegin "Starting ${RC_SVCNAME}"
+	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $?
+}
+
+status() {
+	local _retval
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewall.initd-r3 b/net-firewall/shorewall/files/shorewall.initd-r3
new file mode 100644
index 000000000000..a67948155817
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.initd-r3
@@ -0,0 +1,98 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${RC_SVCNAME}" = "shorewall6" ]; then
+	PRODUCT_NAME="Shorewall6"
+	command="/usr/sbin/shorewall -6"
+else
+	PRODUCT_NAME="Shorewall"
+	command="/usr/sbin/shorewall"
+fi
+
+description="The Shoreline Firewall, more commonly known as \"${PRODUCT_NAME}\", is"
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="reload reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} ${PRODUCT_NAME}. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
+description_reload="${description_reload} that the firewall is already started."
+description_reload="${description_reload} Existing connections are maintained."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	provide firewall
+	after ulogd
+}
+
+check() {
+	ebegin "Checking ${RC_SVCNAME} configuration"
+	${command} ${OPTIONS} check 1>/dev/null
+	eend $?
+}
+
+clear() {
+	ebegin "Clearing all ${RC_SVCNAME} rules and setting policy to ACCEPT"
+	${command} ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
+	eend $?
+}
+
+reset() {
+	ebegin "Resetting the packet and byte counters in ${RC_SVCNAME}"
+	${command} ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
+
+restart() {
+	local _retval
+	ebegin "Restarting ${RC_SVCNAME}"
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		svc_start
+	else
+		${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+start() {
+	ebegin "Starting ${RC_SVCNAME}"
+	${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $?
+}
+
+status() {
+	local _retval
+	${command} status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewallrc-r3 b/net-firewall/shorewall/files/shorewallrc-r3
new file mode 100644
index 000000000000..a0ed9f7f0495
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewallrc-r3
@@ -0,0 +1,24 @@
+#
+# Gentoo Shorewall 5.2 rc file
+#
+BUILD=gentoo                            #Default is to detect the build system
+HOST=gentoo                             #Gentoo GNU Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
+SBINDIR=${PREFIX}/sbin                  #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=                              #If non-zero, annotated configuration files are installed
+SERVICEDIR=tbs          #Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
+SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
+SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
+DEFAULT_PAGER=${PAGER}                  #Pager to use if none specified in shorewall[6].conf
diff --git a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild b/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
index dba65373d60e..d7c5285f28b0 100644
--- a/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.12.4.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild b/net-firewall/shorewall/shorewall-5.2.0.1.ebuild
index d7c5285f28b0..ef57ddf2042b 100644
--- a/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.0.1.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 SRC_URI="
@@ -156,7 +156,7 @@ src_prepare() {
 	# This allows us to use patches from upstream and keeps epatch_user working
 
 	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r2 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
 	eprefixify "${S}"/shorewallrc.gentoo
 	sed -i \
 		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
@@ -174,9 +174,12 @@ src_prepare() {
 		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.initd-r3 "${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
+
+		eapply "${FILESDIR}"/shorewall-5.2.0.1-YESNO.patch
+		eapply "${FILESDIR}"/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
 	fi
 
 	# shorewall6
@@ -185,7 +188,7 @@ src_prepare() {
 		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}"/shorewall.initd-r3 "${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
@@ -196,7 +199,7 @@ src_prepare() {
 		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.initd-r3 "${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
@@ -207,7 +210,7 @@ src_prepare() {
 		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}"/shorewall-lite.initd-r3 "${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
@@ -411,7 +414,7 @@ pkg_postinst() {
 			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"
+			elog "  - http://shorewall.net/Shorewall-5.html#idm214"
 
 			if use ipv4; then
 				elog ""