Version bump, drop old. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/101 by Whissi.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

9 files changed, 146 insertions, 473 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 2f5601d8ad52..f55dafe7fe90 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.284 2015/04/13 08:22:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.285 2015/04/22 14:33:43 mgorny Exp $
+
+*shorewall-4.6.8.1 (22 Apr 2015)
+
+  22 Apr 2015; Michał Górny <mgorny@gentoo.org>
+  +files/4.6/shorewall-init.systemd-r1, +files/4.6/shorewall-lite.systemd-r1,
+  +files/4.6/shorewall.systemd-r1, +files/4.6/shorewall6-lite.systemd-r1,
+  +files/4.6/shorewall6.systemd-r1, +shorewall-4.6.8.1.ebuild,
+  -shorewall-4.6.5.3.ebuild, -shorewall-4.6.6.1.ebuild:
+  Version bump, drop old. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/101 by Whissi.
 
   13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> shorewall-4.6.6.2.ebuild:
   Stable for alpha, wrt bug #543450
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 7e93c9d9b7f7..b155bcc66c43 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,65 +15,64 @@ AUX 4.6/shorewall-init.confd 152 SHA256 990ae5e4498ddf071de317f7746fb3eadca77fab
 AUX 4.6/shorewall-init.initd 4482 SHA256 08bb63ef58ee6f7c69acb2b410324b8cb3933fe248737471c6cba71d12f3bd10 SHA512 376afb665ea7edb2cb4634676f57c4f32c970288e3e20afb7c5ac118ff35df4c41e86c4307711f537de3995ea8c92861c048dd10fa31f9ef115a0dda43579b7f WHIRLPOOL 93be7311e4fe02b9215be87ec8a013fcdec0f50f9270984175a8497f097f3045ad5a3f9aec569d474af944deb237d2d87dbda444022ee0c2b4a54ded3c283270
 AUX 4.6/shorewall-init.readme 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
 AUX 4.6/shorewall-init.systemd 434 SHA256 0f9904db0989d6ae29004f8a2c851073ae20207a7eaf6dbea1f0ecdf0cf69e81 SHA512 d64e04f1db6134adf7730b07ee1b468f7d980d8d8ded4a16448713bb807a9ec2d847f13860712f886e956ab2328e1b8ce1a230be24874dff84f9474704767984 WHIRLPOOL aaa0e1690ef29534b9d03aef0a70256ba0b907015c3e6624c94b49784722220eac1c7309d6b209cca7fd39840c6a02b20016d7e37b69f5c9092e17d628039ea0
+AUX 4.6/shorewall-init.systemd-r1 503 SHA256 dd7fb99366cd340db6875b11573e3ec3f6f119e5dd52164f6d072ebb0da34cce SHA512 dfab6b3f5d0405453f5e27c31853228d9f067ef40908a2dc69e67057569bb67e3caaa7e38f55177840fa650921669b944a7051c96b8ec36ca79cdcfe5abe0263 WHIRLPOOL 837e72df37c9ee507cd17269390b8ca9a6d8e59b2508e0c0b232e7cee84fc7722ef21b31f5d6a863abee0d3aa5537b6ef5efccb96d3692f4919ed90e1a95aaea
 AUX 4.6/shorewall-lite.confd 160 SHA256 6aaa091f85ca7626023883b7e4fc7ffb644e427581d9aaf9307958fafbfdca88 SHA512 90a54824162c31276b791cfaed93f871d78af880f75184355fed3c597aae981e7a05d4725d127419892d849685bf11b26d3c71282b8ae0e0072a32b7d1309c91 WHIRLPOOL 02e1af5589ad1cd72cd9f6eb9858e590ab0451af7459118fbf830ac8ee47989c814d87e319f68cb7e5113a9a7792b7faed433ddec0e8b30b2dff28b8cb2ca45b
 AUX 4.6/shorewall-lite.initd 1806 SHA256 56ad0e95c665362cef484a3ade7fa4178a12cc13e8ea1bab0e3935beb74fc993 SHA512 4621481d5d633d82a7586d99c2e357c3cf94b703176f7bf096bc53ff06caf99e0370625b71ee8c6c9b9dab6410eaad7c5682da9a9fae12cfb472c2deb5875d41 WHIRLPOOL 54378e0109fb4072858d7bb5fe860fe551aff5549434c183d6ca339defa9fd2a563f267d57e09a4ab55909eb9fced3d75cb9a279a531e6fce98a1f6034352b6e
 AUX 4.6/shorewall-lite.systemd 550 SHA256 f659e1ce8bf01a6b63cfd3ba5e09f8684e617aeec533759dc968b50afd047672 SHA512 e7024f23ca9112eed2f9dde682beb98a5fce8c589b68838e554e75ff2d548bfd04ac52a4945540f5cd95c0baf1b0d0f19918efbc433c9734f258c165138572a3 WHIRLPOOL c029dff884b62fa5b379e1fd15901e3e78a9b8db3dd05775d8bbb3b7ed2f7f3c49e72fcc27397a98048825c28c5736f6f02cf831fea02484d64ef757fd03bc8e
+AUX 4.6/shorewall-lite.systemd-r1 603 SHA256 329ab1a7a1bda755999d90d71acb59927f1b7e8106d419ff664a490a3df0ac22 SHA512 b768f97790bccc7734a69c0b911b419241efb4d6a0af1e13b0292805588d22dc10e36a8624e33b65984e5125e7dce00bf7792c21c98f17fc02de45ce6379236b WHIRLPOOL 37716e6f5ad959f254590376db6f879b573dc21316acc012c624806ce32c90e275c63fbcc38e4a550362abbd1ffb142dc76914064e4a2e772e35fc686651988f
 AUX 4.6/shorewall.confd 160 SHA256 6aaa091f85ca7626023883b7e4fc7ffb644e427581d9aaf9307958fafbfdca88 SHA512 90a54824162c31276b791cfaed93f871d78af880f75184355fed3c597aae981e7a05d4725d127419892d849685bf11b26d3c71282b8ae0e0072a32b7d1309c91 WHIRLPOOL 02e1af5589ad1cd72cd9f6eb9858e590ab0451af7459118fbf830ac8ee47989c814d87e319f68cb7e5113a9a7792b7faed433ddec0e8b30b2dff28b8cb2ca45b
 AUX 4.6/shorewall.initd 2508 SHA256 d966fa835361cf2d5d881a2c17291b0381d6311a3f5d049429823375e9cdb6ce SHA512 38428123525c247c38380ef655559a75a7e143b60e48df02ed567b1481246a7af2b0d8a030c1f46b70a7e0fd084f1bcdafaa2e55772085bf90acd2d5b93990cf WHIRLPOOL e7171809ccfcfbeb889b1328d549cef771eb367903a48925799a74aad5d627095e356e634cd8d52b7fddada5ec1162c1208fe7a2616232ea11a2d0f7a4b86647
 AUX 4.6/shorewall.systemd 515 SHA256 d73bdea3e049e88645d9ad07d80a04e05139c6dd2d2daa17343de385c159740c SHA512 cb1dfba9a680f417d445d9619610c8f846337f1b82e4b8676489c581b009825727dd2c9da6d5b01e7c20ce8699022420642111d0bec486acd0a1f474ee945684 WHIRLPOOL 0a1bdbcb7a8647ac2f4f689bd32423cd2d530985a7349c26bc868fb2ba5fbbb9adf751f79f952aaa524cbc7f76abd4ba20fbd6c5a24e69356fb4cbc3a0fa8545
+AUX 4.6/shorewall.systemd-r1 568 SHA256 cd2134346d4004f9a743847ab2da7be812541764ecd8639559bac70fb20a9b3f SHA512 82ed286d65eb47598d67e745aab0ce78f07a21939fa26bdd15986cbc6cf54574f76b820033edcbfb85539a8fea7e25aa5d722567776c8c9d1c459327b099025c WHIRLPOOL 4f3127ff0982ecaecc0562c11e167d3f6cd1768158bb5a4faf3411a1f87b05dd088197bf2e733773f6e4d2db88aa6c832230f7eab8033d4aabbaebe2789625c2
 AUX 4.6/shorewall6-lite.confd 160 SHA256 6aaa091f85ca7626023883b7e4fc7ffb644e427581d9aaf9307958fafbfdca88 SHA512 90a54824162c31276b791cfaed93f871d78af880f75184355fed3c597aae981e7a05d4725d127419892d849685bf11b26d3c71282b8ae0e0072a32b7d1309c91 WHIRLPOOL 02e1af5589ad1cd72cd9f6eb9858e590ab0451af7459118fbf830ac8ee47989c814d87e319f68cb7e5113a9a7792b7faed433ddec0e8b30b2dff28b8cb2ca45b
 AUX 4.6/shorewall6-lite.initd 2231 SHA256 033290131e99899a1e9c8a83986c47d6c04dc179c83ce005e0f6494f8e45e5ae SHA512 5a77d82764e00d9cbce5240323403e4f8c1daa54d6ff3f227a3d18ef88df805cc0a293f107e75e5ec26347bd87a4ff50b9b43dbdecaf7827bef4a8c49e8c8434 WHIRLPOOL e96144f5c2217c9e9851248d9ef38ac77bfe0669590f5aa521f6b62a9f838c6b48eb4a563204def7858afc2685dc9f9a3da2d59ab84f7641c1637a741a5b5065
 AUX 4.6/shorewall6-lite.systemd 558 SHA256 8c1ed2c5f6cf3bead3d446c4ec4adb8885a8cfee82d393d4bae77cc95042873e SHA512 50ee8d7f4ea26ff8f2d7b24a2361c76e397af36fe7a68e09d920d8cd7c6e69bd250779d7db2913ab0fa97e7cb8dcd590ee374922144d1da591d5ce6731048e61 WHIRLPOOL 7920915495572073edf9c5be4b60c743159790c61080075ca7ef0b70d39d0037546ad84b34f06ee79bcef5eb55946c7e300c47a5a5399897641b14701139b571
+AUX 4.6/shorewall6-lite.systemd-r1 612 SHA256 d069144d38662ce0aba71fc89202dde6aae19d8576e4cce971bf33bfed597287 SHA512 89db8fa3a2c896ce8b33a46d66e722dcdb14830f1a2dc21ca1c6797da1bc2125a502997ec3392e554aae1b86c1d5ba0283630228b38311892150ad0462cd3cd9 WHIRLPOOL 29db5f5bf05379b701b3e86e9fafc8ddfd97be8d98a9b6059282495347e78692fb08d9cfc7d8de82c0c25799396e20da300070d107144b007fc87d49b6370dfb
 AUX 4.6/shorewall6.confd 164 SHA256 647eb46f02a9be03a662223e09331313b9a3bcacbbccc34ba6779da0f7a3d381 SHA512 ba52458e30bc9b1aa352f8f6de46762e646e225c2624dc6de3961cfa21a8023cdbf3598308dce343badaad626710fad0481fb670b6a9749642774d550b6dd931 WHIRLPOOL 1bb6f6ab368a24260f08eb10ba396db8499ee22a9ed53fc23ac7d5ee37c8d5543016604d09c6b42d23bc66b954acb5cf64c601dd579f32f0f4e63498e358c750
 AUX 4.6/shorewall6.initd 2933 SHA256 a00f1c58194a29e77736767039f6aff24f4810de4ff18350c7f8f64c37d102a7 SHA512 d2bb5e3511b4644904a765e79de461043bc44a69cfd418e67b60930e495aa83fe284f16ea12e51a78600b2091446593f59bd198d1efe068cd8e16be78b51127c WHIRLPOOL 40c48ca2f12b5d0c0f30b60f36219c46f3638af1c4bff8b4d361cb4d06100d9df9869d1042270bc51d93eefd6587289b630c785d0eb4083ebaf4df6074639bf8
 AUX 4.6/shorewall6.systemd 523 SHA256 c1c3dd021f389f73d04c6e321da1b2a2df7a6a482e605b05b42c55db3e630a61 SHA512 a528b25be6e09c9131a8c0bfa0eae7501d0d6450a020eefc84106fbf598cf0bc9d8d55da3e3a7b7135671027913d5b55673df13e166a348601295bf17c7d7e0d WHIRLPOOL b7f167f83e1bac411f28cedf85e39817210b631cfaf5e1b619de0798ff215926c1a2181c8bb44c67b5ee346ebaa201da63b67b2e0c797a8b6c7b8b1ca4bd7255
+AUX 4.6/shorewall6.systemd-r1 577 SHA256 6dca4751e3a7a40c05ff0e63062002d257ab586bd9372a05191a806e2f70bfd8 SHA512 1f821a7e9227ae057ebdeb723ef652ade982ec9f2a2bd20b2563772d4acbf2092987fac03b7197806f8a9eba4272260ba7d65df76d0bc21ee2b222031141af52 WHIRLPOOL 21c65cf041038b1e72c7e4507f108b164a00c34c6eb8368aed97b138cffdc411256682a437abe91f53f03300bb1f172a01204afa0762e727c499e49a2fb702a1
 AUX 4.6/shorewallrc 1982 SHA256 fa61ac3b561aeed2bd220fea105a0f1e7b090dd52c9def61ea62555e5cbd986a SHA512 5401cf461426d611802b210ab274756faf0b9a05998080ff40b6ffd8767aa30680bc147cdff0c867e8b3bd40f740e5934a8a201816db276d31310d29cf88fece WHIRLPOOL e13bb1a32680fc626a73971b6bfa4af73450f02bebaf72c0eb1458873383bfcd0155af6a4d1722724e88998bc2027fa542a7a5b0fc1484127aebd08e6ef3a3c4
 DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
 DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
-DIST shorewall-4.6.5.3.tar.bz2 480922 SHA256 ed621d9c6a7a3ec58876cedc6f0a5f0ee425cb9107011af34f50b4490873705c SHA512 7d8bb202c205b6882517fb8d177387eb441a593bc5bae112b85823012e1c26a08a9ced0ae7c64a58c6dec93abfcbae0d043d76ddb86dd146fdf1ae74b4edc49b WHIRLPOOL 0436110b574b924d427186103bcac68d50106f1d9b4cdd5a28027b89cf62fa440c9a8de06666b9dd7464b6da9766efde6e6a42707c7ed0ba7c25b5ca18877418
-DIST shorewall-4.6.6.1.tar.bz2 485418 SHA256 ad199bba7397e19380eb44d46bc597c5d904af624ae2c5127d160f2f1ad7ffa8 SHA512 1c48f613e04d36b9a73c4a65c9ee1edff7eb99739a2e646868c5a1804e2b040bb05b2fd13abb021f8b7a6e3ca4bbe7990b10333a9357f1f2a467f568800d3795 WHIRLPOOL b81231c74e8f15de7cac2f5ac1a421426df6adfb518165a521eb382d125dd7e6fa79d8297a1b61067d2ebabc0002ad93cf1f10713d7f19fe9fd7a8aaa84820e7
 DIST shorewall-4.6.6.2.tar.bz2 485880 SHA256 db41744e6303e031e29be531dbedd4191624c4a70f9e23fa0b450e26953708f4 SHA512 9b37430a51b84e16d6fec3bbe0581ff18d1f8f15defd4d73ac6a13cd68eebe063da129a9b422079a433f5d4b3bcd7c0800d844cb05bf0ef0c41aa36fe57915f2 WHIRLPOOL 09c90c5871c546d8e396bca32e1a2b8b1a7041653330b74930c415bfe2b94ff24ac4c34f38644c6b539495a277410c59c3816f396f86060754bd4247fb622194
-DIST shorewall-core-4.6.5.3.tar.bz2 51885 SHA256 820b8c5791f418312a2c62fbdacae0de86a3460358763b84ebccf142a68f9722 SHA512 cdef020e3e4ff1204854fd0f3e004f0d1d1cabab42644f5c7620dc8d4676f2ef5bd04c87bcdad120299640b63effd8e4a2b7ce116cd202907620f0806c2a8362 WHIRLPOOL 0b8c94588ae8a3c0c361d34ceab1af57fc68bf74515d2d260f17ae86c8f52075585eb897153d803a1f76fcff2d51e51afb42d02e83ff1e8d1cc79b3b0e52c98d
-DIST shorewall-core-4.6.6.1.tar.bz2 53900 SHA256 20ca8ee26d2d307e658a3a89b16d6eeb7d51a1ab6a4d30b2e4e880e7d96ed247 SHA512 e42f89af10f5323a95dd5acec2e4f21f01d215faa424b72c91a816c1efa1f852c5fb0b6457e0efde14e62a391b86d672f47a87ae80e47adb8dbae530bea3e56d WHIRLPOOL 930c7175f199934cb3a86023be541db6ab205f5d77e257e1827b365a864e463568c7dad905989c15a20a1be2937b49c068e6261511808fbfba0fa0cd91b2ec9d
+DIST shorewall-4.6.8.1.tar.bz2 488249 SHA256 30d87605ea40143137ef41a21fc63613bddebad5de5bab23c42da41cc6c6f40d SHA512 dab2468d919b33bbd2308300118cb257763a15507434b5835b2e7b98a66f05c35079b2c0fb9e10dd0c620e66358354eee6adf352ae024ce37ccd833e134d10fb WHIRLPOOL d101ed1f27b6e1ebfb4aa28eaf89c59fbe3c06cc96861c1ba0e743965e6b1f817c2812679ecb74998ae61f7184e06aae2f44e3014c59c9b4819ad935f6c89d06
 DIST shorewall-core-4.6.6.2.tar.bz2 54127 SHA256 764c8c22f619cdfd61eebd77e9f271a168515d44c4578b85af44921cc1f3b675 SHA512 bab5a8f1bb17a5273a5eadb734ad378a8b617b9a8be47a2a825f941d20c5161c88ce87dae285ebbbdbb21fe18c2e8cc5eff9b1097daef2d8def37c2eced05d6a WHIRLPOOL 8fd70565cfe0c6abc946cb41fc5cb1eca9ccc613fb4898f07b92f878fedd6293bc40e0aaf7c4af11f3e67ba47b341f471d69700e3edc0cc9426b4aad3bf38fb3
+DIST shorewall-core-4.6.8.1.tar.bz2 56071 SHA256 9c7fcd4c3cf11ca9aa1f430e05acc4fed40946cbb34b204d6257ca83802d945c SHA512 7539fcabce57ecfa7d354220801705b6ab5d55e8d499c93f2c69bcc882039b7e98f25a6abacbfcd672c61dcf9791ad05b26cc8d4f7e4ee1ebc9e38287a2af46e WHIRLPOOL 1fa3d7236c0f3a1e2d1273ab691d4ff7c48eb1581a691d193c43007bd18e9cd6904582581486177324f8857d2ea6a26a029ad4eccd241b8c4f45e59470e007e9
 DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
 DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
-DIST shorewall-docs-html-4.6.5.3.tar.bz2 4177886 SHA256 10cca88239cba2a435975fed0e308f6238d0bde574b08aa88023cf50a4fc4370 SHA512 77c67b05815d590beb2e756984b6df4cebbb5da186cb6a25585080c35c1ceed3714e41eccfb0c0353298b674a86af18989ed5a2cf699de277b4a71ad4e80b9dd WHIRLPOOL 99574e66c4be0e9c51cd1fe036dc2866a3bed95e214a36298db934fe3d67275080d8c18942b47fef436fe249b28982ef95fed2312d412e654bcca1947261796a
-DIST shorewall-docs-html-4.6.6.1.tar.bz2 4179739 SHA256 170467b8b16ed34f5766ee171d4967f9bd7e69988399037dbcdb8ed2067a4608 SHA512 36f5f37aba785a4c1e281224f7befc9ceb8816014d204a98f4eb648d6d8f777f327694d8aa20f08eab0423c553e17b4ca6837c1a94028e3446313dda5caa98f8 WHIRLPOOL c0e3721a0b58425e155e9904d9ce66a87c727ec8c1fbca5ed5d98c9a7de61c0bb1aaae58c6bcd22b40e56e277f28f69bdfd9d5f4b2aa092ac41c0036c393ed64
 DIST shorewall-docs-html-4.6.6.2.tar.bz2 4178931 SHA256 89c6b3baba42bd3a4d7f67ccfbae395fec4054412bf636ff60a889dc2f5edc57 SHA512 63686a59eb6fe6330b036800dc99758bdfaecc1e67cf95c4dd3cc014db2e96a17a76d8cf92d1f44582990b34b53d062327c850187bc0a83e4d2369ac7e03d032 WHIRLPOOL 31eacfe0c6ea3dac32c24de0c5d01214f3ce4e2b95306e3d6e4165a636a7f6f225fedc741d19fa995c148a2758ec08439da0d5e1cd654483e2e5be4f21a5dfda
-DIST shorewall-init-4.6.5.3.tar.bz2 32430 SHA256 d687430a93331605a9ea1b3277dc3ac80f12b298127b6ba130f5ecb0bcbb6fe4 SHA512 8464fc90eba4a9b8d1f617df93785b3f3575edf012d06f4588f81c1c98052add44ff2cd8a3a7d0fcac30c874f578c79d64e2afe67520f998c16e786e8188b47d WHIRLPOOL 8c712c58832642b8079ea1c4e0a00e062720b29771cf4bb786efd80d03f22e96aaba76829222247cda7339076ea457ef95f16aabd2b05779f9c39aba57a38978
-DIST shorewall-init-4.6.6.1.tar.bz2 34261 SHA256 c3e723bacaa9ca35d1c9d0507ab4434275251b6a0f2d99528d62b7972667a0b1 SHA512 6d775bcea8424084ae8975261229b2138a9d68723bb65c64169c5b1ffc34467335e46760e3272f59f2f195559f56c436ad8ddf1643f1b4d03dc3b7b5c94815b4 WHIRLPOOL 2d76346d08b63a29841c57ee2beea565bfdfa717e09b7a08d8abc3ec96d249337a143725b4afc2c3df54dc1532f5b70026b3fb1a924d4c2956a75bf6cb9b2f94
+DIST shorewall-docs-html-4.6.8.1.tar.bz2 4182011 SHA256 4829208197a5a3b657461c961ba3aaee4f83aac2c6316b171d1aa64b5c29b245 SHA512 be1ccc5ee9bdda9ff19772203460285ead63eb6fb40cc18c44b977c0012e956c5794a7ba7be8ca1d0d209148bba9aeec8b394265885ab121bb9f892f3bdae264 WHIRLPOOL de505fafa4e112dce485c3a1aa038a69803f123f401cd54e86ea27d304069743ad3ae00009dc48a4ee44299861203ab2c78f12553e934795976005a5c3f34279
 DIST shorewall-init-4.6.6.2.tar.bz2 34467 SHA256 361374cd8f52cec0f807e07a7a100da4627595c7c80c2d75d050ccee1a342e67 SHA512 760eb593c53e89622c6efafe8a46f43956aa606853f26c9a5402ca43eabbf1243a2dd3c2d64cc4a1e70da54bd0fb86de31c0f5dc14aefd0540b37745c243fb48 WHIRLPOOL 64953fab35a4a95ece8757b786a301caefbb47bd70821b61c48bfbbb445ebb3f434ca87ac5808bdf691a5469d2e2e3dd47b8857f272267790282ad8bbeb8b3b9
-DIST shorewall-lite-4.6.5.3.tar.bz2 46382 SHA256 88fa715cfca400cde5e54841b216f1b1866aaa8d7dbd5bfba46d2281c246a607 SHA512 934448de93da853a5c59cb62b691cd81937df6c8ac1d0ea002735743cf60bc05312f7bf18e25de2a82604b526d0e588b69172e2c8e7496a9ec2243cc365d0bd0 WHIRLPOOL 3a2a9898296ca5c785f1def48d00e2234d8b54b96e8bbafb890f84c118b45b5de151cb3d97f2c69a3fcca83144424c7706e3f2e6da6a16312cd7faa89904ff1b
-DIST shorewall-lite-4.6.6.1.tar.bz2 48299 SHA256 cbbc588d86c6b5414e04cc41db0ec5c5ecebaedf2c9d085d02d5c36cac830dc7 SHA512 928196edbf59e73ac699233e83fdd1ab8256458e2ba280366760bdca5b5602db4db2ae302700720ec5b28435d0ce22d0bdf8453c362e94a808c44d5a6492ba50 WHIRLPOOL e75574ef493220e3f37176fd9cc475900364b2231cc5836273829271784057a5c48f6daba03b4c04e66424b37efea011226ddad23b4ebd86643b9bd4cfa1e321
+DIST shorewall-init-4.6.8.1.tar.bz2 35787 SHA256 4fcc25b69a9b3b6879eae843b6ac4fafb46512028f5c51e4af5535600c6e00c1 SHA512 25ed53e21f33ecc2dd96013c13970d6d762dbf3f52dc5e7bd997960edd465f99b8919bcf1386e44e24eeb632560f65e36fc7f5abf9998e60254fb05d77b58186 WHIRLPOOL e7373e560556f9a7befa3ac63eb1efbd7419323509ac470ca96c6544a5960096f1d3a677fd6cb6f5619df4d8caad6ea25b5115f73c56b8dc33e145d4b561468b
 DIST shorewall-lite-4.6.6.2.tar.bz2 48495 SHA256 6bd25fa1066da5272fa9bcc7a8a6041462eda682895cd000afce354bf42d9ebe SHA512 3c073b7531448c2d704bbdd0a7ad0287948d8969c371954f05a3cc276e6fcaaca907c554f4549c26aff2256d393fcc53221e7a1f93ac058cf519dc55c822104d WHIRLPOOL 1743c799022ab2a5ed1d86155f917120b44963c064d75b4168ea48b4e0b19970ccd1d944eb22eef0ea96f0abf396d60420508bda3f2cc30a33207c2edd12b27d
-DIST shorewall6-4.6.5.3.tar.bz2 222096 SHA256 273e1748e8ce3ac559d5f73d43f226f19fedf03895cf8f87b03ec63d17b42b6a SHA512 8c1d8b8559693d7cd764a63a1ec52fffa9ae7899bee915b4c25abff0647c2daf6887b0fa88c05291980feaba54e14268346629186e2176cd378b1116e8b7125f WHIRLPOOL d5fc4bcac9525b34a01105649d9c6ace306e621e0222531f457a809ffc896fb9b3988d89aebe2f5c77cbece32de69650f5a5968457db856e67816f988e5fa34c
-DIST shorewall6-4.6.6.1.tar.bz2 225573 SHA256 4313a1f33ea63d8c60c3707a75ea7b569338546699f8abcf8115922b86f47a02 SHA512 78d8b65763f2975cca9c6818bc2403334d7f744e5d7f28366183ea29047db12f343e5f33af80ef8f341c827438b46ef25720801a8c52a4a70cc304752c9fcb8e WHIRLPOOL 440f8ffdf93b8b3fb19b1645c963a50432b9b2bd83b767c36d5a182471f5855a582caea64f5b058b436d4cecdf321d604999b1549f8f8d900135139d1dd37f65
+DIST shorewall-lite-4.6.8.1.tar.bz2 50795 SHA256 ccf0d92cf68d450823311a25a4733481c6520cce9012965e2397b986e08cb9ac SHA512 092b20b84b3065ae3b4beda4a8af423d927baa26dd946afc561d97a9946dce72550053bfb9c63314ee2a58574b9f495f8c74b774613eafb62f7a84bf740000ba WHIRLPOOL 66e75c59f3ec960e21d8d4f41237dfcb3454d3abe67b9c97ec7901488e7a5103b30325a9ae2e89d8fc9ae9d7f820e136dd6d7b23f4a4f1206be1d7eec20514af
 DIST shorewall6-4.6.6.2.tar.bz2 225643 SHA256 b475473eaf9d4a8b4067214f8fa14f1c1d97cdb77c180abd9e22dfdea6b9f637 SHA512 a448e6367459fe06ff2869e45d06a3ff31ce5c7a6766920ad8367e251f8380ccf9cc62333d011f79baa7d3d97efb42fcadf1c6aecce124f2a3b94c15d3454db9 WHIRLPOOL 7f1fc2288983cb779872098362d98c7820164207dcbbcdf63d0fbec4b8fb2190724fde10f071f51ad51ba3f8f10282ecba5ba4f4b976ffa816da39935c336c54
-DIST shorewall6-lite-4.6.5.3.tar.bz2 45799 SHA256 ef459aa87a8a844cb971dc947235cda84bda238dc8744de7429862991d9fcaaa SHA512 3d535546586234be2ed717eb936dbc86247705e342181820a14a4b8458e05c19972e07a1185a00bb1c5025ed36f77f64c6a31f83d88a7b6e2b6b847752501225 WHIRLPOOL be8432303d888f369b86efec41dc0891768acde7f3a2c919e19e4515cbcdfc82ffb7908d30a6c65956bcd29f8f6123439a8ac9b49c9d8027790ddeadb8195760
-DIST shorewall6-lite-4.6.6.1.tar.bz2 47753 SHA256 3fee19fe538c8d0bb631f9336d917d61bbccdd9399d4f0ebdab8c381e5e091db SHA512 14bf67a844cece87d73f4b0c6793f3d0c85aa6681443a7ef8779afa38f8b00e1bc6009378af13f9f5369a0e82377457149c529743c64b763b014f805951a5d04 WHIRLPOOL 93596a43aa7e97fd27fda503cb39fa5aa249b33fae297b5ab3068b9be433737e8d8f3418f244c4d89d1dd69dead1bf5e9b5a1fbdee95c45dffc7bcbfe49f75c9
+DIST shorewall6-4.6.8.1.tar.bz2 227289 SHA256 29da1b7597958193933ef3341dfe03a4b935d248b498f5eaa6484120d3a1351c SHA512 93011f86afa46e5c7b9a88d9bb6e7adde766d652fada26752c3c950f2424e1ae662e7e6865f95b2c87b9170afd6941af6b719e1f281c209560fac256a23a3f21 WHIRLPOOL 33da2969ea38babb95bb9e6367621090f1c5031bdc436621e0820462c44db61f3e0482c0191bf7761e2c9f60be9d290d869aacc959f52128809bb353249344a2
 DIST shorewall6-lite-4.6.6.2.tar.bz2 47909 SHA256 a7a6de15ea84a0486c9ed92492fcd6f731f2c4ce71f06ce3c59f3abf3780ae86 SHA512 0d5b0fc3d166cfdd58978e1d6b36e2ac19a0d10b5b59bbf2fa62e79040e636d72256b120df14a7d8111dc39d24ac218758feb07c5fb2119aa61e51f78c567597 WHIRLPOOL c02c11ca0f578022daf96b2c594a7f62d042cf875c7c35682eaa2b312416446239c21c9af31f965536761a081015d73ae49b553c7cc08850955378d1cfb76af7
+DIST shorewall6-lite-4.6.8.1.tar.bz2 50217 SHA256 afe592ea7254d8bbc0b9e812869b402b6836b47e92cbbf959fbe29b0ec240213 SHA512 ea4891e23a8d805c7bc35ccb0e29738592461bb13377ba8c4a30986c46adb1197ce11a26934d0fe82774e3b7829c42d1656bfa34d618044d9aaaf7471925d403 WHIRLPOOL b11db2701693d2e9ecb11e24bba6639a71e73f3b6d0c8958066314fdb708f93b83bc1b40c63f7316815de53cace14fbb0c8655bb8b11c8b2146ceb41e810012d
 EBUILD shorewall-4.5.21.10-r1.ebuild 3372 SHA256 de0ffb2098c9fe21a7a37ed6f0653062518c86c9b7d6f9b01516d8eddfe6c451 SHA512 2405be21c36f0f55d446933e3b0d8aaceffafbaab36c7bb6f45020454032c00081b1ddd523880f9c1b501fd9577e5de2c8a1b9a7adb0b9bdc769513a7755ae6d WHIRLPOOL d13644db7f315b958271dc7f443377a5fbb7a56e0feae1bde98db670931c7fe9aa150d6e14c0b6c9136246febfd24e616864bd80470c46ab915c4a1ebc3540d5
 EBUILD shorewall-4.5.21.9.ebuild 3285 SHA256 9d6e1cc9a7a22de912d5c9146d3fc119c8978c04036a1e98cbbde31fd5f78b45 SHA512 df887615e704c0c181fa2bc10f01e07d9a3f12b68193643c0cb9facd6a8df73b3801e1db3cc9ad561a4e769b5f9656e7ac908f87c5ac4e0a00471b6048518abe WHIRLPOOL 2e100845a3a83d0476f381cba4173e7fbc5e771eb6c5c1d21a3357c4ca0d41ef980cba77cda0b5b5daf903a75679ee560e709aee776127262f7d22dcb5827d3d
-EBUILD shorewall-4.6.5.3.ebuild 16080 SHA256 66566cbdbb3baf3e4a0d927d487b5e5030068bfd8c06a41db02736bba702b306 SHA512 86a11bc51299e4deb65e1ff764e50df75bd98243481af38fea5ade66d1bfb7220a12a45fe8bf01a0635474057014c06b581a219413d7b27424ce642fb3a235b5 WHIRLPOOL 274b506aee970c43bdf3f4de257651e3416b5c48bb48ee8a38e597845bb7dd41fd6eed3ba2afc34e408fb714353dd0cc8469a71329a1c13990eb3a9aa41da1fc
-EBUILD shorewall-4.6.6.1.ebuild 16248 SHA256 33446bfffada03982ea04af8d7b7fbd37e9bb1589ec93e0b4876ec40e18338a5 SHA512 47f89b87a63fe4ea854b4ace1b7f41f83008272a3032df5f8311273b58bedad393d1360f32ab0711a75d888b51ef0c6ddbde6fcbd2127c9f12a2a51458d53dea WHIRLPOOL f98464c97e2ba6ad4023250573660e04cc271178864240f45798d804ad7cb8f98d2d0d38222496aa7db43be721b35589608a2a18d9c65f8068684835d83d5dab
 EBUILD shorewall-4.6.6.2.ebuild 16244 SHA256 a165cd561ac50f91b38b8f7f13ccac8804652ef7cbc2d1ac62fcbc9c609d004f SHA512 5bbf3b5591bf0112434b7332cce43b98e77337da38f91afeb4879c9e771bfccc5d684eef748769530dd8ad67312af395e5b715fd98504445d3ad06b39631e906 WHIRLPOOL b1479823d009f9d4897fd434ac08829658fe54c3a742c336ba86f51e58c98ce475213312fbd830ba38132cfb87cce2975c5bc0ca76c66407a8846bd227ad5874
-MISC ChangeLog 43224 SHA256 64e2d0edbbde2189c46ec680bbaed656b962750fd89e32e7e4f4dde963758da8 SHA512 0d86faee7b89db00ea97382a835eec9f46a724635a2538f69396b1d2e9ad48ac909b046ae28e8bb02f6ce2b78d724b74dab40667d6fdb2531de77d93c258f972 WHIRLPOOL 3e0459689e4e48b2e86649b7a4120a260cbe65e0002e65acddfdc4357c6017585c91de92bb5252301f9410c512aa9b11c725b79263b327ecde7455e1f4a5a2a0
+EBUILD shorewall-4.6.8.1.ebuild 16269 SHA256 667a7c776de2f2ed89243b133ac47fdb9d956fb178adb25cb528f36eedfcef9b SHA512 7e8e37a743ba89dd7a0764550b8d1c13b6521d0099b85c9333eee17b610b0f2b825743b72802da5645ef3e9767b0a78cf7608bf1d1c5b671eb958d2094f7cbe3 WHIRLPOOL be3ba32102ada13f589700e62ad2415d12ce631defc9bac4ecfeb146ef400e2d8ec4291b73c09c69d68fa687451c87498e158dc537fd2ee72802f245f1c686ca
+MISC ChangeLog 43686 SHA256 b4144bb03fae5969a69bd88937b52909f2ba640017071bef4cb623e9a7e7d44a SHA512 bdd747232239696c2d7b970830d238caef466d35fa56e39b4ed225a2f3225577530a3af05bbed41d72acda2a9230acd75030da8804f0621bd433220276fc74ea WHIRLPOOL 118fd30e261ebc162955f979fb9b9e8c31b4975aa7c02207323beb4e3125e212d03930bf971acb03353e84eafb4af70c4e09b49bc02e602c7839676ec8a5388e
 MISC metadata.xml 977 SHA256 9d7f6c5409d58e7e897f591a207ae66d26ad601176aad0708a1a21b268e8946f SHA512 4d6cb7e6aa1c1f0b372dbe2eceff76eb44e8d702b780484d41e712c4a34d3cf88d40ddb0868faeb7c26be2ae3f14db7303b18a5a9882fb2254a2f79ba332c979 WHIRLPOOL ec45a44bf7b1f7de9f28bc273e7208ee9125c9d2642a95fc04e83132b097526756435b7d168f847936c1244cc9c246df56d526794d5f2ad1c60534d852ed77d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVK3yzAAoJELp701BxlEWfG8kP/j5DO2ngFkcz82b0WZxVKB1/
-f6IwjyEjfGY9+9nEFpO5Gsy2Q2ArSA/ZIrt25rTkEBGNzsJy8d2SMhgVz0UYyAsV
-VHen604Pb99hNBnaFLyxA3fdz5xD/hMhmevuimlDA5Zle+kvJ1j/SQa7slNPY6Qj
-77iURNAIqWUuXg274RjboICc+ThwhdvpKRJ8MdUc60ApfsC2d3ayJJhWvFV+jo50
-TuSXUeju6KfWhRFf1elEGx6Sa08ZHVpBmlJG02RuWnLR9ddmRfJvaIR8G9Ls0Hs5
-MfgH338RkB8Q1rUyhnx91l6gR9Ea0jZ2MlHPiN7FmJZFk11tu2tOLXdxbfQgVqxY
-Al51v0PgaKa5d62XPnIDxTv97Z25jdNVLZz1NgTO5eT8BDSZiWJjWnM8jex9stV4
-SwKkxnnSlTdHZxrnsPdNLkrVHItzU1wkdqata/Xanb4EnrGGoSHcS76LhHK/lvXx
-zKMNaWyL0Sdyyt25OqJcsSoLV55D7KEY6nafY9+8ptOBLHMFVn6/1G5oAIoE8GsY
-HSE/ZGa2mnygiE2nAVGZRk066BKiXfGlLe3f+MYW2dqP/UaEALKjzDfOhJ4YRrCD
-BebWFZCfP8WuMACyTG/awOvghl8hpnGKcROZAyBPFZ8j9mzko1iHmUI+jWWqKv62
-Dabf46QpSTtGk+E+J06T
-=3Wks
+iQJ8BAEBCABmBQJVN7FJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5HMQANdOCnixTzVJtfhN3qnQrrtd
+/5NDJi7Aog1te+mSJXnQtESd4Ow7WxbzjEM7XpJrPF1qowodx6vwxYzI7wA4mAj5
+Xd0mDCg1xg7aqozM3svKl8mO9azZs775XGaO8ydzsQATYpQVDQjWornuhgvm94du
+0o9OyMZ4zi7pX5zuiXnK1zv+IMLo8NjTW6t1gkdOrJojgjpDSuPINaMFoy+M3Tk6
+sV4qJH4UA1VmbSoUVnOQq/Wn/kDJ0oJVAcY4uZB1RDKHm8OSaUTfjmiVB7nW+64t
+XOOpdMOmkHe0LGgzCKBAh1V7HxxROZD+B0hLU8KJrSkHh20t1s+CF9p32IAeZODU
+XUJ8eTJ9aoFq+Z8B/3mWkJkPuEc2/IYMAJMSzJj3oixKgOfJBgqrV29/nYE1YYAL
+QLjsvv2xsscGtxYtu3MWA+WrmbR9jiqegbI62TtUrpaAUn6Epquy4v9SB9+G7CV2
+w6IOrAUKk9aFLzPqm34QpL6xU10HZ7fTF5ArCBKwptiitraCeDXyJQFG1UUTjR0E
+sMGpK/DgM0uV6hvipx2brotyzCm+EaA8IDrGVgNn5EiYFjxmmAwUkAkpGtoVz2UX
+iXgp3/RIgAJMlYMIwOtlvv3869PAP01pw1yVWnxmLGt5jDPaq7l6LfL9ydFBuFt8
+OsNVbexmipW81zaJibTK
+=knje
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.6/shorewall-init.systemd-r1 b/net-firewall/shorewall/files/4.6/shorewall-init.systemd-r1
new file mode 100644
index 000000000000..542e2c26223b
--- /dev/null
+++ b/net-firewall/shorewall/files/4.6/shorewall-init.systemd-r1
@@ -0,0 +1,19 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.6
+#
+[Unit]
+Description=shorewall-init
+Documentation=http://www.shorewall.net/Shorewall-init.html
+Before=network-pre.target
+Wants=network-pre.target
+Conflicts=iptables.service ip6tables.service firewalld.service iptables-restore.service ip6tables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+StandardOutput=syslog
+ExecStart=/sbin/shorewall-init start
+ExecStop=/sbin/shorewall-init stop
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall-lite.systemd-r1 b/net-firewall/shorewall/files/4.6/shorewall-lite.systemd-r1
new file mode 100644
index 000000000000..b24fca8e33a3
--- /dev/null
+++ b/net-firewall/shorewall/files/4.6/shorewall-lite.systemd-r1
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.6
+#
+[Unit]
+Description=Shorewall IPv4 firewall lite
+Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=iptables.service firewalld.service iptables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall.systemd-r1 b/net-firewall/shorewall/files/4.6/shorewall.systemd-r1
new file mode 100644
index 000000000000..209d3f78ee33
--- /dev/null
+++ b/net-firewall/shorewall/files/4.6/shorewall.systemd-r1
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.6
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=iptables.service firewalld.service iptables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall
+StandardOutput=syslog
+ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd-r1 b/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd-r1
new file mode 100644
index 000000000000..eda311d1b9c4
--- /dev/null
+++ b/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd-r1
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.6
+#
+[Unit]
+Description=Shorewall IPv6 firewall lite
+Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=ip6tables.service firewalld.service ip6tables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall6-lite
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewall6.systemd-r1 b/net-firewall/shorewall/files/4.6/shorewall6.systemd-r1
new file mode 100644
index 000000000000..64fd43585cf6
--- /dev/null
+++ b/net-firewall/shorewall/files/4.6/shorewall6.systemd-r1
@@ -0,0 +1,20 @@
+#
+#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.6
+#
+[Unit]
+Description=Shorewall IPv6 firewall
+Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
+Wants=network-online.target
+After=network-online.target
+Conflicts=ip6tables.service firewalld.service ip6tables-restore.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall6
+StandardOutput=syslog
+ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/shorewall/shorewall-4.6.5.3.ebuild b/net-firewall/shorewall/shorewall-4.6.5.3.ebuild
deleted file mode 100644
index 3de3f33e0f0e..000000000000
--- a/net-firewall/shorewall/shorewall-4.6.5.3.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.5.3.ebuild,v 1.1 2015/01/04 09:49:46 jlec Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6"
-
-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
-	KEYWORDS=""
-	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
-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 )
-	!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
-}
-
-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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/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}
-		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality.patch
-		cd "${S}"
-	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
-
-	epatch_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} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	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} ..."
-		dohtml -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
-
-	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; 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/upgrade_issues.htm#idp8704902640"
-
-		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 "But if you are not familiar with the \"shorewall[6] update\" command,"
-			elog "please read the shorewall[6] man page first."
-		fi
-	fi
-
-	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
-}
diff --git a/net-firewall/shorewall/shorewall-4.6.6.1.ebuild b/net-firewall/shorewall/shorewall-4.6.8.1.ebuild
index 948f66efcc48..65d7a31a1f36 100644
--- a/net-firewall/shorewall/shorewall-4.6.6.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.6.1.ebuild,v 1.5 2015/02/07 22:59:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.8.1.ebuild,v 1.1 2015/04/22 14:33:43 mgorny Exp $
 
 EAPI="5"
 
@@ -68,7 +68,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="
@@ -173,7 +173,7 @@ src_prepare() {
 		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd-r1 "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
 		eend 0
 	fi
 
@@ -184,7 +184,7 @@ src_prepare() {
 		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd-r1 "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
 		eend 0
 	fi
 
@@ -195,7 +195,7 @@ src_prepare() {
 		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd-r1 "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
 		eend 0
 	fi
 
@@ -206,7 +206,7 @@ src_prepare() {
 		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd-r1 "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
 		eend 0
 	fi
 
@@ -217,7 +217,7 @@ src_prepare() {
 		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd-r1 "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
 		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
 		eend 0