net-firewall/shorewall: Version Bump, #534232, Thanks Thomas D. for the patch; fixes bugs, #530704, #534062

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

16 files changed, 96 insertions, 98 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 198ee0eb09c9..542b6c3158ae 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-firewall/shorewall
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.268 2014/11/18 13:00:28 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.269 2015/01/04 09:49:46 jlec Exp $
+
+*shorewall-4.6.5.3 (04 Jan 2015)
+
+  04 Jan 2015; Justin Lecher <jlec@gentoo.org> -shorewall-4.6.5.2.ebuild,
+  +shorewall-4.6.5.3.ebuild, files/4.6/shorewall.initd,
+  files/4.6/shorewall.systemd, files/4.6/shorewall-init.initd,
+  files/4.6/shorewall-init.systemd, files/4.6/shorewall-lite.initd,
+  files/4.6/shorewall-lite.systemd, files/4.6/shorewall6-lite.initd,
+  files/4.6/shorewall6-lite.systemd, files/4.6/shorewall6.initd,
+  files/4.6/shorewall6.systemd, files/4.6/shorewallrc,
+  -files/4.6/shorewallrc-r1, metadata.xml:
+  Version Bump, #534232, Thanks Thomas D. for the patch; fixes bugs, #530704,
+  #534062
 
   18 Nov 2014; Michael Weber <xmw@gentoo.org>
   -files/4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch,
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 262d88f42eb2..b95e66927de9 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 4.5.21.10-r1/shorewall-10-fix-ipset-support-detection.patch 1383 SHA256 bb953a88c112c3f3d1371dfe1b7bcf54ac0d4ba520efa141ac4fc75867f7cf96 SHA512 e445b781ad491e0cb1da24b911fc0711e59a299179986565a6583243f65e89356f2fbb4e320ae3772753b15dcbf02849b5f42c16d82e7c15bed1811014787d07 WHIRLPOOL 7489cb776406399f2d36f574b0702475381162dc32ba9b5740d37ee798792e12d6b0974c36e395b6426dd3fb43543d34018ec1d0ba2c647ceb1310bb33c9d733
 AUX 4.5.21.10-r1/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
@@ -12,45 +12,54 @@ AUX 4.5.21.9/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3ab
 AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.6/shorewall-init-01_remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
 AUX 4.6/shorewall-init.confd 152 SHA256 990ae5e4498ddf071de317f7746fb3eadca77fab37631d814f2f56d588ff2937 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b WHIRLPOOL d24e38eb1ab20799a515543f586dfc95854d2eeb5dff10cc8ddd1fb7878cc854c9115dde8bdf9387e349cdb75381c8ce03972d05bae858c8ae04efa75ece0299
-AUX 4.6/shorewall-init.initd 4482 SHA256 f048cd1b19f8da92e7ca21a5d65196d3cf1ef0bcf5cd627e42d44e1e48097306 SHA512 456f01fa9a2ba5448a5c4a21bcbac499103bb9e2643325f153d8f464b98c1d1f32bff2d80a1ec28a52c08a8b923d922aabc24626d2a1d537d3cd07cd277d307d WHIRLPOOL d1d945991fc8196e91bdf2c53d68c663a0ae8f8c9b1a65a30c838cbcdbf45416e5497ebf20631175c628066e5bfaa5241aa9f3f7d1d02d3de238d8b9bf84ec86
+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 442 SHA256 45307588fd8cb6ea9883cbc4748f19ee2284d3c0f54821007f6ee01f7cb79c43 SHA512 bd93374c9c22a45b16a8013e3be4b744f8186d8f5a427931cea3bc29604ad2b12c9db1ba7c39822290a180977563e853bc6919489a4e9b9c1297a5b80080bb37 WHIRLPOOL ddc95680b4d41eb2ce64fca7e137e203ef991b9941182474666ebe75a970d5645f0adc63e14ce05c0efdc1e342a3f0f38560b1bd7f311a2e8d0499c7e8b98a81
+AUX 4.6/shorewall-init.systemd 434 SHA256 0f9904db0989d6ae29004f8a2c851073ae20207a7eaf6dbea1f0ecdf0cf69e81 SHA512 d64e04f1db6134adf7730b07ee1b468f7d980d8d8ded4a16448713bb807a9ec2d847f13860712f886e956ab2328e1b8ce1a230be24874dff84f9474704767984 WHIRLPOOL aaa0e1690ef29534b9d03aef0a70256ba0b907015c3e6624c94b49784722220eac1c7309d6b209cca7fd39840c6a02b20016d7e37b69f5c9092e17d628039ea0
 AUX 4.6/shorewall-lite.confd 160 SHA256 6aaa091f85ca7626023883b7e4fc7ffb644e427581d9aaf9307958fafbfdca88 SHA512 90a54824162c31276b791cfaed93f871d78af880f75184355fed3c597aae981e7a05d4725d127419892d849685bf11b26d3c71282b8ae0e0072a32b7d1309c91 WHIRLPOOL 02e1af5589ad1cd72cd9f6eb9858e590ab0451af7459118fbf830ac8ee47989c814d87e319f68cb7e5113a9a7792b7faed433ddec0e8b30b2dff28b8cb2ca45b
-AUX 4.6/shorewall-lite.initd 1806 SHA256 27ced7d3d8c9558e70834663b1e8d2f338386cbcbee65c92f9b74bfa249d1ae1 SHA512 acaa70ccf6f341b08b31dc3d498a80280e643d0797a63115e8d78bb3d5ddda97308b74c442d896742a2ad2b8546d892eaa78a2a1739eeb1f77e2e5a1c185e0f1 WHIRLPOOL 42c39d11d44d293bc4ecaea2e63c0b143bf7f800434ea4a3a503e836d6ed4950c4a98eaac8d0d702997ad80c45e603e2b4d5eef040a062778e404d6485703c68
-AUX 4.6/shorewall-lite.systemd 558 SHA256 acb60cb64c87d18edb8bad06d5fce134ffcb10a1b15bf326b4cea185d980fe85 SHA512 bc792bd6aa94b89f125dacf326f74efc347aac3ee866e59c3a4f9efcc27c6070abac5761525419c39d4b9a66278193a39d72809a57800a987438acda29182ee5 WHIRLPOOL 91893522f38b149d81f323c862cbbf44bb6853715b9641b2770ccd1d91978435f740d0bd6920dbc44385dd71673545588457489a9782fdaeb5197192285b1488
+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.confd 160 SHA256 6aaa091f85ca7626023883b7e4fc7ffb644e427581d9aaf9307958fafbfdca88 SHA512 90a54824162c31276b791cfaed93f871d78af880f75184355fed3c597aae981e7a05d4725d127419892d849685bf11b26d3c71282b8ae0e0072a32b7d1309c91 WHIRLPOOL 02e1af5589ad1cd72cd9f6eb9858e590ab0451af7459118fbf830ac8ee47989c814d87e319f68cb7e5113a9a7792b7faed433ddec0e8b30b2dff28b8cb2ca45b
-AUX 4.6/shorewall.initd 2508 SHA256 3a6aa8055c957a6cb00d2da1abec56c9da3f22bf7ad4703fd0f67ee9bc03e0cf SHA512 dd28a1ab52b04bfa9d334e14cdfab3949ce4e7ed1755f1e61b570e4be7eb1946a55b624418e1c403c90e82d4df650a188a86b596d64c6073a0f2c776b40d233b WHIRLPOOL 650fc46fadfbce3abde2af2c58de414d34b6fddeb35487d1582aa7e7f2505de1403810f0a813aea57d3e043e4d8d4a2121f27f6d260d17f1cf49e1d77ba0ce92
-AUX 4.6/shorewall.systemd 523 SHA256 3fe82c0bc8cf71ff94be78d9019643a1a6ea149c0565dca0fb384f3e5240a694 SHA512 4be4d07bfc42f1230f1107716bad4152358cab35bdd4dd8bde7233db3d8ea43603fa917565b09fddd2167edd364b68551939c551c8739933d6a807787de6f84d WHIRLPOOL 5d90188f3037941d8ea71d0083c6ba7abeceb5e7a6b7ff3c4608737b7af8387a069bbd262ad213318fa08f74c49f267c81ebe71e3c28238e638b8cfd1e82a511
+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/shorewall6-lite.confd 160 SHA256 6aaa091f85ca7626023883b7e4fc7ffb644e427581d9aaf9307958fafbfdca88 SHA512 90a54824162c31276b791cfaed93f871d78af880f75184355fed3c597aae981e7a05d4725d127419892d849685bf11b26d3c71282b8ae0e0072a32b7d1309c91 WHIRLPOOL 02e1af5589ad1cd72cd9f6eb9858e590ab0451af7459118fbf830ac8ee47989c814d87e319f68cb7e5113a9a7792b7faed433ddec0e8b30b2dff28b8cb2ca45b
-AUX 4.6/shorewall6-lite.initd 2231 SHA256 713b70b7a7b1ca7b8d921313d05d6aeeb385efb1bdb0c0a83e3cc1ef66756d41 SHA512 f3d51c911cc58ec093a1c000a3dd15c99fe2552bd391e675b24de6e7fd4679bec9c254b1dddb0d81374c3566e965a0ebdd7cbc939c1b20ad8569f294fa9a4e54 WHIRLPOOL e22d4797b31242d7f5330f9d121e1c2dde5a988a5bf7ee1c27ba18629a90f6e351232d356e4585e2a23747567cb17ba1b26a58ca53fa337146d6e29845a379d9
-AUX 4.6/shorewall6-lite.systemd 566 SHA256 ee5d9672c345c302620760d4e219dba8895b020dcc6dc808db44dabe0146e42e SHA512 34e0b14493a455961a5a1884007f535443f659d5de82f44af98d458cb0a8c5047cf13541239e2e0531b9e9c37296b991608902b76b9922722439f2d999215d3f WHIRLPOOL 397e54663942136b9b95888c9787278da7dcd3be53fb6d2c5c34a9894e4e7e2f6ac527ba2b2897c72c337c2aba7bf6769e05964e63b5e3fdb5d94fd4f699bafc
+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.confd 164 SHA256 647eb46f02a9be03a662223e09331313b9a3bcacbbccc34ba6779da0f7a3d381 SHA512 ba52458e30bc9b1aa352f8f6de46762e646e225c2624dc6de3961cfa21a8023cdbf3598308dce343badaad626710fad0481fb670b6a9749642774d550b6dd931 WHIRLPOOL 1bb6f6ab368a24260f08eb10ba396db8499ee22a9ed53fc23ac7d5ee37c8d5543016604d09c6b42d23bc66b954acb5cf64c601dd579f32f0f4e63498e358c750
-AUX 4.6/shorewall6.initd 2933 SHA256 f818d2e84346295b5683fd6bfb747b786a44b336f1dd207854c180372eb1ad88 SHA512 18960f340e1c4b7e8da1d9957ef09aa02b6e0b516ba0d32261ff3446e6d85e4ccf038a29790dab3336e2b0f376f1edfcf96aec20fdff175b6382078b5b323b1f WHIRLPOOL 0aa3a22173089f2aeea45ec0dcd0855232289d0a1a7a39e4173a2650f3cd00dcb6f0e7474332b1de3c7c593faeac2a5cb0e3627ce0cc73726c9a53a2a2af6ca5
-AUX 4.6/shorewall6.systemd 531 SHA256 231f0ad56d0083ef0dc647f9f9486e2179c0179fd68f70de00fe1f771e40016b SHA512 37d932ee91437d5cfcc8e64ffd6f188f50fa31792c76310c448410da8534e7d06c09121732798bcff5f8373b61231ffc84d033eb914c16361e32ebea9545848e WHIRLPOOL 1f259c055226e03f7453279e6f491976ca153c0c7e13cea7444c62b6c45d8f8e091a84d94d4bfd11f10cadc53e5174bd34b0a96bd506facb1904ac57820a6207
-AUX 4.6/shorewallrc 1982 SHA256 75c265c5968c05c120c9ea12e6337fa26c520c2d0900e1e3b78d32a827219727 SHA512 94885be09943c83dc9781a324c441faaddc653406f5c13e0fd1f79d0dacebad865a8d53117fbe78b0905b8b050c738e8bd0c5c1db5c3fb12bad355740c0683cd WHIRLPOOL d89cb1bb6765fe0bca1be85f53909b0c616a35674211911f8dffee70f6d428c6740858312fd5cc8c0fe0afededa6e7c73dc324508e2af0cec95adc200d861d98
-AUX 4.6/shorewallrc-r1 1982 SHA256 c2e371d12fa8d9e48212e1e0fd9a9c986730d8f0ed29ced60dc80f5a27d14874 SHA512 607d06a30bfe5656316df16063133c0cf2f8707d1143238b7c533996421e2b6273164710308f19b461e9caa89f164f3cec06fe9c289bcb346fda6053e50dab41 WHIRLPOOL 2b3f2ceef279548925cc03c0af98f27b1d2aec126dfa1edf737198514b380e68a27946f2f35ce4061f88bd7671a01f91d26623cf2231c0b35e834da828a1eb5f
+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/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.2.tar.bz2 481318 SHA256 2a3c52db59e80124e1613606b2526c4693059fb8a7a341ed600fdd093187eb84 SHA512 8b792b8c85bf53c5ce3e03a85f199e8ab2e6a17bacb47c04a8d63c1d936be9481a1d1ef74bad9c86b34d3db22b1c793c22390324049bd599138f13c9a6fca0fe WHIRLPOOL b04d3e0546aa6e850d621146d695e34b1067df419c9f3a60c71d1bfb21e91557be3fae6e2c85df710bd8779279390495c37e096b8e9f51b6edd188dfdbe55619
-DIST shorewall-core-4.6.5.2.tar.bz2 51710 SHA256 fc38dd578a394ce2307921b138cbfdb76bc0d5c9c64bcb3b397a2ccf21f761cf SHA512 6d10a807da8ed25881dd95d809bf2e3047e346c340d1a6683588e0d46947494803a024dd13d3f5e390fd336fb91f013afdb4a37fd8f4c38db7d4d6921bc77bf5 WHIRLPOOL 5b954c0408cf55534be29021007dd32a12eb295e9a28c60c40e823fdec0e643a6d4e08efef53e932521178747b78e4baff71a5c1d628609acb145c9979e94374
+DIST shorewall-4.6.5.3.tar.bz2 480922 SHA256 ed621d9c6a7a3ec58876cedc6f0a5f0ee425cb9107011af34f50b4490873705c SHA512 7d8bb202c205b6882517fb8d177387eb441a593bc5bae112b85823012e1c26a08a9ced0ae7c64a58c6dec93abfcbae0d043d76ddb86dd146fdf1ae74b4edc49b WHIRLPOOL 0436110b574b924d427186103bcac68d50106f1d9b4cdd5a28027b89cf62fa440c9a8de06666b9dd7464b6da9766efde6e6a42707c7ed0ba7c25b5ca18877418
+DIST shorewall-core-4.6.5.3.tar.bz2 51885 SHA256 820b8c5791f418312a2c62fbdacae0de86a3460358763b84ebccf142a68f9722 SHA512 cdef020e3e4ff1204854fd0f3e004f0d1d1cabab42644f5c7620dc8d4676f2ef5bd04c87bcdad120299640b63effd8e4a2b7ce116cd202907620f0806c2a8362 WHIRLPOOL 0b8c94588ae8a3c0c361d34ceab1af57fc68bf74515d2d260f17ae86c8f52075585eb897153d803a1f76fcff2d51e51afb42d02e83ff1e8d1cc79b3b0e52c98d
 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.2.tar.bz2 4177913 SHA256 46e9906f6e31f4be5f0de338d618797108b97a3a62b2018c8813069cee1ec7f9 SHA512 94e4ff3258b4ceec445e4f5e55b5c908bc5cd9a1cda73037d5195c1ce8a08bde1c0431227a0d9350effb581178ac36d87a211d37e6f0b806e1fc6562057a5f00 WHIRLPOOL b1c26ea862c6ca3b3684cbc35cbdc381472253a60355fd93cf3a22020ae5657e96ba1a92d8eff542996114a1eb65f068765f7caa3343ddc19ce99ae1cb9b4fd7
-DIST shorewall-init-4.6.5.2.tar.bz2 32299 SHA256 4bf8a830fcf6fd1869672dfdfd895fecd0dd22bb68f2af68c27b0e5828ff556c SHA512 d7a67ebc64b4746ea4d5eb1afb53c9d46e7cf99a4c657df2da602a94a9ea39ce5186ae2b80427e41f737ce937955011690098dbde8daac64882d85ffb77dfb50 WHIRLPOOL 53e9e22fa566fff951f5683db283fba378c02e290520c2aa3ca519da65f738a791dc90d808e1b6a72274b8cd6ccb8eac47f74eeb85a364ed6135e45721a6d0c0
-DIST shorewall-lite-4.6.5.2.tar.bz2 46259 SHA256 aae4bf4618273bf06408033be1811e003e1cf52ee4369203b6bfe4d72060af3e SHA512 2dc219877e21bcfbf19aa0a1e2ce5ac4c7350ab8676c3f8e0a66763155ab90e4662b40e3c0c7a52bd974d71e970cc50a206400706bcef2e29b1bc816c939605a WHIRLPOOL acfb9debc56168d29e0cd5813566629fbf8c0a4890734abaa9e16d25316848241f7fcbb8276647bee7ef74114e30bf9cee9070fef0325d446b4ed0eb6d09413c
-DIST shorewall6-4.6.5.2.tar.bz2 222025 SHA256 0dbea15d8457219b8eab41dab461388cb566a90715f2aee67b82514e4278f680 SHA512 4c3905a90d1b4330751187da8e8a70427d81f4086f68eeb0afa1dbe5cd3e33380aefe4b1c26ad58a1df8da1ac86b1ea8a13e2a8ff6dcdb368e5c50adf16dc69d WHIRLPOOL d4e5cd59e7f99e99b7fd98883a6927558e3f6cc2207be26711731160ba8f836db21ab59e02ccc5479bf143da3defb1998ead59cea3d3e11192bf0f05bbad0471
-DIST shorewall6-lite-4.6.5.2.tar.bz2 45654 SHA256 3dc2e6c4062bb50129e5828682faa9ddd783e796626204055bdfc87b4aec41a2 SHA512 89097be628281a5d617768f51cd192e92e8b175773e2a460d5f7a7e39e9d09fdb4158c37546d8b78857474239720cea6d8eb210a8fc7c9e7930114690df1cbf7 WHIRLPOOL 4706b792162a49039b8039b4ea170f297bdea949c8fc3c7098e07fe3f0f1b88e4b1425a53b705a61f7a40a08e2f757765990375273a6219db7a3fd96c2102fa8
+DIST shorewall-docs-html-4.6.5.3.tar.bz2 4177886 SHA256 10cca88239cba2a435975fed0e308f6238d0bde574b08aa88023cf50a4fc4370 SHA512 77c67b05815d590beb2e756984b6df4cebbb5da186cb6a25585080c35c1ceed3714e41eccfb0c0353298b674a86af18989ed5a2cf699de277b4a71ad4e80b9dd WHIRLPOOL 99574e66c4be0e9c51cd1fe036dc2866a3bed95e214a36298db934fe3d67275080d8c18942b47fef436fe249b28982ef95fed2312d412e654bcca1947261796a
+DIST shorewall-init-4.6.5.3.tar.bz2 32430 SHA256 d687430a93331605a9ea1b3277dc3ac80f12b298127b6ba130f5ecb0bcbb6fe4 SHA512 8464fc90eba4a9b8d1f617df93785b3f3575edf012d06f4588f81c1c98052add44ff2cd8a3a7d0fcac30c874f578c79d64e2afe67520f998c16e786e8188b47d WHIRLPOOL 8c712c58832642b8079ea1c4e0a00e062720b29771cf4bb786efd80d03f22e96aaba76829222247cda7339076ea457ef95f16aabd2b05779f9c39aba57a38978
+DIST shorewall-lite-4.6.5.3.tar.bz2 46382 SHA256 88fa715cfca400cde5e54841b216f1b1866aaa8d7dbd5bfba46d2281c246a607 SHA512 934448de93da853a5c59cb62b691cd81937df6c8ac1d0ea002735743cf60bc05312f7bf18e25de2a82604b526d0e588b69172e2c8e7496a9ec2243cc365d0bd0 WHIRLPOOL 3a2a9898296ca5c785f1def48d00e2234d8b54b96e8bbafb890f84c118b45b5de151cb3d97f2c69a3fcca83144424c7706e3f2e6da6a16312cd7faa89904ff1b
+DIST shorewall6-4.6.5.3.tar.bz2 222096 SHA256 273e1748e8ce3ac559d5f73d43f226f19fedf03895cf8f87b03ec63d17b42b6a SHA512 8c1d8b8559693d7cd764a63a1ec52fffa9ae7899bee915b4c25abff0647c2daf6887b0fa88c05291980feaba54e14268346629186e2176cd378b1116e8b7125f WHIRLPOOL d5fc4bcac9525b34a01105649d9c6ace306e621e0222531f457a809ffc896fb9b3988d89aebe2f5c77cbece32de69650f5a5968457db856e67816f988e5fa34c
+DIST shorewall6-lite-4.6.5.3.tar.bz2 45799 SHA256 ef459aa87a8a844cb971dc947235cda84bda238dc8744de7429862991d9fcaaa SHA512 3d535546586234be2ed717eb936dbc86247705e342181820a14a4b8458e05c19972e07a1185a00bb1c5025ed36f77f64c6a31f83d88a7b6e2b6b847752501225 WHIRLPOOL be8432303d888f369b86efec41dc0891768acde7f3a2c919e19e4515cbcdfc82ffb7908d30a6c65956bcd29f8f6123439a8ac9b49c9d8027790ddeadb8195760
 EBUILD shorewall-4.5.21.10-r1.ebuild 3373 SHA256 368f0d97aefdce58465d94700bb2aaf2209d16251ba3a1eb668efd77b5e4b8d9 SHA512 b5ee3e3e6f2ee05d05671cb506364cd9df407c20c5bc87e232eaa611c5b1689805d339902c9d791b02324e5324751eac7282b83caa25aa30eb28020b82fd676e WHIRLPOOL 774b7f9a2f7c5c25ebebc026e1d202edbf727f95b5a1434bb61c0376653122104b1bfe237bcf6bc2483d3a55ba615f9a73d573d78a50d0450a06a5ba0e2dbb43
 EBUILD shorewall-4.5.21.9.ebuild 3285 SHA256 9d6e1cc9a7a22de912d5c9146d3fc119c8978c04036a1e98cbbde31fd5f78b45 SHA512 df887615e704c0c181fa2bc10f01e07d9a3f12b68193643c0cb9facd6a8df73b3801e1db3cc9ad561a4e769b5f9656e7ac908f87c5ac4e0a00471b6048518abe WHIRLPOOL 2e100845a3a83d0476f381cba4173e7fbc5e771eb6c5c1d21a3357c4ca0d41ef980cba77cda0b5b5daf903a75679ee560e709aee776127262f7d22dcb5827d3d
-EBUILD shorewall-4.6.5.2.ebuild 16109 SHA256 394490438b5412123bc3ac16076d13beea2a1102a40480002963f790961a8c58 SHA512 2c0d7214a43cac14c6701b5238bb00acc6ba213c902475fb383fb2e587301636ddf5932f8716efcc357698f2e5f7c021637170fc61f011a772ad82f093c8d2ae WHIRLPOOL 6c1a0b9f58a1c9a629180b95f85db3e6ac9713a481c3ea198d47b06c2bbc0c713c22323eca0029b2875dff195c8136f60df94e397b6d169429b5e2e6e5b2bb7d
-MISC ChangeLog 40861 SHA256 73739455e15b6ffe8688990472ce328eedfa292291dba21f19468601359278ab SHA512 c230a2d56e2b41ed15f4b4e1b3245dd09fdd2157a93e6a70965b5c70ee521c18a7e0694b439fc3a5419534853bc5d5b5303d983a32115ceb6cb1c12272df1670 WHIRLPOOL 1072d29715a3cdb774685f0d56fc0c25d946bfa3bec49c86516395aae6aa5000a8272443a63f0f81d0c8ebd846dd34b84bbf257e352851bfcc83da0143cd977c
-MISC metadata.xml 957 SHA256 57ebb61c223d75b1210f8ca8e2877bb3a7a02a187f801b7003365592731ca5a4 SHA512 ae64bf8fb7956117a2465cec264a10d616e7a8ac9740665b0fe62e174afe0f2c5a67d4b6c47896a67fa8ca26d867ee5484876907049c37d447e50f821278019f WHIRLPOOL 98f26ea1ea8029a3ad08d8e758b22bdd2c279ef1793cd043f59332b5852a437724a906cc692b855e4f2d73cac457f46dc979fa2b35975481361ff8b9f2a07ed4
+EBUILD shorewall-4.6.5.3.ebuild 16080 SHA256 66566cbdbb3baf3e4a0d927d487b5e5030068bfd8c06a41db02736bba702b306 SHA512 86a11bc51299e4deb65e1ff764e50df75bd98243481af38fea5ade66d1bfb7220a12a45fe8bf01a0635474057014c06b581a219413d7b27424ce642fb3a235b5 WHIRLPOOL 274b506aee970c43bdf3f4de257651e3416b5c48bb48ee8a38e597845bb7dd41fd6eed3ba2afc34e408fb714353dd0cc8469a71329a1c13990eb3a9aa41da1fc
+MISC ChangeLog 41478 SHA256 18d96c63a3154a6e101e993b3305b492c89d3c84b62b927d1ba4de7f7f3b7594 SHA512 bb57f32c9ef90af61bc31fcfbb0a875f6e3f1f5b3b57f46b1c649a363ad92f04c2573e72f4e4ca474a8d51fca2ca20e065baab34f41f6d6af18dff1e8bd7dd41 WHIRLPOOL ba2b7df18250879b5daafa7935d324f317f8915de369376a9fab2b472426b31248da8c139e7dd5a3a396658412935815ad3d6c1b9968507df75f3d145223fa13
+MISC metadata.xml 977 SHA256 9d7f6c5409d58e7e897f591a207ae66d26ad601176aad0708a1a21b268e8946f SHA512 4d6cb7e6aa1c1f0b372dbe2eceff76eb44e8d702b780484d41e712c4a34d3cf88d40ddb0868faeb7c26be2ae3f14db7303b18a5a9882fb2254a2f79ba332c979 WHIRLPOOL ec45a44bf7b1f7de9f28bc273e7208ee9125c9d2642a95fc04e83132b097526756435b7d168f847936c1244cc9c246df56d526794d5f2ad1c60534d852ed77d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iL4EAREIAGYFAlRrQvRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDrjAD/e8JpB2I0u9ecJ+M0iZbmEhds
-OczzFjMQ/2sRjyZO9wEA/juVTITCOh3ZVLJSijqIX0MS4YTdBmYIY5o85LT9CJuo
-=bFHV
+iQJ8BAEBCgBmBQJUqQ1vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZGgP/RQpCK8pnBm1t3NPc6YuuY3b
+c7S4nhHILb9ftcuLAjoC4ZfUcC0PLuFEynL4seXiAPeIsR/D4z/NjiCl1HaELmhP
+wOxP12Cxq1/qUnMjV3mrTRLwNmGDdSIRP9UdnQVNS/rq5vkQ0xECRYIDrukH+ew0
+vY3RWEkXkuIsOapPiWldiOpwjiRkpE1nPZQiCHqJITul5mlS0OBS+ZdD1BUKNw21
+heSJt7yGDroy3MKLKusVfuQ5U55N9WIKO1oubDhqbRE6Q+lnlG/bpHn10vJN6Bj9
+R/2zeOUtlEXuo6AU4DM6QfDt6GnOs8oQviOw4O/PixueH4tFupV5tPVIa181FYvZ
+MesmD21TCEKneJwDOS2XeMnO/AFgWKZcbv860ELzTBFV2SP7Qu68iQuGesK27nfF
+FJsj/6t0VAR8V23no+BbfgQ6xaGY/fLAv/pDvOx9CS7qzLm4N/iJ07kKUWxBYRFT
+a0FWrFPX+tjf2EP2vmjmA4QF18iE5tleyq7c1A56/X4iZlMi+iBkz9/7BMZqlWg6
+TgQ+mhaB3dppGvPtRjWY5wFLRBt6Ngg3N0gSNGxBStnIiuVMkE6bPaj4nz/tSqvF
+pa54CJr8RSJIp72j3+CXAF9F+UCL4FyElENgDl1sp7AWErZxuYV65NkxcoBHFiVW
+O0qq4yTQKeKmOPCNj2Lt
+=DYRu
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.6/shorewall-init.initd b/net-firewall/shorewall/files/4.6/shorewall-init.initd
index 26ea0e09d4b1..c2b143fbc7d5 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-init.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall-init.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-init.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
 CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
diff --git a/net-firewall/shorewall/files/4.6/shorewall-init.systemd b/net-firewall/shorewall/files/4.6/shorewall-init.systemd
index e58c7e2375ce..e98565fce8a1 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-init.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall-init.systemd
@@ -12,8 +12,8 @@ Conflicts=iptables.service firewalld.service
 Type=oneshot
 RemainAfterExit=yes
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall-init start
-ExecStop=/usr/sbin/shorewall-init stop
+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.initd b/net-firewall/shorewall/files/4.6/shorewall-lite.initd
index 76411682727c..9b3a22076ade 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-lite.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall-lite.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall-lite.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall-lite.systemd b/net-firewall/shorewall/files/4.6/shorewall-lite.systemd
index 87f994fef7ca..5898ccb86c14 100644
--- a/net-firewall/shorewall/files/4.6/shorewall-lite.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall-lite.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall-lite
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
+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.initd b/net-firewall/shorewall/files/4.6/shorewall.initd
index 68211d98bd5b..c663d761b952 100644
--- a/net-firewall/shorewall/files/4.6/shorewall.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall, more commonly known as "Shorewall", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall.systemd b/net-firewall/shorewall/files/4.6/shorewall.systemd
index bdb829e6a12a..986c3510454a 100644
--- a/net-firewall/shorewall/files/4.6/shorewall.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall $OPTIONS stop $STOPOPTIONS
+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.initd b/net-firewall/shorewall/files/4.6/shorewall6-lite.initd
index a6e8eed190b5..96ba94fcb5b3 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6-lite.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall6-lite.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6-lite.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd b/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
index 7c4d306eac57..768a84f2ded1 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall6-lite.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall6-lite
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
+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.initd b/net-firewall/shorewall/files/4.6/shorewall6.initd
index 9ca043cf0adf..48aa3cecc7a3 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6.initd
+++ b/net-firewall/shorewall/files/4.6/shorewall6.initd
@@ -1,7 +1,7 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.6/shorewall6.initd,v 1.2 2015/01/04 09:49:46 jlec Exp $
 
 description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
 description="${description} a high-level tool for configuring Netfilter."
diff --git a/net-firewall/shorewall/files/4.6/shorewall6.systemd b/net-firewall/shorewall/files/4.6/shorewall6.systemd
index bb29c6e5ce0f..6ae4ea589ee8 100644
--- a/net-firewall/shorewall/files/4.6/shorewall6.systemd
+++ b/net-firewall/shorewall/files/4.6/shorewall6.systemd
@@ -12,8 +12,8 @@ Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/conf.d/shorewall6
 StandardOutput=syslog
-ExecStart=/usr/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/usr/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
+ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
 
 [Install]
 WantedBy=basic.target
diff --git a/net-firewall/shorewall/files/4.6/shorewallrc b/net-firewall/shorewall/files/4.6/shorewallrc
index a948027eedfd..0eef4147c008 100644
--- a/net-firewall/shorewall/files/4.6/shorewallrc
+++ b/net-firewall/shorewall/files/4.6/shorewallrc
@@ -1,7 +1,7 @@
 #
 # Gentoo Shorewall 4.6 rc file
 #
-BUILD=                                  #Default is to detect the build system
+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.
@@ -14,7 +14,7 @@ INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are i
 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
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
+SERVICEDIR=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system      #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
diff --git a/net-firewall/shorewall/files/4.6/shorewallrc-r1 b/net-firewall/shorewall/files/4.6/shorewallrc-r1
deleted file mode 100644
index b3809bb9c242..000000000000
--- a/net-firewall/shorewall/files/4.6/shorewallrc-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.6 rc file
-#
-BUILD=                                  #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=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system      #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.
diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index 67e8813360e3..b05083f3a6ea 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>whissi@whissi.de</email>
-		<name>Thomas D. (Whissi)</name>
-	</maintainer>
-	<use>
-		<flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
-		<flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
-		<flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
-		<flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
-		<flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
-	</use>
+  <herd>netmon</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>whissi@whissi.de</email>
+    <name>Thomas D. (Whissi)</name>
+  </maintainer>
+  <use>
+    <flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
+    <flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
+    <flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall[ipv4]</pkg>)</flag>
+    <flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall[ipv4]</pkg></flag>
+    <flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall[ipv6]</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/net-firewall/shorewall/shorewall-4.6.5.2.ebuild b/net-firewall/shorewall/shorewall-4.6.5.3.ebuild
index 91af74d4a61a..3de3f33e0f0e 100644
--- a/net-firewall/shorewall/shorewall-4.6.5.2.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2.ebuild,v 1.1 2014/11/18 12:54:56 xmw Exp $
+# $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"
 
@@ -117,7 +117,6 @@ RDEPEND="
 	!net-firewall/shorewall-lite
 	!net-firewall/shorewall6-lite
 	!net-firewall/shorewall-init
-	!<sys-apps/openrc-0.13
 	!<sys-apps/systemd-214
 "
 
@@ -151,7 +150,7 @@ src_prepare() {
 	# This allows us to use patches from upstream and keeps epatch_user working
 
 	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc-r1 failed"
+	cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
 	eprefixify "${S}"/shorewallrc.gentoo
 
 	# shorewall-core