Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>

Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!
author: Markos Chandras <hwoarang@gentoo.org> 2014-04-26 09:34:41 +0000
committer: Markos Chandras <hwoarang@gentoo.org> 2014-04-26 09:34:41 +0000
commit: ce807f25a0acfda5e8a623c0fe76802c7a53fdc0 (patch)
tree: 0dca1801f5dce5a3d45b372180684b7df4b93a59 /net-firewall
parent: Add ~sh keyword wrt bug #501346 (diff)
download: historical-ce807f25a0acfda5e8a623c0fe76802c7a53fdc0.tar.gz
historical-ce807f25a0acfda5e8a623c0fe76802c7a53fdc0.tar.bz2
historical-ce807f25a0acfda5e8a623c0fe76802c7a53fdc0.zip
112 files changed, 272 insertions, 3721 deletions
diff --git a/net-firewall/shorewall-core/ChangeLog b/net-firewall/shorewall-core/ChangeLog
index bf98fbf17dd6..2aa5d8418005 100644
--- a/net-firewall/shorewall-core/ChangeLog
+++ b/net-firewall/shorewall-core/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/ChangeLog,v 1.54 2014/03/23 18:01:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/ChangeLog,v 1.55 2014/04/26 09:33:11 hwoarang Exp $
+
+*shorewall-core-4.5.21.9 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/4.5.21.9/shorewallrc, +shorewall-core-4.5.21.9.ebuild,
+  -files/4.5.19/shorewallrc, -files/4.5.21.2/shorewallrc,
+  -files/4.5.21.4/shorewallrc, -files/shorewallrc_new,
+  -shorewall-core-4.5.18.ebuild, -shorewall-core-4.5.19.ebuild,
+  -shorewall-core-4.5.21.2.ebuild, -shorewall-core-4.5.21.4.ebuild:
+  Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   shorewall-core-4.5.18-r1.ebuild:
diff --git a/net-firewall/shorewall-core/Manifest b/net-firewall/shorewall-core/Manifest
index e05752bcb058..36755c7badc6 100644
--- a/net-firewall/shorewall-core/Manifest
+++ b/net-firewall/shorewall-core/Manifest
@@ -2,39 +2,33 @@
 Hash: SHA256
 
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
-AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
-AUX 4.5.21.2/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX 4.5.21.4/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 672 SHA256 d5f16a63647b7b507ca004ba2aa80074be7dee18e0c5a976d3d60f77f3c72931 SHA512 ee60f92b6ef2879ea1aa37043a5fc67a65244df91e29feb748b36ffeffffcbf7a33548a0f55f4f0d8f54d753ba0b67f0dc72f11320c7fbfd886040ebf4498ce0 WHIRLPOOL c56117bda178d8c66f12ece1554b182d60bf787f53eb4b40619c78739706ded4793242610e368ab30e8b323e324661c26d394445a776e062aa4cdb1730a9b567
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
+AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-core-4.5.18.tar.bz2 79521 SHA256 41b1e9e2d09c6344d546f814531996eaf52b3a30ae6c8db7ff009a8a17bde3cd SHA512 8b2dd691b84c5ca3beac705b4aecb7ac3c09e794c5e255915bf5a55cebef23ca4cd8fac2b3118d6e6cbbf7e432699cc447d5811de80e1d3bae0516ede27398d1 WHIRLPOOL 4c2416dab6f4fa73dbc010c3ab3a884d65f2ab814da6301b7d8a46545347b6c94b0444ea8e3357c9a80d03a08064c67fdd0c80d8167bca8fa1a2c54d4fd7b6b8
-DIST shorewall-core-4.5.19.tar.bz2 80581 SHA256 ff9e1d602ba5d973de1a93ee618d175ffc8ff5d092f1af767fa922f5761b08ae SHA512 917a223863b57a6282c8b83de03daa6133886682a95cb9c4816754ee5bd1b5a0f97963da776c518a68ae0af432cc7dcc274f82b3a29569471f7305155bb86f66 WHIRLPOOL e36f745a0f6975ca035ac8fa0e06ad825c62f7508f4921344263effed734da8c037aefe6edb1529edb50d09e7dcb146fab4aaf8a49611bbcb72037ec1c5b0370
-DIST shorewall-core-4.5.21.2.tar.bz2 84368 SHA256 576a2b9fa3a0dcad7d8ec8f88363cd6fc6e3dabaf73238912d64bc0f21d3fc9e SHA512 1a51eae3a667dabce1becf6ad3f492160bf01c531695397e859b89a9c1fe977ec51356d2222c2c4733c3f7f17d4d823a924153429287ba324730ca2f40c1abb2 WHIRLPOOL b987996ae88a62e93f03407aef0b89164f907b275cc3a9d8aa0e3e82869d554fcec4c22db0b0e545cd49a31ee87e03beea798c767e4bdb5bfc9ca34e7db8de18
-DIST shorewall-core-4.5.21.4.tar.bz2 84816 SHA256 f4a0c6b4789be28ac20ea3a0b8136f9aab72ad1399afa84714097fc6ad66dd1c SHA512 a8b87d43794731e91cf785a297b5b0ec8df4fa81c759ab43f0f7d091bec2802b05426e99b0b0e379495832c7be298e9013b87e5e08c1429b93ecd30f3b0c728d WHIRLPOOL 622e2dfa2b691a317e80a2a43cefc6d3b98f1d6b1ccb5ad3295125607694305eb767817f495bc9cd766e288092efeee4dd9dfaa5a021e8988f3ac71842513d67
 DIST shorewall-core-4.5.21.7.tar.bz2 85447 SHA256 31bbb0a8ea6da1b6392e30e682994557e3af6c89ede80b3ec904bae4040eda08 SHA512 d53aad4ebb944bc5cd47720ddcf16deb6dfd8e17c793749ef7b9113518ff999424eea90715888994cfe1e9b9b0628f4358d12dc2a8b48c7e256d584e420d74cc WHIRLPOOL 9e931940e99b40d18c4710ec4cb1c74a65269dd248b6b690f95ccef570aa2daa8b2cc65559c22c292dad8b83c3e8c8b3a699456782b3783203125f4e3f5587ce
+DIST shorewall-core-4.5.21.9.tar.bz2 86021 SHA256 f431edf0109641b7fd7c9568e39917b16f1d776393d58aef328f82bf5ef20656 SHA512 53525a3159e33aefbc39ff59fe300e5da3f51a4c2c363ecb4b56888d87ef48f56b8ec7c4d09668407148898f2704ff60627a90b42203cf48d2e4c3d3c5fd8f41 WHIRLPOOL 032ee33b1e1e3effc1a7b97ad4000b4e9eaf0a1f4d45cffeb252298aaea06444484ccc80b4c5115d59ffb6e2d76e2fac97b2ceb6b2b2c4b7283f4cdd4778a6f6
 EBUILD shorewall-core-4.5.18-r1.ebuild 1331 SHA256 e223d79f2c97eb140d90ad5479d0ea6288f564934078b3b6f0ae32ee00725958 SHA512 e1330c804f31c399e9a1adb68fa635b9e6baf2c18201ea9180b1e922941da94866b9b51a764ec59431d254c2d9745b0d0edcc0d0efcc03c368da3aaa931988d4 WHIRLPOOL 5ad58b1b2d9b47cecd48b8e8af5ec0a084d9339adfac0656b32f01cbad54d9070a500c92fde9302f568de2c07ff4316f7e719c974e71e5d2b15cda5b89d76e50
-EBUILD shorewall-core-4.5.18.ebuild 1168 SHA256 efdcda19b2fbc3a597f387cd48fea93fe50bb39b4ea78ad55efcacd4580f937f SHA512 f37cf1ffe539eacdf7d195078bbe08dc8e0ada6a8c20b29c5891ec293a9a5e3ce6f17f3dd6184f27b6a7506dcba7d3a85d4ffe1f0ff48492e5e3cd4cdf84cb77 WHIRLPOOL 9484ed7f322c25f19dbcdc9f5ba7b521d0055423d1bde4e103437da790f4ad337e6029046cfb504a81f95d95431a088ee12e74928cc17b5859ded131c2d1bedd
-EBUILD shorewall-core-4.5.19.ebuild 1433 SHA256 be57fb55160d2711bfce2bebc735f6d262517862f0f55a2376e2708fc2d718f0 SHA512 16763a0130abcfefcac1b9d9719d3596869b04f434abb200a1573b2de4a6eb846748068a9c73115a0f24f6407530fe21baaeac23d439219ecb72525b120df5d7 WHIRLPOOL ad6d2ede282a41c6d64b7525dc7b5fd982caa72483fb6a56e642dabd6eaad2843de9210a563ec9f980f624dff60f21cb1764c377719f0f5b36eab880b28ad882
-EBUILD shorewall-core-4.5.21.2.ebuild 1822 SHA256 1c0064151b62c83d642ee55bd142ec8274125e6228a1651d5081830435896105 SHA512 8e68fa6f16fd43ed46b133ef57459a8e255c6e54c3952e474fdc6c8f57d8e6306fe4892d6bde3784d38b25a93ef0dbc3c1cecd5ced5e97271f211fae6470ba83 WHIRLPOOL ae19cac0fc30870484f5c295958b166377bd31ab49627d90b08723c7556e780c698086f5c21d72ea53c8a0fa35a9a10bf8876343a4a61db4301b90488ea870b8
-EBUILD shorewall-core-4.5.21.4.ebuild 1822 SHA256 42bfc0971a36b6cae1efa1ef330a2d58e90e843e143e2b8cae228cbec2a24703 SHA512 fff58e31f8dfd767fa51918d7c9cdeec0138a1ebde42cebeceec1b8cb944068a0b8c8747eddee34d922d1aa9d210869a9eb9aeaa6bd374da50b24381516d1941 WHIRLPOOL 656c863b48eee80c90f38ed2eef13143c204232056a80ec1d7161da8ec3ac271e97a3eede653d650cdc93961c217c4cc7dc0b57480fd49b167525200e153ad7e
 EBUILD shorewall-core-4.5.21.7.ebuild 1914 SHA256 3932bf042c0f14d0f75ff66ce9143fe975b3be67826f61da8dd567d50f552280 SHA512 4da23ac9ace2aa546cbafb7b979d340cc01223876f121fff4fe12eeff2523e82229cae8913d1fb4dea693dd765308bad4acdb189e472def35a2d4de4288e924b WHIRLPOOL a234ba7ea5bdb6e2fc90aa4182024a9ab359276cf36e3420d51d945d8471b6675aed95c25e9d5d4ef26616a5bbbb9bd767df0007a5a96f08bd820a5091b41eef
-MISC ChangeLog 8255 SHA256 45e4b1dabe82543677ecb155b8f8196d82c8e3f052c4c6ef70bc50f18be65d7d SHA512 21cd76fad6679f877489efbb2c9e18fd2ae687c8d1ae2bd684c9bf685523fcf336e099a2243c6578d55bc2e5f2d3fbf55fe3e1c0027803b2c7d07e654a5f0dcf WHIRLPOOL 4680043fe03fd17ca07485d8dbd8987c1d65615377e8b972fd6e2d12eb364acb626d709d4eb6ba3ccfbfbcd22fb6366dd472aae3547bb22479e4d61b11a405e7
+EBUILD shorewall-core-4.5.21.9.ebuild 1862 SHA256 dcd6b10f26d21a8416c758786b1e3fc16390647ef7e0c49a4784906b0d4a3471 SHA512 240cb0f4a703ce07ed49d5f693142ef9ba31915134e626e13ab408a7d297dbf456dbc332186213a0facf9caf08d3455a6ae402b9aca59cd64e67f98887f7e898 WHIRLPOOL 6915056eb52c2718b4f6403a701d92afbe5b62d2deb42b81f76bbe542dd98a627e1d04e861cab237e405a277508d53f662b0b1d4da9b8decfc2ec7f17664bcd1
+MISC ChangeLog 8742 SHA256 350a7c7a4e1ffed28358a2eac798450b631848eaba08c94cf9dae82323b63c88 SHA512 48d3accae6815973cffe2f8b5f67773d924770f8f9827fe20e98480330f8d8706b318468d8fac5722ed16987df857a5f321996d9c1bf3ad12c6a12361cdfe1bc WHIRLPOOL 4357c1726dc6ea44fe58b80a7ce176676641cfad3eae298e9a41ba040c8c05b49eab4f642d9f2467404a56a3bbc7eabe8626047822c80c53106cdf8549477700
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLyGHAAoJELp701BxlEWfY1EQAIT/4kBRWf4DxXOaJ/cPTFl3
-SHaQO9FrJR+vKBs3IeHITscgfLHdGnzF3OherjTc1P6DFdmlKlYX4fHYD6BVMNGR
-3AQeElSUfFNcK4wtokiixpUMIS52m27zgtdK4y+HIoIAe4IVWD/UP4cZfJdga32/
-hVizE/BEZOyPQaIAxUaTj4JYvztP/72rUdGXMlEUUkZFcfzWz1GYalUy9XciXLtc
-UANNcGGAa/aES2BoUAepWgFu2UBGIKfN7xglw4LfNPY+kjvHT+E4cLnTw1T1T4Kg
-ceJBvlV2loywpPWWZ/4ShpkkTXPkf9dxRVHmYZdGq14mRG7zDZb8NUAXxmTbOGeI
-0iSGGegOJSCS1nRiHCgtHjSbNV5sKSDRtjuXW7RvSXNfo70sYh2GegJzFAZYkRbh
-jcGi7fposVTAvew1JOWwN9zMKzOkVfgKXPqQmUXOnVUU2DvnXYqWKmxIixhSqgvY
-Kdmt78T5851avPncuVvt8QuY+MzTnv6VpyT8eiunxcoYhTczwEjIJsMHRPqlXsNg
-kykqPjiYhjfRjWYx/uHrr/iuaH8qg/h5UrC7EoOR/Kj6lvUY90Yzf2Nllu0BSmkb
-E9NLJxsZnOHMIMiGztoGuhutDmjFASbycunqEb5rUFpLhRH9oPvz4vUb9S893tbd
-0wWflbaCFQevIETaCOYe
-=BHMX
+iQJ8BAEBCABmBQJTW30AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88xG8QAJGEWCOgf0NDsySoTcHJVR4h
+B3bKtN6FEaXc5nPD/YsJjDHi1TEzi9sX/qLqZ6BVspr8t6RPHvqe6fjXxFXjV6gV
+Ze8HWl50doh48woJoKwojda6vPzyq2dw/jnvxTHds++i+5PpA2vtAy80ZQH0SMsp
+XF+lanP5w5r40yxeESbhGb8Tdp2tCGSVYOptlZxQIFa5mN7ecwtfGCRy3PAX0wY8
+lMbztzBKAMT6FlUNqfp0H5t0B/KM8VRnyFaMYIcWdIdTkKze3LFpVg35M+xUBbLh
+FU6TmrO7gYx2g5cP2XWkqYmWEWtbbScEcHOvG+khr0dpApc1hDEFF8IUbcFqIrLs
+5lq1dMgrc2F2+Bon3R6mmnBwVgg6owchRsIUWsKKVt/15pClE0a0KbWwye/xCdWR
+Tl01VjIl59L3sOqQo6gcsU6KElclv+UAXtdyn6dHuKDlxlyia+YSz6/d4CLHQQHK
+gD785fL8CSiNl3enTyqVTWgBmUMKUbndcA03woWfKuADfPqwmNQGM26YTnfAWzcz
+qTvl7+KyqrbJqIsbyEAgWOI9iHEEzddrez6UBxSb/VxlioSp8TPKzaExSVYDNjKl
+TTLQek08tIX2eAes6BrcOoOdef804/BMzM4YtKyGV9Vr3jZ0Kxm1hZ8eYaDcmSSi
+rpd5LTQOmSgV4LelpOrn
+=nRIN
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-core/files/4.5.19/shorewallrc b/net-firewall/shorewall-core/files/4.5.19/shorewallrc
deleted file mode 100644
index c2fce7246c1b..000000000000
--- a/net-firewall/shorewall-core/files/4.5.19/shorewallrc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-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-core/files/4.5.21.2/shorewallrc b/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc
index 46f5eb9a3603..46f5eb9a3603 100644
--- a/net-firewall/shorewall-core/files/4.5.21.2/shorewallrc
+++ b/net-firewall/shorewall-core/files/4.5.21.9/shorewallrc
diff --git a/net-firewall/shorewall-core/files/shorewallrc_new b/net-firewall/shorewall-core/files/shorewallrc_new
deleted file mode 100644
index 06253dc2b8cb..000000000000
--- a/net-firewall/shorewall-core/files/shorewallrc_new
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux                              #Generic Linux
-BUILD=                                  #Default is to detect the build system
-PREFIX=/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=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=etc/init.d                      #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/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-core/shorewall-core-4.5.18.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.18.ebuild
deleted file mode 100644
index 63430b76153b..000000000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.18.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.18.ebuild,v 1.8 2013/08/17 16:18:06 jer Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="shorewall-${MY_PV_BASE}"
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	!<net-firewall/shorewall-4.5.0.1
-	selinux? ( sec-policy/selinux-shorewall )"
-RDEPEND="${DEPEND}"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	default
-}
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.19.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.19.ebuild
deleted file mode 100644
index edfeabaae33a..000000000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.19.ebuild,v 1.1 2013/08/28 16:19:04 constanze Exp $
-
-EAPI="5"
-
-inherit eutils prefix versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJORMINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	!<net-firewall/shorewall-4.5.0.1
-	selinux? ( sec-policy/selinux-shorewall )
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-	sys-devel/bc
-	sys-apps/coreutils
-"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	default
-}
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.4.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.4.ebuild
deleted file mode 100644
index 6d8712599bb9..000000000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.21.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.21.4.ebuild,v 1.1 2013/12/02 20:00:01 constanze Exp $
-
-EAPI="5"
-
-inherit eutils prefix versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-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)
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	!<net-firewall/shorewall-4.5.0.1
-	selinux? ( sec-policy/selinux-shorewall )
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-	sys-devel/bc
-	sys-apps/coreutils
-"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	default
-}
-
-pkg_postinst() {
-	if ! has_version sys-apps/net-tools; then
-		elog "It is recommended to install sys-apps/net-tools which will provide the"
-		elog "the 'arp' utility which will give you a better 'shorewall-lite dump' output:"
-		elog ""
-		elog "  # emerge sys-apps/net-tools"
-	fi
-}
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.21.2.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild
index 40789f8b17f9..02f16b919467 100644
--- a/net-firewall/shorewall-core/shorewall-core-4.5.21.2.ebuild
+++ b/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.21.2.ebuild,v 1.1 2013/10/26 18:36:13 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild,v 1.1 2014/04/26 09:33:11 hwoarang Exp $
 
 EAPI="5"
 
@@ -34,14 +34,14 @@ DEPEND="
 	>=dev-lang/perl-5.10
 	virtual/perl-Digest-SHA
 	!<net-firewall/shorewall-4.5.0.1
-	selinux? ( sec-policy/selinux-shorewall )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20130424-r2 )
 "
 RDEPEND="
 	${DEPEND}
 	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-	sys-devel/bc
-	sys-apps/coreutils
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	>=sys-apps/coreutils-8.20
 "
 
 DOCS=( changelog.txt releasenotes.txt )
diff --git a/net-firewall/shorewall-init/ChangeLog b/net-firewall/shorewall-init/ChangeLog
index 8ce8b69e91ac..9fd2a53de228 100644
--- a/net-firewall/shorewall-init/ChangeLog
+++ b/net-firewall/shorewall-init/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-firewall/shorewall-init
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v 1.3 2014/03/15 23:01:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v 1.4 2014/04/26 09:30:50 hwoarang Exp $
+
+*shorewall-init-4.5.21.9 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/4.5.21.9/01_Remove-ipset-functionality.patch,
+  +files/4.5.21.9/README.Gentoo.txt, +files/4.5.21.9/shorewall-init.confd,
+  +files/4.5.21.9/shorewall-init.initd, +files/4.5.21.9/shorewall-init.systemd,
+  +files/4.5.21.9/shorewallrc, +shorewall-init-4.5.21.9.ebuild,
+  -files/4.5.21.2/01_Remove-ipset-functionality.patch,
+  -files/4.5.21.2/README.Gentoo.txt, -files/4.5.21.2/shorewall-init.confd,
+  -files/4.5.21.2/shorewall-init.initd, -files/4.5.21.2/shorewall-init.systemd,
+  -files/4.5.21.2/shorewallrc,
+  -files/4.5.21.4/01_Remove-ipset-functionality.patch,
+  -files/4.5.21.4/README.Gentoo.txt, -files/4.5.21.4/shorewall-init.confd,
+  -files/4.5.21.4/shorewall-init.initd, -files/4.5.21.4/shorewall-init.systemd,
+  -files/4.5.21.4/shorewallrc, -shorewall-init-4.5.21.2.ebuild,
+  -shorewall-init-4.5.21.4.ebuild:
+  Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
 
 *shorewall-init-4.5.21.7 (15 Mar 2014)
 
diff --git a/net-firewall/shorewall-init/Manifest b/net-firewall/shorewall-init/Manifest
index 6a3ea20a7efd..2d9001abefd2 100644
--- a/net-firewall/shorewall-init/Manifest
+++ b/net-firewall/shorewall-init/Manifest
@@ -1,18 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 4.5.21.2/01_Remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
-AUX 4.5.21.2/README.Gentoo.txt 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
-AUX 4.5.21.2/shorewall-init.confd 230 SHA256 f3845fcdf5e76492c23238a42e03ef028a63841f383213e8d7ba229d4396470a SHA512 c032f7eddded7c29212fa363cb7af7305bdea70e48de45c42747331cd6fd5f3319f3f0d9172f02a33e925d8a1bd6d02a6a27bcaaa3bf6006005873d293577e62 WHIRLPOOL 60057322b80f785924b832d3bdd0a0efc4dcd10358d0589f31cb7a932ecd363b43910f2b2f23c43e66fddc52f563b034fe547ddc43541ef07967e76055f7c3d8
-AUX 4.5.21.2/shorewall-init.initd 4480 SHA256 130ffae1dc170aa422358d8f4027daa4fb88361e940ef80a1e849a0c64f68f12 SHA512 9b7ccc5ccbfcf7bf606c196698fdc3931e0baec1ee8d3ddf38ff3bac0b77211572d7210d05c7fac3d0c6ba2a763bdde4a781819ee224a882fb00677001093dd3 WHIRLPOOL c52296141c6e86ace70282827900c92da37c03869362ebc0ecfa5420b21a66a3af2eeb93507844f4d387e9ad9509640e4d763832edb66c2159a81e56fd60686b
-AUX 4.5.21.2/shorewall-init.systemd 343 SHA256 54b9800171441271808a4fe01b85d7e6408cfb284b69d88c1abdd9491a5e6921 SHA512 d326933f4ebcc7a6780e64c2a32413d553fb8cfd7d183395efacc7348e30f7e7f62589917025996694f46a4fc31fdca7404dd5de8b8f90e52518f812597451a0 WHIRLPOOL d7ab450c30e10588fcacb19382fecd0a0654ce308275392945148d7353af69a51d20cde8199fafded80098522452ca2a4ff42314d8b63f18e347ca66283c5d90
-AUX 4.5.21.2/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX 4.5.21.4/01_Remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
-AUX 4.5.21.4/README.Gentoo.txt 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
-AUX 4.5.21.4/shorewall-init.confd 230 SHA256 f3845fcdf5e76492c23238a42e03ef028a63841f383213e8d7ba229d4396470a SHA512 c032f7eddded7c29212fa363cb7af7305bdea70e48de45c42747331cd6fd5f3319f3f0d9172f02a33e925d8a1bd6d02a6a27bcaaa3bf6006005873d293577e62 WHIRLPOOL 60057322b80f785924b832d3bdd0a0efc4dcd10358d0589f31cb7a932ecd363b43910f2b2f23c43e66fddc52f563b034fe547ddc43541ef07967e76055f7c3d8
-AUX 4.5.21.4/shorewall-init.initd 4480 SHA256 d397f495cfa6726ed70e3acb088abecaea82b4566f4dfa1ebb4c6994e878a2dc SHA512 6fa4d0665ab0d8856e3b55f3374077e1b4ab6e16092b850709be10b70c6c4cb5b67d387d660d6d17bd4dd2b0bac17157285ac30ad072189828f5c301c93bdb2f WHIRLPOOL 8b5a8fc6298817687ed1e896bf437ba16e28f5d5c3497210fde0f73fb2710005ad4e8d2c524b2340e88cc8cf31b7916aba64ca37a473508a8527627b465e27fc
-AUX 4.5.21.4/shorewall-init.systemd 343 SHA256 54b9800171441271808a4fe01b85d7e6408cfb284b69d88c1abdd9491a5e6921 SHA512 d326933f4ebcc7a6780e64c2a32413d553fb8cfd7d183395efacc7348e30f7e7f62589917025996694f46a4fc31fdca7404dd5de8b8f90e52518f812597451a0 WHIRLPOOL d7ab450c30e10588fcacb19382fecd0a0654ce308275392945148d7353af69a51d20cde8199fafded80098522452ca2a4ff42314d8b63f18e347ca66283c5d90
-AUX 4.5.21.4/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/01_Remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
 AUX 4.5.21.7/10-releasenotes.patch 672 SHA256 2a7638cdf09e6fe8440f83c239e473878453749b7485c7d697fa33193364a0f6 SHA512 eae8a680840080efcd08ba2e3f252cea7eb89a5d8d8ecf0f0481af6cac11e2e6322e1f42f89b1c5cd950c635a5ed72be0bb5a6707fbc80914afc58f4c246e98a WHIRLPOOL 90cce01ece70f660aee3ac84a63f43f9c08c3cafecc58722870d7d99259d066e26533909506458a9db467e57954edd8796d2045d7cf4c3d9f5885ef757148d88
 AUX 4.5.21.7/README.Gentoo.txt 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
@@ -20,30 +8,34 @@ AUX 4.5.21.7/shorewall-init.confd 230 SHA256 f3845fcdf5e76492c23238a42e03ef028a6
 AUX 4.5.21.7/shorewall-init.initd 4479 SHA256 c47ca7f0c7aa57450f40994010891dfd6ba7541b071ef2525b1d1a19dd89a706 SHA512 b6b4a5d67cde309d330d06fc218fb40d83a1c5c4400357d8deba0bc3421fc4951606c57da2eed2d4b26fc8d974e8293f967ea7f23354bce6939c780d96a3ed14 WHIRLPOOL 1c51c9151f7752be58849b62b591346187273eb9454ab397a0a0d026be9d8a2ce1a7c32aa9091495329d96f637fdc8cfb4547d1900bddba133f561d109992db6
 AUX 4.5.21.7/shorewall-init.systemd 343 SHA256 54b9800171441271808a4fe01b85d7e6408cfb284b69d88c1abdd9491a5e6921 SHA512 d326933f4ebcc7a6780e64c2a32413d553fb8cfd7d183395efacc7348e30f7e7f62589917025996694f46a4fc31fdca7404dd5de8b8f90e52518f812597451a0 WHIRLPOOL d7ab450c30e10588fcacb19382fecd0a0654ce308275392945148d7353af69a51d20cde8199fafded80098522452ca2a4ff42314d8b63f18e347ca66283c5d90
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-DIST shorewall-init-4.5.21.2.tar.bz2 65230 SHA256 f43125910f1c771afab2ce8daa405ca46c08b53bee3d856d7835154509833883 SHA512 94250a1e5d61bb9ebdfc7148a9aaacd1a6e589beb7916f5417eaf56f153b1d9c64e7d1a399a6ad55c952d7ebfa40bfa22ac4915b1d58a82a76e8da3c6037f3d9 WHIRLPOOL d84112de6b2db88041fabe79043df4b71813221ccd3aac29320ad2619ad6af6c90a547099124ba581a4dce7407adcd17a0abd2afb46cddeccd7fd6f3b820554e
-DIST shorewall-init-4.5.21.4.tar.bz2 65466 SHA256 c2c98c425a651ddc61136965a8549762dd35efe3d85a79efad25591ddfc4d077 SHA512 e4448fc6146bd312a4fa3cffa9997597349d16b6ab8d8d361da958f5ac63c74511ee5b367163aa4ba5f9dc6bbb9d7854aee8f9e267ca56c5575e54ce16e618c6 WHIRLPOOL bfbe491068766627036c2601a9adf6632607fda448a91d3873b5c09237a8f6ab84b432bb394b019e0a9ab41a37991b1918a7b57214e8798876b1578b7998bcd6
+AUX 4.5.21.9/01_Remove-ipset-functionality.patch 563 SHA256 ed4e8debb0eac40527f4c63df929e84d54bce066f1c7f002cafd9e34b01079ce SHA512 d4b9c4aea7a0d1eea24c6e7f045ce7b61b24969e962fee0f95b28c6fad490eb20c6c6cb568813d0bebf91fa6da22b9de06da03ed5bf7b2284309d0bd7d236394 WHIRLPOOL 1c3cb1f5a3829e317e834fb56a6be9a1d3ed3c63f5e4825875bbb71a85f9db195de09f6b36002e25b477e70ddf57ce6921290c31a001bb6f7036dc6600943708
+AUX 4.5.21.9/README.Gentoo.txt 1233 SHA256 01439a974c15797954f3b9ce8fc7dbd8c81baff79e6a4e81e745416103896ce3 SHA512 8dbb70cc381b81ae811dcbfbcff63f5de0ba776472107a7d3b53e912fe50f20acb59f5da2aecec5de87ad0513a40fb4b4dfa30b51ff5f4b0da9186504870304a WHIRLPOOL a4293a49656253e3d7903b5a067d67b1bffdb1fffb3d92a43a2c32dd8a796998c67ad66beb756b4c45db618ab72b0dbc1bc81f183976c174b483bb4a2401a643
+AUX 4.5.21.9/shorewall-init.confd 230 SHA256 f3845fcdf5e76492c23238a42e03ef028a63841f383213e8d7ba229d4396470a SHA512 c032f7eddded7c29212fa363cb7af7305bdea70e48de45c42747331cd6fd5f3319f3f0d9172f02a33e925d8a1bd6d02a6a27bcaaa3bf6006005873d293577e62 WHIRLPOOL 60057322b80f785924b832d3bdd0a0efc4dcd10358d0589f31cb7a932ecd363b43910f2b2f23c43e66fddc52f563b034fe547ddc43541ef07967e76055f7c3d8
+AUX 4.5.21.9/shorewall-init.initd 4479 SHA256 3e011a6a726e3890bdbdd9d3c7226352ceffcebba8f3424eb4d2372eaf990bbc SHA512 9c33e0a9400cdc600c31f50baedad92236ca98e0c2e47f3f48dc637275d5dfff80ad64f204e4e6ff610e9a08897ecea75da38f76f69b15fcaad4b3894db6fda0 WHIRLPOOL 4fc6643cd576a0a257300951c7291119621b5c1ed064da123f3402ee350e60b5842c3ee9fce053294472a61e1f8dd905e3b28989997b835faa1cc3ca288efdf1
+AUX 4.5.21.9/shorewall-init.systemd 343 SHA256 54b9800171441271808a4fe01b85d7e6408cfb284b69d88c1abdd9491a5e6921 SHA512 d326933f4ebcc7a6780e64c2a32413d553fb8cfd7d183395efacc7348e30f7e7f62589917025996694f46a4fc31fdca7404dd5de8b8f90e52518f812597451a0 WHIRLPOOL d7ab450c30e10588fcacb19382fecd0a0654ce308275392945148d7353af69a51d20cde8199fafded80098522452ca2a4ff42314d8b63f18e347ca66283c5d90
+AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-init-4.5.21.7.tar.bz2 66069 SHA256 333904c191c670d463bbf9c3143df51ecf1e33454a89f3917a07817f0f3ce68b SHA512 2c44a6ec5d5b4395b8e41b8a54cff066c75b8c8b8aba87d97f98d7011841a947b497e91272cd31e7422db306b237d102c02b76bacd9537574e359d275fe33286 WHIRLPOOL 49251ed0600a4ab387b5d36882c049cd95bfd4aa7e6d6cc8782731707d739725348bcfcb3c3e1115ce9387e730b71ebff5773f70f2045a05ed00438d15a266ee
-EBUILD shorewall-init-4.5.21.2.ebuild 3044 SHA256 8a5529ffc79a8431ca556a8a0a7303f67866f66470f140c979ac05a8aaddd301 SHA512 0582470ea20595b7a10a7759c24dcee47ffed3325e87c817beb350e921e31a2b9f9217c6670fb2047f2e72bf1adb8f4a23db925eeffcfa219997fb7b2b8ff678 WHIRLPOOL de75cfef89d7ba3419486e058130475a891546d347fedba53f4572771be33e619c14a1a8935e4fa02b9e103b8653a07c289fb63a569bd576492b233c0b3338f1
-EBUILD shorewall-init-4.5.21.4.ebuild 3044 SHA256 62609113e7f860889a9871956aff8da49538bd4dab846df15d53134e2db0e50d SHA512 580d0efa5a8de3aa8a51eb08b08c9e47af3f1440f55530167aff583ddf64502281cbbc667274935c34d8eeb1d1f000a026b83ab7157bcc0b000a6803de502fd6 WHIRLPOOL 2cb318764b4374c94be8573fd00ff7b3ee0ae511547486d9f853d238c5cff4f3032e12b7f59f28db6a1fe65e6d860fbea8785be635c98c83c3bc8482f394f943
+DIST shorewall-init-4.5.21.9.tar.bz2 66436 SHA256 53867182aac095777d08830260596eaad8893c64715a27c837ac928546803f20 SHA512 973302b3f74f655b6b284e36caaa02e95ed3e3afabf5f0eae5307381cf95f8e33f3a85696b573e928dad91b121123ab07903954dfb6fa3b57a4759dfa72f93f6 WHIRLPOOL 43f527cbb4b36b725a981076df1a2efd5213058439916d56baf94dc6981b305286e42d7f8d406f8c6e47362cac92a5674975642e8d2535f0cf6e685db9d918c5
 EBUILD shorewall-init-4.5.21.7.ebuild 3132 SHA256 70ab6fa401f6d31a30a7f54034552ae585c947d90909d461865a098b846b26db SHA512 398510d555a64e09b99062e43493fa5903c2cb18b863d2645846c5a65c3d7475a8ecd9d5fdee1a312f9f5ac91bdf2034c479144d151f87f98b90d8b86c63e619 WHIRLPOOL 68f7b47281f5e9c106f36ce8399c7a22f9ddcf5e445ad61ca1f4fbb777d9a15ce70481bb1793cec62f134add95be85ca765f450465e293c9629729192601bbd0
-MISC ChangeLog 1549 SHA256 5e43c8a41cf4d72ef968b8daa7a2129281791b3dbeac6b37df7ee89022448611 SHA512 b185f949618e9012e6a7a65be19e0c51ac034014a63b7b585313cfcce74a59d0a4d8d4df04796122d9e2b16aff774c2e30342510f6e9edec23b6ae7ca60a2fba WHIRLPOOL 081fabe1b44f50a6228b3d38594922839ab3d5bc90a0de58accd62d503912dd66f11c17f7cfcc2a760293e9014c660b4a252e6d493333eca843540cfbf1cd9c8
+EBUILD shorewall-init-4.5.21.9.ebuild 3081 SHA256 7dbe1322122fded6250a9a5d2845f93f9a9854b32c523865b919ccb6405c1d00 SHA512 6d0d55a74cdca73770710253602a6a3f7bdc9bc20d7406b003ceac699122d5bb59be472ed454b346b8a14a15f2e0fef8160dd0d3181f50920c35fa7362b71d21 WHIRLPOOL c4910e0d1cb17f0c4ea8eb044fb1b15008f0e88e7fb730f0d90e80f4d11e170dfe17869c7ec0e0aef70b0b55d4cbbb0a49c83b7641b50beaeaf8978c8df376f9
+MISC ChangeLog 2546 SHA256 0a39e90e6abb1ee355b138df39b1fcd6a96fb64cc572892a306e290ba112dc59 SHA512 905656d970df9422af878ab8c48d56c60bab56601c1afcccb01f5204ea26a75fc974a24eb78873224d22c96ceaca9a3c489c76b8b7e26acbc01b0e600a253d11 WHIRLPOOL 8acd7d51a77d6c3493542b6eb6ac9dba31af5109d49a6adb19d148b688d86fd0f6870745739d5ce5e01d7b49d0cf7451a09bc1d4546e633d3618e1d5eff00615
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTJNujXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTW3x0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun881skQAIBK6im4H81vL0/dsA2CzTPt
-9WWnVhoXfggfGWhoXIKQNcYfJTafE4WMoxZDiUGkc5OyoG8chcl5xx2+0mlQm+gt
-7nOqaqbEtJxaU5ISsvrMJXxd/hup5B6LDUWiBQCBjWMSErgqIdVxRDNjkakHWF9/
-2ukZ7+3UrrknPpnmMrJPJ2bl33+uWZ+G9pp0N3EkKWOwJnMwlK1VGzHQwxnPvKbW
-fRRTv/E6nSgbZtoI0Zjt5jID61QFV+zYbY8U3RkWDAmxpEyIOUVK4AG63KDD36/H
-ISxHIIEyMYc7H7iKSGQJpnOXOQuJJzYlfMdMglvbe39yEDiPrPPwmFIihnXSgUQ7
-3jo5QaVSnvFr2/eraa26jgAFe42zRC7v2NwBJpWR4RWcshZdweAf8pqqDOSAEpbE
-ucZwUi6k3S72CpsP1SwSZzpNtDgZIMppzhgVkOOI2PxKb/s4/ccDKVaPo9bfaIWa
-h+SAE4bWp2EN6QM+YqZ+NgNjkHsT5BmUOOW0/ERNhfpYBP7+oQQtr/qTmf5VeSD0
-USvGRHQzRmI9NJGFuSo0M2v9ohE+gcvlKksf4DMvevs9yjmHnGOCwbOs0BXV2LLe
-06l0d/HdqOLQRYh2rOuqeBx1IFikgPFH/6of9544Ww07xiVl6fH5pNi6AirDvEFm
-e8pfF8qte9tYRStmIsYO
-=uIAD
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun884z8QAJz0PSNn9z1dlZH9CPLHlrke
+pKphal0uXnfN8MX0VVOtqpewMv/MbvcuVutbv7zc3IVD1CZvmRTDvPkLZdEN8cg6
+D+v4DlFpogDlLakh8QpBvKmDbfFkxQGMfWhoM0AKojji///kK+GLw/8+rQOu+QRz
+9XXCRjcfTv5bFwrfNnULz8CRMNzRfqHkuH4LVfOWfzKlSS4Fx0+9Y7O5LJx+iHgQ
+vCxP4aPJb7xGgYfyTaKr5ejdvf1TV/73mSGTjCQgYuqgYYr5qaQwBGObuFh5x0sP
+itBPIkw5j8h3SyhHbk2vetoP3Yzveu2e879VUJbxCzaOftFQPQxoa//iMkG17oN/
+eyMzdbeEfIRYDTH3k/YM+JAiTU5CeaI9XAieWIKwTt//I2kEvOSrBiOKk9Rbkk6a
+FOOOEOkOsRjtC5TCdlydqh2ZlEj1aUiBv8VMM6+fsKiISMRcfnhIjzRHy+rOMJtW
+IERQcfnZcHluKWEe6rJh7WmAKP//vqO6AIhiIl+sETMlmHt0arxJeD2PawjZ5pNv
+eAM1ms70tJTJXDrfyVkezmZXy8NMs/+0W2uGhtVCP1C6aHYtKfu94UVXBOL2yx+h
+Q5ITBgDZK6lMAHgdJT2TK87wy6rSKqIl+jl92S/SVh3c/7hDu0zBuoXPC4gHu0hM
+pM6If4Wgju5a2PB34rwA
+=1UIZ
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-init/files/4.5.21.4/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.4/01_Remove-ipset-functionality.patch
deleted file mode 100644
index 620e479f92fc..000000000000
--- a/net-firewall/shorewall-init/files/4.5.21.4/01_Remove-ipset-functionality.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- shorewall-init.old	2013-09-08 23:25:36.364924304 +0200
-+++ shorewall-init	2013-09-08 23:29:27.418736392 +0200
-@@ -79,10 +79,6 @@
-       fi
-   done
- 
--  if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
--      ipset -R < "$SAVE_IPSETS"
--  fi
--
-   return 0
- }
- 
-@@ -100,13 +96,6 @@
-       fi
-   done
- 
--  if [ -n "$SAVE_IPSETS" ]; then
--      mkdir -p $(dirname "$SAVE_IPSETS")
--      if ipset -S > "${SAVE_IPSETS}.tmp"; then
--	  grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
--      fi
--  fi
--
-   return 0
- }
- 
diff --git a/net-firewall/shorewall-init/files/4.5.21.4/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.4/README.Gentoo.txt
deleted file mode 100644
index f7b13fed3de6..000000000000
--- a/net-firewall/shorewall-init/files/4.5.21.4/README.Gentoo.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-shorewall-init from upstream offers two features (taken from [1]):
-
-	1. It can 'close' the firewall before the network interfaces are
-	   brought up during boot.
-	
-	2. It can change the firewall state as the result of interfaces
-	   being brought up or taken down.
-
-On Gentoo we only support the first feature -- the firewall lockdown during
-boot.
-
-We do not support the second feature, because Gentoo doesn't support a
-if-{up,down}.d folder like other distributions do. If you would want to use
-such a feature, you would have to add a custom action to /etc/conf.d/net
-(please refer to the Gentoo Linux Handbook [2] for more information).
-If you are able to add your custom {pre,post}{up,down} action, your are
-also able to specify what shorewall{6,-lite,6-lite} should do, so there is
-no need for upstream's scripts in Gentoo.
-
-If you disagree with us, feel free to open a bug [3] and contribute your
-solution for Gentoo.
-
-Upstream's original init script also supports saving and restoring of
-ipsets. Please use the init script from net-firewall/ipset if you need
-such a feature.
-
-
-[1] http://www.shorewall.net/Shorewall-init.html
-[2] http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=4&chap=5
-[3] https://bugs.gentoo.org
diff --git a/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.confd
deleted file mode 100644
index 4ca0024579f7..000000000000
--- a/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# List the Shorewall products that Shorewall-init is to
-# initialize (space-separated list).
-#
-# Sample: PRODUCTS="shorewall shorewall6-lite"
-#
-PRODUCTS=""
-
-# Startup options - set verbosity to 0 (minimal reporting)
-OPTIONS="-V0"
diff --git a/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.initd
deleted file mode 100644
index 3c6a3116ea02..000000000000
--- a/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.initd
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.initd,v 1.1 2013/12/02 19:58:42 constanze Exp $
-
-SHOREWALLRC_FILE="@GENTOO_PORTAGE_EPREFIX@/usr/share/shorewall/shorewallrc"
-CONFIG_FILE="@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}"
-
-description="Puts Shorewall in a safe state at boot time"
-description="${description} prior to bringing up the network."
-
-required_files="$SHOREWALLRC_FILE"
-
-depend() {
-	need localmount
-	before net
-	after bootmisc ipset tmpfiles.setup ulogd
-}
-
-
-. $SHOREWALLRC_FILE
-
-checkconfig() {
-	local PRODUCT=
-	
-	if [ -z "${VARLIB}" ]; then
-		eerror "\"VARLIB\" isn't defined or empty! Please check" \
-			"\"${SHOREWALLRC_FILE}\"."
-		
-		
-		return 1
-	fi
-	
-	if [ -z "${PRODUCTS}" ]; then
-		eerror "${SVCNAME} isn't configured! Please check" \
-			"\"${CONFIG_FILE}\"."
-		
-		
-		return 1
-	fi
-	
-	for PRODUCT in ${PRODUCTS}; do
-		if [ ! -x ${SBINDIR}/${PRODUCT} ]; then
-			eerror "Invalid product \"${PRODUCT}\" specified" \
-				"in \"${CONFIG_FILE}\"!"
-			eerror "Maybe \"${PRODUCT}\" isn't installed?"
-			
-			
-			return 1
-		fi
-	done
-	
-	
-	return 0
-}
-
-check_firewall_script() {
-	if [ ! -x ${STATEDIR}/firewall ]; then
-		if [ ${PRODUCT} = shorewall -o ${PRODUCT} = shorewall6 ]; then
-			ebegin "Creating \"${STATEDIR}/firewall\""
-			${SBINDIR}/${PRODUCT} compile 1>/dev/null
-			eend $?
-		else
-			eerror "\"${PRODUCT}\" isn't configured!"
-			eerror "Please go to your 'administrative system'" \
-				"and deploy the compiled firewall" \
-				"configuration for this system."
-			
-			
-			return 1
-		fi
-	fi
-	
-	
-	return 0
-}
-
-is_allowed_to_be_executed() {
-	# This is not a real service. shorewall-init is an intermediate
-	# script to put your Shorewall-based firewall into a safe state
-	# at boot time prior to bringing up the network.
-	# Please read /usr/share/doc/shorewall-init-*/README.gentoo.gz
-	# for more information.
-	# When your system is up, there is no need to call shorewall-init.
-	# Please call shorewall{,6,-lite,6-lite} directly. That's the
-	# reason why we are preventing start, stop or restart here.
-	
-	local PRODUCT=
-	
-	if [ "${RC_RUNLEVEL}" != "boot" -a "${RC_CMD}" = "start" ]; then
-		# Starting shorewall-init is only allowed at boot time
-		eerror "This is a boot service, which can only be started" \
-			"at boot."
-		eerror "If you want to get your shorewall-based firewall" \
-			"into the same safe boot state again, run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} stop"
-		done
-		eoutdent
-		eerror ""
-		eerror "Yes, \"stop\" and not start."
-		eerror ""
-		return 1
-	fi
-	
-	if [ "${RC_RUNLEVEL}" != "shutdown" -a "${RC_CMD}" = "stop" ]; then
-		# Stopping shorewall-init is only allowed at shutdown
-		eerror "This is a boot service, which cannot be stopped."
-		eerror "If you really want to stop your Shorewall-based" \
-			"firewall the same way this service would stop" \
-			"Shorewall at shutdown, please run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} clear"
-		done
-		eoutdent
-		eerror ""
-		eerror "Keep in mind that this will clear (=bring down)" \
-			"your firewall!"
-		eerror ""
-		return 1
-	fi
-	
-	if [ "${RC_CMD}" = "restart" ]; then
-		eerror "This is a boot service, which cannot be restarted."
-		eerror "If you want to restart any of your Shorewall-based" \
-			"firewalls, run"
-		eerror ""
-		eindent
-		for PRODUCT in ${PRODUCTS}; do
-			eerror "/etc/init.d/${PRODUCT} restart"
-		done
-		eoutdent
-		eerror ""
-		return 1
-	fi
-	
-	
-	return 0
-}
-
-set_statedir() {
-	STATEDIR=
-	local VARDIR=
-	
-	if [ -f ${CONFDIR}/${PRODUCT}/vardir ]; then
-		STATEDIR=$( . ${CONFDIR}/${PRODUCT}/vardir && echo ${VARDIR} )
-	fi
-	
-	[ ! -n "${STATEDIR}" ] && STATEDIR=${VARLIB}/${PRODUCT}
-}
-
-start_pre() {
-	checkconfig || return 1
-	
-	is_allowed_to_be_executed || return 1
-}
-
-start() {
-	local PRODUCT=
-	local STATEDIR=
-	
-	for PRODUCT in ${PRODUCTS}; do
-		set_statedir
-		
-		check_firewall_script || return 1
-		
-		ebegin "Initializing \"${PRODUCT}\""
-		${STATEDIR}/firewall stop 1>/dev/null
-		eend $?
-	done
-}
-
-stop_pre() {
-	checkconfig || return 1
-	
-	is_allowed_to_be_executed || return 1
-}
-
-stop() {
-	local PRODUCT=
-	local STATEDIR=
-	
-	for PRODUCT in ${PRODUCTS}; do
-		set_statedir
-		
-		check_firewall_script || return 1
-		
-		ebegin "Clearing \"${PRODUCT}\""
-		${STATEDIR}/firewall clear 1>/dev/null
-		eend $?
-	done
-}
diff --git a/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.systemd
deleted file mode 100644
index e48a729105b8..000000000000
--- a/net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.systemd
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=shorewall-init
-Documentation=http://www.shorewall.net/Shorewall-init.html
-Before=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/shorewall-init start
-ExecStop=/sbin/shorewall-init stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-init/files/4.5.21.2/01_Remove-ipset-functionality.patch b/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch
index 620e479f92fc..620e479f92fc 100644
--- a/net-firewall/shorewall-init/files/4.5.21.2/01_Remove-ipset-functionality.patch
+++ b/net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch
diff --git a/net-firewall/shorewall-init/files/4.5.21.2/README.Gentoo.txt b/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt
index f7b13fed3de6..f7b13fed3de6 100644
--- a/net-firewall/shorewall-init/files/4.5.21.2/README.Gentoo.txt
+++ b/net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt
diff --git a/net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.confd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd
index 4ca0024579f7..4ca0024579f7 100644
--- a/net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.confd
+++ b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd
diff --git a/net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.initd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd
index b5030439549c..be652deec1db 100644
--- a/net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.initd
+++ b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.initd,v 1.1 2013/10/26 18:39:51 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd,v 1.1 2014/04/26 09:30:51 hwoarang 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-init/files/4.5.21.2/shorewall-init.systemd b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd
index e48a729105b8..e48a729105b8 100644
--- a/net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.systemd
+++ b/net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd
diff --git a/net-firewall/shorewall-core/files/4.5.21.4/shorewallrc b/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc
index 46f5eb9a3603..46f5eb9a3603 100644
--- a/net-firewall/shorewall-core/files/4.5.21.4/shorewallrc
+++ b/net-firewall/shorewall-init/files/4.5.21.9/shorewallrc
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.4.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.4.ebuild
deleted file mode 100644
index 6ce588723c88..000000000000
--- a/net-firewall/shorewall-init/shorewall-init-4.5.21.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.4.ebuild,v 1.1 2013/12/02 19:58:43 constanze Exp $
-
-EAPI="5"
-
-inherit eutils versionator prefix
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-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)
-
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time prior to bringing up the network."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/coreutils"
-RDEPEND="
-	${DEPEND}
-	|| ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	eprefixify "${S}"/init.gentoo.sh
-
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	if [ -d "${D}/etc/logrotate.d" ]; then
-		# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-		# so we don't need a logrotate folder at all
-		rm -rf "${D}"/etc/logrotate.d
-	fi
-
-	if [ -d "${D}/etc/NetworkManager" ]; then
-		# On Gentoo, we don't support NetworkManager
-		# so we don't need these folder at all
-		rm -rf "${D}"/etc/NetworkManager
-	fi
-
-	if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then
-		# This script won't work on Gentoo
-		rm -rf "${D}"/usr/share/shorewall-init/ifupdown
-	fi
-
-	dodoc "${FILESDIR}"/${PVR}/README.Gentoo.txt
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/conf.d/${PN}"
-		elog ""
-		elog "To use ${PN}, please add ${PN} to your boot runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} boot"
-		elog ""
-		ewarn "Notice:"
-		ewarn "${PN} is more like a start script than a service."
-		ewarn "Therefore you cannot start or stop ${PN} at default runlevel."
-		ewarn ""
-		ewarn "For more information read ${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2"
-	fi
-}
diff --git a/net-firewall/shorewall-init/shorewall-init-4.5.21.2.ebuild b/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
index d02cc647b3d5..3d0c71b4fe87 100644
--- a/net-firewall/shorewall-init/shorewall-init-4.5.21.2.ebuild
+++ b/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.2.ebuild,v 1.1 2013/10/26 18:39:51 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild,v 1.1 2014/04/26 09:30:50 hwoarang Exp $
 
 EAPI="5"
 
@@ -30,7 +30,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="sys-apps/coreutils"
+DEPEND=">=sys-apps/coreutils-8.20"
 RDEPEND="
 	${DEPEND}
 	|| ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} =net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} )
@@ -81,7 +81,7 @@ src_install() {
 		rm -rf "${D}"/usr/share/shorewall-init/ifupdown
 	fi
 
-	dodoc "${FILESDIR}"/${PVR}/README.Gentoo.txt
+	dodoc changelog.txt releasenotes.txt "${FILESDIR}"/${PVR}/README.Gentoo.txt
 }
 
 pkg_postinst() {
diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 5ca9f2342b3d..1a343edfa3c0 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.148 2014/03/23 18:01:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.149 2014/04/26 09:32:38 hwoarang Exp $
+
+*shorewall-lite-4.5.21.9 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/4.5.21.9/shorewall-lite.confd, +files/4.5.21.9/shorewall-lite.initd,
+  +files/4.5.21.9/shorewall-lite.systemd, +files/4.5.21.9/shorewallrc,
+  +shorewall-lite-4.5.21.9.ebuild, -files/4.5.19/shorewall-lite.confd,
+  -files/4.5.19/shorewall-lite.initd, -files/4.5.19/shorewall-lite.systemd,
+  -files/4.5.19/shorewallrc, -files/4.5.21.2/shorewall-lite.confd,
+  -files/4.5.21.2/shorewall-lite.initd, -files/4.5.21.2/shorewall-lite.systemd,
+  -files/4.5.21.2/shorewallrc, -files/4.5.21.4/shorewall-lite.confd,
+  -files/4.5.21.4/shorewall-lite.initd, -files/4.5.21.4/shorewall-lite.systemd,
+  -files/4.5.21.4/shorewallrc, -files/shorewall-lite,
+  -files/shorewall-lite.systemd, -files/shorewallrc_new,
+  -shorewall-lite-4.5.18.ebuild, -shorewall-lite-4.5.19.ebuild,
+  -shorewall-lite-4.5.21.2.ebuild, -shorewall-lite-4.5.21.4.ebuild:
+  Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   shorewall-lite-4.5.18-r1.ebuild:
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index 46a7f12c6124..00018c22ba4d 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -4,58 +4,42 @@ Hash: SHA256
 AUX 4.5.18-r1/shorewall-lite.initd 2169 SHA256 0cb07ea957fca5feffe7956c30ef2bec5748c8d016845c05d0fd1adbaea6bfb8 SHA512 4e537f1fdf5a6fdd609b36d588cf9440cb5aa58076e9df45d286ff5c2e2b7d9f231cdc5effbe03ffcbaab5e2d0b6bed392ba4fa441c74288d9f9d0554bc6bb6d WHIRLPOOL 5378dc4c019b881095ac562b1e77cfaff96497f3bb005f8538f2ee290b41f53aed0871625c8eda8953d5e05215ed40158099c670fddecddda4eb4abca2912983
 AUX 4.5.18-r1/shorewall-lite.systemd 472 SHA256 9958fae5cb6b172f764e7cbb91991cb37e608453e161ce9f10ee3e5013932e2f SHA512 219a60a720224ef305eec288032983f68c43aa98528b6d84684fc1907bc97f0b0ded9b3edc16cbab48338b640206fabdac5fa1520d3a0f588d717559dfe6c11f WHIRLPOOL b6a91090d44d05e2b999b0c82b624253a4a67321e96800201733b8aa7a731d5de2a7e63fc378100687560f0ff5526ef91bc5f485049ad006491b074855638f1a
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
-AUX 4.5.19/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.19/shorewall-lite.initd 2267 SHA256 6f4a60e75ed61290918e776e8556b1009b687aca9d86542d8e780b5b33472b5f SHA512 c1424571594e585e48652ce9ac1b602f4763f7494e58d6d981fbd8a14f0193c6f52510e38225a70d0e8f74b6171f1a319ad89ae6682674384d74509fbc22fb62 WHIRLPOOL 8be4243da4f6f81f1f50807593861c3fc34e4857df50cb1ebb12deed74262050d0bb63a47b7b9c83597063a881eaf9b01b923478ca3b50fe3aa69ca9e28022fb
-AUX 4.5.19/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
-AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
-AUX 4.5.21.2/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.2/shorewall-lite.initd 2269 SHA256 bcd67280a02e58be7160907bda593db61d945bc107d1f8da75d6b1500ba3c9f9 SHA512 d2921f1d0db697679419219e6323702847573345c3d6235403c42b55cf45d432fc893f508f31c8d574e6885d9b7eb12d885fef87a07069b96677a78a9c114dd3 WHIRLPOOL 686ac034258128a4c1eaaa51c44ab8a8e7c79a2c4b0169fa3be53cf6ac3f256bc2e2f927d6b9271dd86857d505c9bcaebf04ed54e4ed785819d8f254da28c14b
-AUX 4.5.21.2/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
-AUX 4.5.21.2/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX 4.5.21.4/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.4/shorewall-lite.initd 2269 SHA256 8227c0a9045a11d92185f9980b7e2b1e522e3512311024475a78063278cad340 SHA512 05796103ca7ff06283409275af8f46fec0b4403af4cd2e83cf93e448df28210a51e0e6627cedb4b09e1764e8e6047b0265f1a5c1a89cacc2b20156f84385c60c WHIRLPOOL dfe9c04aefc4b613cb03eb22c7bd1971bcf086630d52ff4c00ff253ce3b98812bf5afdcbe4c4b31264851a544a68b6ef3c65b89490280852e17e7468e852c297
-AUX 4.5.21.4/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
-AUX 4.5.21.4/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 672 SHA256 2e8e88602618a8743da26400efa6f03dc35895f1f4fb85eee588b3455736d313 SHA512 c256541844cd6ef91b2143426fb8e377a6429428d9ccdd451097b306c72514f7783183cc5de8cd2afccd30d4e4708b533ad53cd5e5b7d9a2dfa3dbca16df7636 WHIRLPOOL 97ed911bd6d8a862ef0e4b66939c594aa6f5d276444dd12363a7f2a413f0b3b9b65fc977a419452046379101cf2a75f07c0df0414d041badadb91971bb0c42dd
 AUX 4.5.21.7/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall-lite.initd 2268 SHA256 5229e81106b30a16ae734bd8c4650c52802bef2ef43ae79df1af53720deb8e3f SHA512 da05ffb087abddd6b28125e1f7132d665ebc9f733582a26ebe1222c62a6d8ed178c665e9103ccecf7a79277a397be0199d401083f9e06eb8dcee9003302c7b18 WHIRLPOOL e302812eca3dbf8828db3b323300136394b95a9d7f8dc8756c9cefd2a84aef1ffaea9101cd0a33e9255794b7d343060d288cd720a4463dc891478c7884a43d4c
 AUX 4.5.21.7/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX shorewall-lite 1788 SHA256 98d1fe31a2a190ed671e9b1aa21b17d659bd66f7befccaf06c6e7e1e24f9a67a SHA512 e7ba286ea90b5d2f9f7fb3d95536ddf411aaa111138c009c813d4b8837f5cb8bea2b8c7da8433f047f699dbedb264eefb6fda8a56e6a078344f354256e5495ed WHIRLPOOL 2e78e1bc70ba400cd34ed884da31d42ce1c1b15da31e4f6614563f17847d90e7e536ae348a1a9b92a817d9add01a47c4866aeaaf4ac39e15d93eb378127204c0
-AUX shorewall-lite.systemd 472 SHA256 9958fae5cb6b172f764e7cbb91991cb37e608453e161ce9f10ee3e5013932e2f SHA512 219a60a720224ef305eec288032983f68c43aa98528b6d84684fc1907bc97f0b0ded9b3edc16cbab48338b640206fabdac5fa1520d3a0f588d717559dfe6c11f WHIRLPOOL b6a91090d44d05e2b999b0c82b624253a4a67321e96800201733b8aa7a731d5de2a7e63fc378100687560f0ff5526ef91bc5f485049ad006491b074855638f1a
-AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
+AUX 4.5.21.9/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.9/shorewall-lite.initd 2268 SHA256 03d574c26e35b33bed7f035cff2242c0f199f3824d4c3ff1a05a1ecd961c1c8f SHA512 bbf8d727c58c5dd678225dae8877d099c7c170cb22e67fb64219663f4e29cb5d524b2301aeb48935af59b2d77f26980d3d8898ec327e06fd748a75035e21ec17 WHIRLPOOL 2a5ac5315d6279f33ac60c6a5fd7d1c647ad4e8c051ee3398f95e6867759d1b684455b0e1332ad4e1ee03a93b5b1bfd5d7cf5da74d5acccefcef6b61b8a54067
+AUX 4.5.21.9/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
+AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
-DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
-DIST shorewall-docs-html-4.5.21.2.tar.bz2 4144789 SHA256 b4cfdcb84525a3df1430c71eba4c1f86378d96283c250d8c2a9d81ac921bef88 SHA512 57a5dce628301a043110a28874dc73244ac8aedb756c62bdbc9ebc66ba324c989debc6dfdc6e9f19538356b60230d88b708fb9562cb9016783d41d9efbdb495a WHIRLPOOL fce6eca901c7444fe05cbd72b59aa836967de19bccbba3335b74b05e220ad297da15451d853188d5dc65276b13af70c7134eb17a0119dd695e571fe23ee71b07
-DIST shorewall-docs-html-4.5.21.4.tar.bz2 4144800 SHA256 92167814eb92f2b7d0f3d94ea16542ad946f566cfe44b86ff447cd11c75391c4 SHA512 e65836162fe376da9f992b90e839d8ec5d3d1213449dce7f97f04e93fa1b2d52ce0acb2741be68eafe6101fceec9bece767d870d67beb48709de5421ea175c4e WHIRLPOOL d3c353735099677b084a8ca6b8aaeb802f0acb0aadb7e3f8bf6fbe27dedc388affc1a8113b383b055f3ef89e2b441bfba3f564a4ad16412d8bdd216277879693
 DIST shorewall-docs-html-4.5.21.7.tar.bz2 4146237 SHA256 cd7de8343924828cea0959496a96f830086421d8583783158a80ba0900ae021d SHA512 4a945aff7d03b726ca14cc9f0bf9b1d42d06ea670f7aa917bb3ec085eadc3dee004582228702885b3d6ed56bf24e291bd7cae03e327e2dc9c8d7dc616962ddc7 WHIRLPOOL 09fe3c7f532a3092abc4aede6bcd62dcda962de4e9ad4179797a0e653e971fe3e8199f751fecd9cacb35f03ba69d8eb4664e8faea215538ebc40dc7bf50c1ada
+DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall-lite-4.5.18.tar.bz2 73702 SHA256 b66680361c527ac710d33d643f4c233ab8e754e7916de0891a863ca7a973d03c SHA512 de181f2878402bb86b550bcfd4aaa86d874ef8be2674d145052322c80499bcc4691086a2b09612a0228de7d1c9e75c335ac99dbc63dcc0d5c8c2fc305f377be6 WHIRLPOOL cd29da8106f7fb2faa84e07fe2a2fa7e080a36db15c04b09926855a7735310c20e4c29f26695bc3c1dbc91b2c262223b8f83341018da2fa91fad1f8edc99a026
-DIST shorewall-lite-4.5.19.tar.bz2 74489 SHA256 f5d1e8f2ae4b42461e5b414b52b4ac6614a144e4f6ad211b025f94716f898aec SHA512 c7d1edf2bad8c5ef4cb51fd5ef1d2dddd6bfc4d5d984b85b6fe8b6686a762bdd888c3a7dc2f7ce21cc6e7e217f51e7f5c00d534d7ee2b7bddcdfd534f936768e WHIRLPOOL 0d61e9648e4b34ad58d942cbb4e7e38d2551f877cc82cba7ea64f72362010067b2d663b984c052acdb9c1c544f184abf42e51b9e6797adcacaa8fa9064e5aaed
-DIST shorewall-lite-4.5.21.2.tar.bz2 77966 SHA256 d1cdf423e60eeaa6bd7a40563b6e4b27610278bc1307d9b82e5fd43ef6c4ad44 SHA512 107ecfb404ec0a98097ebae503a48d5acd8dec62788d32158cf2433c2cf4471a1a00b5b39d4f23bbde60e692fa7caf701354373fbe76c5c2cc0278493386d83b WHIRLPOOL 11f91fed283673fe000710811727930c7df2cfd9660fb54db46a3d13c25ffacca86a899bc771d41a490b7a281db7a8909fb58f427e5d6fb8caf119b792b798a7
-DIST shorewall-lite-4.5.21.4.tar.bz2 78539 SHA256 ffa2ffec59f33a609949bf61d6b75863dae52c124704109b75283a7aac326225 SHA512 9a87455036e81cc2e2a4f3a8f9fa2adab504cdbcb0a0afb86d76481e36a882cc3cd7b1c1f61763c37e007b9386d3e9fc1f2e7342a0e0ac16469e064638533744 WHIRLPOOL 2079b8c69a67bedad253da2830317b8ad70962e04c9ed8859a0d83f1ddf5b507e798428ec6d40c8187ccbbb4a321e94b6316cf56eb69829e8457d43b6ecedd64
 DIST shorewall-lite-4.5.21.7.tar.bz2 78771 SHA256 7dd14965cb0de08271f5852458287145e48b5ccea92c33206847ff4a5e2aaf84 SHA512 7d6b145dad4001c5cf1f295a6a7fee6677a1d2ab84e3c848159c2896ccbc068d05499d6f08d0e4452617a578781c576c495997ff89761466f1cc82e86533d299 WHIRLPOOL 14b385944b5a7be25050d930deb39a3d7721257397f71adba51b5f1098e220450e2f26d9ab03dcfc9a0bc15f6e0c50659e215c53de9199631ab8e6154c056bf5
+DIST shorewall-lite-4.5.21.9.tar.bz2 79121 SHA256 af6c039d880581a6eaf7aba9f638ff86e471567b15e16adc607053651d1f50f5 SHA512 fb15881dc4d5fd05c8ca8421ee4a5deb0c9f6fdab955d0fc7dd371bf710706bf6d851bdb8ba00d0d34c1f7f1d2bc2cc39e9e9fe0a6d8b48ed4accc27c011462c WHIRLPOOL 2f8eb61da9b3eafdd184718054d14dfdef39afdf6e3724ee62c0386f12ea3aa3badcf959ee0351f8cdcd744cf4b262e168e5cd6afa677a8674d515541f0f2f80
 EBUILD shorewall-lite-4.5.18-r1.ebuild 1730 SHA256 94301e9ac96ffee58b3e5eb1b441db0bb5a1e8ec223bf21e3ffb797999584b9b SHA512 f43851e1165a2c6c57308b8325cfc6779d7fbf7f18113893628f8f6d4162cbee858c26f8f4eba2f77bc4bcfee9c862d976d601e12c3769fa48df06a25cb00218 WHIRLPOOL 436cfe0d0cefbdecf8fda87bdf00647c02b5b4e9c12f475effca166bf815b47ec93319c365852ba6a300fe5b7339b404cb03400c222ca3109d5d16cedd77d37d
-EBUILD shorewall-lite-4.5.18.ebuild 1499 SHA256 132580bd50bb8c41b4cf78a7918a4fe2efe4c9d51560c00de4806aedb828af75 SHA512 9e5b470129fdce4a6b060456b711e8d60f54a2cf2531deb7b0df9c566194075db6e4a4254c6484cb799a2dc4115d6f3d5374e6f01763bb3bc8936e2ddcfe608d WHIRLPOOL 3be3ab13d1d30c414559a9e83ed99efcce89f9d839eb6a95e66266186a270b1adf0e4ee7c7571c1da8719d0b442ab7947890be69f982e9f908d96d11bf45f1e3
-EBUILD shorewall-lite-4.5.19.ebuild 2693 SHA256 dd25aa829df0951166104c7215f453054d249b8f3b2fdc9505783ab76039ce1a SHA512 a79983efdaca8e1285e03541fb63e1bf375494340d38132a5106a89e65e15d7cc34526a7d0ee6805a78d5d08b3b0a7989a49177b5a32f75b4015a495ce372bac WHIRLPOOL cde182feea22895f512ade2fa0deda207e7156dadfc5adf3343e1036fba70143852a13dfb2faa666df69e2c2d66e99b353d8ec5aab12601de35f858729ba7bbb
-EBUILD shorewall-lite-4.5.21.2.ebuild 3058 SHA256 fd815bc4ca39d0e5a4d61b474c16de22e59f8c6c9e10f8a9815293c07f34a6ea SHA512 4a3297dd6d474312c8d72f5b9ad2b050d1b37db7c8d533818379c9ecf0d00c847c241a6a64ce16a0ef6e5ce49c9ae08ddff52379877289cfdc453836fec21429 WHIRLPOOL 1427e6af53c965d464c4b437623dd0a7f74907251179853d76e9d5b00d3c146e9c1e0e61214cb914a24b100947d89687e5987482ac05c588e3b304ba52fcab3c
-EBUILD shorewall-lite-4.5.21.4.ebuild 3058 SHA256 37da513e42083df938988f27924ba635953b9906ff2cef1e868bef29ed548188 SHA512 d73c5f480c772d63795abbd7f5d2ac427fb5464135c8c80ef4657f5c692b53ea6ab2ef3564b6a8b3150917d31b9a0b86243925e4e417c834861aebeb8f712ea3 WHIRLPOOL 381ee48fa1d2411bec01a939106015771773f06bf319c28b022bb816d436892090e4ec71e3bf2d4331cea7e6eab2bda42ecbab12065a45497278f7a98b4c7b83
 EBUILD shorewall-lite-4.5.21.7.ebuild 3117 SHA256 1a8880eca7f48cbdfd515221e514f7da493dd884b125d7268c07ff6edcdc2a4c SHA512 f0a0c4a78225d3bb6dbe8bdf02634b2d2bcd98e61eb45ff7f7882f6fc7558789d79fcfe768bf04341ecef8973b991149f8e7854c72df2b781917777372f28876 WHIRLPOOL a4f234ef189e4d7d770de6f507a33ea13bff4be2c8f170d3a53b0c10845bcfb29d8c02f1fe2f4495c88a594630298f8af805c3a8f7f229c837e8789d3676359e
-MISC ChangeLog 23695 SHA256 78a920e34231458915fb8ccb0a214dbf53be323fe799378cc57185154c29733e SHA512 614a1c561d42b81aa3bd02130a4486b3cbfbd3a3a69e23d42d96540f62a33636bf3f722496ec045b289afbc80c63336299c6c7da7bc599e87bb6b162f3bb2a7e WHIRLPOOL 8d4324eb522044debf5eeadd47a00e28ce77310876fef02ecc00cf475428c3c96538e255b3efb21c1461ccc42aae11137768f1b13297930f875764bfbff2eb25
+EBUILD shorewall-lite-4.5.21.9.ebuild 3065 SHA256 edac32bf1cb83f1184c30c9ddd8c77b9c01f3956a093fc554670a88cea3defc2 SHA512 2bac160aee753ca2018aeb17337ec3f3740f7941cf1018607ce927af25a647612693a0e9865a671ce82341b2a35c68f235e41c73279ec12a61649135b2f28baf WHIRLPOOL c840c9b892976af2c5a05e12a46f7c319ba6a8537a8059f323d2205fa01100cf1e0b77cce2cf03b58f881b456bef2da7c6dfa35a434555276aef24117da3d19b
+MISC ChangeLog 24708 SHA256 651996ae379ce6949f713395a56da10feb5a556b9aae9a460e5e0a9ed911014e SHA512 f793d8527a57a528e6902a8a9a68ed4c1b1dd7feee48e8700c192825004df65ee7ed3fc402fe5a72fdbd878531a0c61782568e41e686697ef4a031fd54032352 WHIRLPOOL ed7357ceafbe6de33fc9963b6a622787306e8bb2643e47116c37f0eb82c9a3e96f33cae0d048dabc1cdb7f755e997243e31d3775ba6042e2aea7e25e846adead
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLyGNAAoJELp701BxlEWfvaAP/0C07lyRtAsU5lm9GxXJISW0
-e0747pNGFmfHA/7Mjv12LyCkQQP3XqT3i7pCUpYiFeUat/FxTnYPj/w4is5u10ox
-S+glNRQnNafj6ISiF4kQ5XxGx0DWPeoYmrQnFD8enPr5H78awix+LYRC/fP8m170
-cxGW8xGue7rXgFugU/8JlZNI9vbZEQZwwjEXf4KMyYREcvcXIKFEqnv3F4UYvYal
-0DlIgpGhPOqlD0EMAnC8+IuJMZFmGsVHc4mnxgEaM/9HKq1FFWuH8/aIUrOZ0eLN
-Klm/Dn0/oE+fhsb1DkMpHS4t6JZjW5SPpVuJCo/vGT11rlmMRqaCWFPJAsoB9usY
-lj7C/qQyeCJHL2AY4A1cJotaurzqrFWgXSpUm/yw8loa1uRwuivlbAfWQcR5/JXj
-ian3i3YXpVoBA7lHSW2KjWrYI0cLKdE61uYo5kNpU4aH4sBB/FWGSRtWJj5dy+Tt
-pEv87J9ukkm1+FkFKbwAhuQQ7orR02hFowgOPaC8LaTFO7Zh8Znoub7/NZ4EPwDw
-Gp8ykx+R6ohdhZVGchY3A03REqGaPlWjiVStfF5pVm1CLoSthKqKN0fVePpPryzq
-N7Nhriy6Zof9PfWLeCymbDW2891DnMvnQXZYLoM+T4w+kyLeBjNiDhRT1K3I15/I
-5gxzSEsLj8BPVTq0foXh
-=YjfS
+iQJ8BAEBCABmBQJTW3zfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88wdwP/1l5G4danZr2Vtsm/YjfyEfG
+j8vsXYreLQfG4qFCtBe69DfapMVA8qNHw9HnUu3cnuKnL4BmpRgd9VJmI+5zmF6Q
+SDZoHuXHum8T3F4ExCDDV8GrHs7ke+E4494Gg0hOcT0p6WAMl6gzRIB/ocC62iK4
+YSxy9UozvI81FdP2UPN6WBwksgT1aBmB8Js6Z+pghcZCdQM1Zdk0cVZe9Kv7bpC8
+PxWtrl+7jlt6MClYjJxB46iIsNDleHhCVlLagR6HG+TWVA0L0kCstbrBYcIRmj+6
+TVWPKieOc7dRV+X3hAqfcThVpsXpJFqQXa2Ed4fdItDJGRI1+fuigprXlxxTpq9M
+CnzGoUmXMpPitiKOENtZz03f31yn+gA76a/WxzAjT/0lFNVjtLZNobQ8kntUe0D5
+hzEpWSB7oUhz7AAKlt0xyQ7ug+qXzRqjvJTQm8A8bBsFoHrap9FW70T2VHVouyO4
+iAynSD+9j7qvBTGlmJMBcNzH/BcxhiKjKF39Y6D6vEZNgflDy/69T0pHSOqJ4piT
+f4QncgiXZmELBnjYnNHQ3V83XrnJooWK4LaBfQaP1xyf06+IkP/mnFmH9n3ac8EE
+C5fj3Lb+egfK1q3wWa6CyUCWlORCp/J2y8kWDLlf2k2jLlzLo9mkFkBGrOjRr8U4
+1N+asNLEPIrOolhFXTOv
+=ctk6
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewallrc b/net-firewall/shorewall-lite/files/4.5.19/shorewallrc
deleted file mode 100644
index c2fce7246c1b..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.19/shorewallrc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-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-lite/files/4.5.21.2/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.initd
deleted file mode 100644
index eb379fa7041a..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.initd,v 1.1 2013/11/10 17:36:56 constanze Exp $
-
-description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall-lite"
-	/sbin/shorewall-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.systemd
deleted file mode 100644
index a7c932418a9c..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall lite
-Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall-lite
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.initd
deleted file mode 100644
index a7c080d9db74..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.initd,v 1.1 2013/12/02 20:02:50 constanze Exp $
-
-description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall-lite"
-	/sbin/shorewall-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall-lite"
-	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.systemd
deleted file mode 100644
index a7c932418a9c..000000000000
--- a/net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall lite
-Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall-lite
-ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd
index e5957167b5b9..e5957167b5b9 100644
--- a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.confd
+++ b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd
index 2f985630ac50..88f33e9a1be8 100644
--- a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd
+++ b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd,v 1.1 2013/08/28 16:51:20 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd,v 1.1 2014/04/26 09:32:38 hwoarang 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-lite/files/4.5.19/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd
index a7c932418a9c..a7c932418a9c 100644
--- a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.systemd
+++ b/net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd
diff --git a/net-firewall/shorewall-init/files/4.5.21.2/shorewallrc b/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc
index 46f5eb9a3603..46f5eb9a3603 100644
--- a/net-firewall/shorewall-init/files/4.5.21.2/shorewallrc
+++ b/net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite b/net-firewall/shorewall-lite/files/shorewall-lite
deleted file mode 100755
index 907b6a4c538c..000000000000
--- a/net-firewall/shorewall-lite/files/shorewall-lite
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/shorewall-lite,v 1.3 2013/07/13 14:10:42 constanze Exp $
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-checkconfig() {
-	if [ ! -d /var/lock/subsys ] ; then
-		checkpath -d -m 755 /var/lock/subsys
-	fi
-}
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-	checkconfig
-	ebegin "Starting shorewall-lite"
-	/sbin/shorewall-lite -f start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall-lite"
-	/sbin/shorewall-lite stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-	checkconfig
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting shorewall-lite"
-	if [ -f /var/lib/shorewall-lite/restore ] ; then
-		/sbin/shorewall-lite restore
-	else
-		/sbin/shorewall-lite restart 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall-lite clear
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the shorewall-lite"
-	/sbin/shorewall-lite reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall-lite rules"
-	/sbin/shorewall-lite refresh
-	eend $?
-}
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/shorewall-lite.systemd
deleted file mode 100644
index aeb89b5abccb..000000000000
--- a/net-firewall/shorewall-lite/files/shorewall-lite.systemd
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
-#
-#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
-#
-[Unit]
-Description=Shorewall IPv4 firewall (lite)
-After=syslog.target
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/shorewall-lite
-StandardOutput=syslog
-ExecStart=/sbin/shorewall-lite $OPTIONS start
-ExecStop=/sbin/shorewall-lite $OPTIONS stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/shorewallrc_new b/net-firewall/shorewall-lite/files/shorewallrc_new
deleted file mode 100644
index 06253dc2b8cb..000000000000
--- a/net-firewall/shorewall-lite/files/shorewallrc_new
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux                              #Generic Linux
-BUILD=                                  #Default is to detect the build system
-PREFIX=/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=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=etc/init.d                      #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/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-lite/shorewall-lite-4.5.18.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild
deleted file mode 100644
index 4fe2aaa38618..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild,v 1.8 2013/08/17 16:18:42 jer Exp $
-
-EAPI="4"
-
-inherit systemd versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	=net-firewall/shorewall-core-${PV}"
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-	systemd_newunit "${FILESDIR}"/shorewall-lite.systemd 'shorewall-lite.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild
deleted file mode 100644
index 65a8304452ac..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild,v 1.1 2013/08/28 16:51:21 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJORMINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PV}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
-	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	systemd_newunit "${FILESDIR}"/${PV}/shorewall-lite.systemd ${PN}.service
-
-	# Currently, install.sh from upstream is broken and will always
-	# default.debian so have to do it on our own:
-	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.4.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.4.ebuild
deleted file mode 100644
index a3c78857612b..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.21.4.ebuild,v 1.1 2013/12/02 20:02:50 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild
index 902acb06675a..0cba37579b84 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.21.2.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.21.2.ebuild,v 1.1 2013/11/10 17:36:56 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild,v 1.1 2014/04/26 09:32:38 hwoarang Exp $
 
 EAPI="5"
 
@@ -38,7 +38,7 @@ DEPEND="=net-firewall/shorewall-core-${PVR}"
 RDEPEND="
 	${DEPEND}
 	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
+	>=sys-apps/iproute2-3.8.0[-minimal]
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index ce4d3e43a28d..5abe0526868d 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,23 @@
 # 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.256 2014/03/23 18:01:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.257 2014/04/26 09:29:56 hwoarang Exp $
+
+*shorewall-4.5.21.9 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/4.5.21.9/shorewall.confd, +files/4.5.21.9/shorewall.initd,
+  +files/4.5.21.9/shorewall.systemd, +files/4.5.21.9/shorewallrc,
+  +shorewall-4.5.21.9.ebuild, -files/4.5.19/shorewall.conf-SUBSYSLOCK.patch,
+  -files/4.5.19/shorewall.confd, -files/4.5.19/shorewall.initd,
+  -files/4.5.19/shorewall.systemd, -files/4.5.19/shorewallrc,
+  -files/4.5.21.2/shorewall.confd, -files/4.5.21.2/shorewall.initd,
+  -files/4.5.21.2/shorewall.systemd, -files/4.5.21.2/shorewallrc,
+  -files/4.5.21.4/shorewall.confd, -files/4.5.21.4/shorewall.initd,
+  -files/4.5.21.4/shorewall.systemd, -files/4.5.21.4/shorewallrc,
+  -files/shorewall.initd, -files/shorewall.systemd, -files/shorewallrc_new,
+  -shorewall-4.5.18.ebuild, -shorewall-4.5.19.ebuild,
+  -shorewall-4.5.21.2.ebuild, -shorewall-4.5.21.4.ebuild:
+  Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> shorewall-4.5.18-r1.ebuild:
   Stable for alpha, wrt bug #487690
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 64f403df7272..3c041a33d671 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -5,59 +5,42 @@ AUX 4.5.18-r1/shorewall.conf-SUBSYSLOCK.patch 700 SHA256 81ea118b54d7801eab04e70
 AUX 4.5.18-r1/shorewall.initd 2823 SHA256 94a766154c830d8c698ca4cd6c1b70243821efa940e89fa020a5733a19fb7850 SHA512 e72cd7ce37769d5c4b68d948955a9c36de9b9c842a0350d323aec2bbaa885f45da68ba8a8ea2c2e81cb14d4e6ace726f7b538632671db186f0858ad2b1dc886a WHIRLPOOL ccf43e58a61276a5ba55f8247d2d99fba79c623f521c10ef40cb77581689596419126134622a81268d2eef6aac6ce5b7ea4676cc889dc754d278dca7e0abe2b6
 AUX 4.5.18-r1/shorewall.systemd 450 SHA256 7af76981195a12e4cf0181f710d606e53d1964fd5cd033a4db489f8eb98a8495 SHA512 181c701b8aa6a18f21b578a536841616424bff96e220fb06de991d6c7ebd0209ce672d9a1f0b44976c2fe98b5638d0fcc5f6823c6f0bfef81afb2817609a7cc0 WHIRLPOOL af6666199890f43f81a2b67c89e3b06cf081ae4351e24925e92c8f24164be81f5d2fcedaafc262eda672733e809a1a2a4f3042375893eafa0bd58de28c1cb966
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
-AUX 4.5.19/shorewall.conf-SUBSYSLOCK.patch 700 SHA256 81ea118b54d7801eab04e70d21df0545be4c9680c2981de7ade727d8401363ca SHA512 2099951583f1fff3d90b7693c99ce61a77262ee2935a1b0ea3c81357c1c74874f49cd104d652e63b2ba9530db77b584c6ae0c33e7556bfd0c190d3765b15a993 WHIRLPOOL d26a2e9bdf8b04286dbfe7204a8e736b2c2464cd22efe10f5819bff84c5ee08621e35e934581fc5a112d9370f8307c1835b265b951ae573106d5ba730a1fd5fe
-AUX 4.5.19/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.19/shorewall.initd 2943 SHA256 5c0006795938b81df9a097b7b1495fd477383b933d91de358254f80a86e8e806 SHA512 597cb7e269eda3165c24c5ac5f57e97a716e0d373abdd88cd55ac877bed5551553b89236105b5d657c10571d9f70d5ff7c83e71667c7446405a06be46ba679e3 WHIRLPOOL 045bc29eba691c1a760a566d1b58c211527d2f24f4b3750b07f0b6731a9ab9f750cda118eaacea42abc231358548c73247fd3de971544ca5ea94510d3d4c9b76
-AUX 4.5.19/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
-AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
-AUX 4.5.21.2/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.2/shorewall.initd 2945 SHA256 739fe0bc55b1979251644b2969b074406d115149e399f22a498ca81ab4da0db8 SHA512 b8aa5255c70f733e06a5a1d10ad4c5f8d085574dfcb92bb9f66dc87d80d018ce2ca2b2c21e839208a2f41e2b1dbb12dd2c770240a88b0529667964783ca75f5b WHIRLPOOL 84cf3a80d2e7a9a6c0690cfd0cfc409d6c754c3915a50bba8ed5bec22620a7dc96a8732f0924ac5dbf69e4ee481197da3188ac34a6d0c5696b95b046f0595b24
-AUX 4.5.21.2/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
-AUX 4.5.21.2/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX 4.5.21.4/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.4/shorewall.initd 2945 SHA256 78f0f04f268e9332bf1c5a0a2aa3bab15ae99145dc0fe9b0d82531c72255e023 SHA512 bd82027d48337a0cd98db4c853f3cd494a3a140d232eebc305b005d4b7d6c40ae289f9351a3e531d4008a9d474101e987a13e7a0db52d79cc8fd569fb4ba6b17 WHIRLPOOL 1fe0178a47e2d0b696989d45b118b5739abc883ed1c32aaefd10f62d8d998683845548e9f0b2ace4452143e5918b16013daba70fe4287b3266a18bcd86241ae6
-AUX 4.5.21.4/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
-AUX 4.5.21.4/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 662 SHA256 4f2f884d61a44419be9414f6563ae1fb80e1cb55e88c05fe3b2c23d92b44a762 SHA512 d0c120b72dcb1f38253e5bd533efa4941ee46b833e70eaea687f659a5c736b9a7b8ec828c75c9a58d0e91d2f587d6c63ce0047082716d93ea310ca7dffe31a4c WHIRLPOOL b428a3f126edff93db8b80763ef1506b94da8b00ebb9cfd9e43cb79386b83186ea1d2aebf1b16af6101e958e70f5fba33bd875a63a55efc8b2761a743a60e309
 AUX 4.5.21.7/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall.initd 2944 SHA256 cb61ec0e9b9485749f49fe3ab72523b0cf6b75f2e5a477cba1bc453a86034b7f SHA512 c0e60d7dad0a1dfde1b8ca1aa470bb3fc8ae93fd3b608a8b11c9beb8703bca7f2a82c3d94c57eb8a4a8e7368022de3991e9ee35aec7cc126c042e9a40ab07537 WHIRLPOOL 2700a1bd287eff66a08d852319e520854fcfc649177e4ec52bace86e4d0e6f7149dc33fcc65d7d3f5bed12772560165fda99e28433b3fb8b8d169b7def6d4fdf
 AUX 4.5.21.7/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX shorewall.initd 2064 SHA256 ee8cff251a24cc5f9b31e835682f6fc7d9f01625e93c2f9d8c82c859dad09e8e SHA512 365819451ee3a412c321eea4d3011c548295f00f9dd2cbb996c84a61be77eae859d568077677f1acad64af2a642028e2ef577a3757239703153b3293232afade WHIRLPOOL eeb0b2f9e0a48dd3194c1f977309c132e84b018944ed19e68a6d575e9a834acb0c51ae894031a3c4bf01b9b0bcd94094a776c3839a3b74a10d5e46a16f631e91
-AUX shorewall.systemd 450 SHA256 7af76981195a12e4cf0181f710d606e53d1964fd5cd033a4db489f8eb98a8495 SHA512 181c701b8aa6a18f21b578a536841616424bff96e220fb06de991d6c7ebd0209ce672d9a1f0b44976c2fe98b5638d0fcc5f6823c6f0bfef81afb2817609a7cc0 WHIRLPOOL af6666199890f43f81a2b67c89e3b06cf081ae4351e24925e92c8f24164be81f5d2fcedaafc262eda672733e809a1a2a4f3042375893eafa0bd58de28c1cb966
-AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
+AUX 4.5.21.9/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.9/shorewall.initd 2944 SHA256 2dd8631c82895b4e16849b3423625d66f59ce2a00a678f14491569378040144b SHA512 b33a82cecde87d6ea52c961f30dc23d7317239fcb3f1765e06d735196d058e30f6fe18bb0ff6ec58526cb21d002b66c68f52ca26d3ac52220e635814d8695853 WHIRLPOOL b039aa54637eeb4fa38fa0da94cd20b0f7a5d1dd02052192a1c6bb0739bb05a0bcdd35565dfac4ebc58d1382b71d6b4307be5d793be0a1670bc22c91e2d3d6d4
+AUX 4.5.21.9/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
+AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-4.5.18.tar.bz2 470187 SHA256 81bbcb2cc24d0b54769fb153cb472d78e6eed9cdc9f005f1dd70ef2ae9efe131 SHA512 69857ba9181989a0d0b8ce691e637b313b59d4f5643784e62a801f8d74add0605452011e19e5344aaca97a329fe66980627181e69d9c0fc0625ff23afb192f78 WHIRLPOOL 2aaa1d5fce8170507e4989cb5c11cedeca938a161795894edad0ced658c9af42eac299ff4385b15d5fde003ece87f856ac57b985e4d26ea0adc870f109596082
-DIST shorewall-4.5.19.tar.bz2 475805 SHA256 91368877973411c5a6228a22a5d5bcac03aca42cc56c3cd95a3775ca964d0756 SHA512 0c3346a0f15b25051102a9a9d3e0d08a8bea3138c541fc32987278e569bb2f58c8d147b61cb095b694935c799207c5c6409c66ffd7667f07ad88bc60db68845e WHIRLPOOL 950d972b0570cc4586fb7b39a3017b37a2261ed08228a9032f6868258595a28236d3f36f8461a3404f91fb7a3972f57054af0b7c33f2427d7e1778219d0e45da
-DIST shorewall-4.5.21.2.tar.bz2 486599 SHA256 5807a06bde430b3a2fcd123eba17fc7770b6fa8859982245382aa69f8b3ab6af SHA512 e9edee6fb9e6079dc7972f351c43189da5d29ba2d7123eabf158425c87e8e52635df848e696f902482cd6b9ff307497421adf5824fc23b45554ad11b46cf644a WHIRLPOOL bc0c0c368103c1b092bd59e200e109a8670c6d3511b9df188a065d9c192ff71c4bfbdb0fe4b5a4eef8b2ef9a43860a0a826a9fb66811f703a68b8c4d625a8f79
-DIST shorewall-4.5.21.4.tar.bz2 488236 SHA256 297aa07e793e40b8c2a7ce45789e865b54bd53166303aa0baddd937894d50cc9 SHA512 efb26a1c9b558f8b70d796f737bde88121b8ecb8c83faec68368b74f3e83b3822ccfa8b233aeefc3ca9c52009be820674e9a78d019cd2051cdefad3f4af82635 WHIRLPOOL d698fbac1dccfd2d7484763f1ec3c87b2d2e7b2ece9623bc99365a90c0ca9b76a6b3953f699736ef29dcb8e48f23bab0310d6a70049dc60220135c64d4286a97
 DIST shorewall-4.5.21.7.tar.bz2 489095 SHA256 ac319243a583c31fb6cabacd28157a3c05085b951fb841b068028744b0d825e0 SHA512 1427780e4b75c9af26a90b916d4c410ea2622aea5740ad92a18994dcbbac3ce06989bf39ff60b6af9d10ac79db6e88b63921663e64f1a76298056e799763e859 WHIRLPOOL eba4975e96a2dd6c96bb19d3666a8734d62608fe864e78d9a0d6d4a0b4747c1c6ac720cd722b8d1b4adeacb13bded633f845809a45e1d01db7e7d4d7d59404bc
+DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
-DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
-DIST shorewall-docs-html-4.5.21.2.tar.bz2 4144789 SHA256 b4cfdcb84525a3df1430c71eba4c1f86378d96283c250d8c2a9d81ac921bef88 SHA512 57a5dce628301a043110a28874dc73244ac8aedb756c62bdbc9ebc66ba324c989debc6dfdc6e9f19538356b60230d88b708fb9562cb9016783d41d9efbdb495a WHIRLPOOL fce6eca901c7444fe05cbd72b59aa836967de19bccbba3335b74b05e220ad297da15451d853188d5dc65276b13af70c7134eb17a0119dd695e571fe23ee71b07
-DIST shorewall-docs-html-4.5.21.4.tar.bz2 4144800 SHA256 92167814eb92f2b7d0f3d94ea16542ad946f566cfe44b86ff447cd11c75391c4 SHA512 e65836162fe376da9f992b90e839d8ec5d3d1213449dce7f97f04e93fa1b2d52ce0acb2741be68eafe6101fceec9bece767d870d67beb48709de5421ea175c4e WHIRLPOOL d3c353735099677b084a8ca6b8aaeb802f0acb0aadb7e3f8bf6fbe27dedc388affc1a8113b383b055f3ef89e2b441bfba3f564a4ad16412d8bdd216277879693
 DIST shorewall-docs-html-4.5.21.7.tar.bz2 4146237 SHA256 cd7de8343924828cea0959496a96f830086421d8583783158a80ba0900ae021d SHA512 4a945aff7d03b726ca14cc9f0bf9b1d42d06ea670f7aa917bb3ec085eadc3dee004582228702885b3d6ed56bf24e291bd7cae03e327e2dc9c8d7dc616962ddc7 WHIRLPOOL 09fe3c7f532a3092abc4aede6bcd62dcda962de4e9ad4179797a0e653e971fe3e8199f751fecd9cacb35f03ba69d8eb4664e8faea215538ebc40dc7bf50c1ada
+DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 EBUILD shorewall-4.5.18-r1.ebuild 1795 SHA256 a0eda816fcc4f3c8595559fbadc5d5775d1e012d5d60227f6277d5244c714f60 SHA512 d1f580824e97ca3dade7fb08233c558e92717757a3fb760d79efbb41ca01bcdfbed5dcdf4fec5c0a2006c9ae2602250a7002a89d070164cdce04b75b989e0de6 WHIRLPOOL 2fb1319b011987ef2bf47e97da063651506ef0eb8bc715b21ccd9bc40ad5e7e682dd9b806a8cb5aec27b8a24280522eddcce967644ed1c495e783eee78014790
-EBUILD shorewall-4.5.18.ebuild 1506 SHA256 ea8ec1f2f64ba52b3e356bd55442de01b0e45045bc653ae48151cc4c6a645ba2 SHA512 03920b6d37d6a243d6d39bfe5a5108aeae4c7a691138ce6b73d67de35dd444da6a221c268daa65a9f761dbc2cefb1189784a901a44e54aa77b9cd7260c4f40d7 WHIRLPOOL b1a30462e723dcbbeb2d4232066d5dd0739ea8499a3a8bc672cf8171804f025475ecbde8ed793ee6338602aa50711dbf34f3f26f609fc25a269be1f1009416e5
-EBUILD shorewall-4.5.19.ebuild 2972 SHA256 b75dd04f4fc1df875f1bb1f9177795438844f0c930f966e85de7b65c3d5de7e5 SHA512 48d5f0db9fcb527dca04c4d5c6c1afd5baafe8d92357718437d26b538da0d5d86deca1beb10c6db6321651c2564d524d7da1554c5c9c397d24e21407a057c596 WHIRLPOOL c1ee402589f46e3e40dedee1bd562c1195b8226206ac5e01bc7cfb7254af1a48d3c3f5e0df8045f1065120adbf3407a8da174ada71e50fe8a6f40ae50769a28b
-EBUILD shorewall-4.5.21.2.ebuild 3281 SHA256 fc8bc9a17d4aeb9ca5afc0a5d0757e9316327b2ac3158eb53519c353fc78a6ba SHA512 d80c25241b0626227a4b28901ade1c092fb45c41946f9e95d85d2262c1ae1ac2614e58a713ad1d794e852a82e80fc5fedbe921f2491572dd69b810649f1e4913 WHIRLPOOL 55fee01b7a43cd6ef3707d58be3cdf5543d59fd18ac41de927e72d6de467a7613a469ee55c0a1eafc6ea73b3602c0c39eb324f545573fc168d452ec23ed16abb
-EBUILD shorewall-4.5.21.4.ebuild 3281 SHA256 115f8a16b8b2e90215529c6b52d3e59d11b1c220aea65f8055416919f379a822 SHA512 fc35eed4fdc06f5466288f3be745f9a8ce32537148e231896b674c2564978816558dbea32476589d22019af3f00947f149cbf396c1d16ea72ca2558589f2b6cd WHIRLPOOL 85b2363f8a234b0fd008484ad7ee97102c1dce7dbd58bae700c254d21f4716724296b7378e69ee8055cce68ff61dcb6aca371860d62431ba604289cac712c78c
 EBUILD shorewall-4.5.21.7.ebuild 3350 SHA256 1eff6d45644f3c1bba65e379fa25450948f36aea822626112fae9e30be9f6e2b SHA512 cceb7b3de221b0cf86e3f4b7e21a483b1de088c00f5fca0100306f43ff1ae28b8d67dfa3e377b22e9240c4c13c68b61043f5c254b2cd457d333523baf6f61971 WHIRLPOOL 6d47032aba34802a41f8dab69f6d6be52a8bede7cddd7cd618cfbfcb83637c1729de79970b1f82550a4d726038cdf1fcba363651fef4b0dd8016d5694978791f
-MISC ChangeLog 36852 SHA256 0b10e622ca103cbc38943caa053395600fee4ce638dcbb11895188f11049a052 SHA512 fa9c1b95b15dab4682e3710cb4bfedc4fc5bf2fdae503ce94ff594f2ef8b889cf3df6ba2710b8404a8958dca21fe05d3c7033d725c1a1c7c96aeaa6c34932c94 WHIRLPOOL d04abf24ccc9d6a5e1ff32247d2c7b6618aaf1ca2413b256ca1561a1dabe2180eebbbe0db22e696e0047c9c99dd8141b3207da3ecb543f4462677d9cd36bbc23
+EBUILD shorewall-4.5.21.9.ebuild 3298 SHA256 9bd642073a7508142d8972a8b1adee192c59b537e321fed8b05ca29930964ec7 SHA512 baedefa3552cad5ec9cd1c7f5623dc12ad8283e6910542b57352c3ea148d5dac97902ed75d26af72b70de4df41f3e59b4b269e330b9a3edff7d2cc17bd2537f8 WHIRLPOOL 53a3e1335393e02cd199a372b3de21e98d196d21e7b4f16fb547379e5c0fbd41b00184477ffb0b6c711b65d28678eee9e2b712d427050b31d8148eb246522d06
+MISC ChangeLog 37818 SHA256 517024ea961b40956bc796ab8b9b33e095bf9c11ca7fb62b0c32fe85bada45d5 SHA512 f5d189d3300a1747ad095ec44228aa03f9232e414c0ec417cfbac34c8b44cd6efb0fb64e255da7ecaa38ad84c40edd6988ae74caeb4707a44cd9352809badc96 WHIRLPOOL 592416a1b496342c75fe5650cfc52f5f765ca334817d97b4637dc93193597a516d79d84c4f0e0fb6b9afae342022f665dd2e4f19011b3b1208dbff002e43acf9
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLyGKAAoJELp701BxlEWf9OMQAJn5olKU4tG5ivx3ZMjwZ+sL
-oigAd2NIy6Q8hJG62nZtPCfwmEQkxEBvBVyksl9P+3KXOhuI3R7JF8YRfu7jtObv
-3Lah3KFmP3nXrd1qZTf4QwaTq0UHj56lYy7k8//2LyQBz9IlZZzFT/Q9ofXJCRPe
-sRpcTeopjD6nuFjSVZoPiPLKwSUW+pah0x5rPWah/owLE5Dln24Ps/ewRdsTgC7y
-yjan3mQXZ1Nof4eTiNoOZ+3rF/ETIRVtpFdo2zRK4Z2m2Q+U6909rR50tt1vuIJz
-/BdA26GRrnCu7uFYQTrWj/KyPLSeXLL3sIAKK7BWLfS/xwJqrr1XtGN33ABuGyCc
-KpOYKBhGfh+SFDWi2P6dUP5CaLfhE+05eH1kSD9bJA8MK9TiE4Gx0zcbc1RGvRA2
-PvUyJ6XjMqBOXgMGLgcZwFlOkg7GSvgfZzHy8u3RfTgmvbPeIsRKsuW/tem5i5fV
-5EruDxqdMceIg2RWLWxBaqLWUJ0NIZlIHDHI4pUQeFnGWu7x73K6ET0Dv+HfvXV1
-NKZQYGzdWR8p9pnC1Fanr01tNj98M78YwEaGLlVjp2f6HIgnUUX3Lxxgw3ChP5iD
-EWFIildhSl/TZ7RAtu3XJT/T/ql6ldXTPPlSkkEgEu4ZuOCmwyp90Zeam7WW+MoW
-vZihqni6jEUyPfl0ybp5
-=L/uM
+iQJ8BAEBCABmBQJTW3xCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88vXgP/2WmsbkDZRNWp5U0DeHanBwM
+3dTAF19ue60J+vIFkZUM4lqZEeUbMgnkfLtzZWQBNz/NWGTZUIaHB1DkneIf9AIO
+N9q6UWeZ/p0sYAG5v1euEKhuJVzRNTHSSNqrtI/iEXoeBGSRw1WzrzrW7FZUO1NW
+F9gETsqqbyIVL523QuaIJiWSSNdC4sKFviuui0WXuzaXbLVdlUAXZudybq8wwNI1
+OE2QS8Ih6IxjoEBMNVsqVVfbJP1pNRaE0aHWMpex6lWpded0tvo7lAbWR2YAUizB
+tFEFi6UTB/Jf7bpiQcTvQ3zGvI+PAaCs2TBwr7rRPEO+YI4hQSRpqzz9SmWY0mIt
+/MJD2kwzEBjMVnavGHXei1NwkiqDN8GRPOR3FQa6WsBXq5DvmunDU+T0jJFqpffQ
+BZHYZdehWaISbVuvQSU/3VENTwvLQIphc7sKu/0wDJ18QcpaZb5Mzf7I17WItbSR
+mofDpVTmy1Zwo716UZbHlj6W0105phEL6qMJE7SMyoCwHQOjDuNyMRrjXwuR0NgF
+oBa2QQs8eM7Kd8ea7GUqbYn5AXyeHv8+adruU6s6cMBAMDkNlSA4hJTY9kPaSiw2
+MjlHf+JpefWbzCIEjjldYuDxWIQWATaTzAP7YgmzlfB6IMqrsmKi9iCBnACJ6mI/
+8KXnIo+7otB9g+T8N/kC
+=h37r
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch b/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch
deleted file mode 100644
index 37a080adf999..000000000000
--- a/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configfiles/shorewall.conf	2013-06-24 22:07:38.000000000 +0200
-+++ configfiles/shorewall.conf.new	2013-07-01 15:50:54.747711444 +0200
-@@ -85,7 +85,7 @@
- 
- SHOREWALL_SHELL=/bin/sh
- 
--SUBSYSLOCK=/var/lock/subsys/shorewall
-+SUBSYSLOCK=/run/lock/shorewall
- 
- TC=
- 
---- configfiles/shorewall.conf.annotated	2013-06-27 20:32:22.000000000 +0200
-+++ configfiles/shorewall.conf.annotated.new	2013-07-01 15:51:38.448332964 +0200
-@@ -444,7 +444,7 @@
- #     or specified as a null value, /bin/sh is assumed. Using a light-weight
- #     shell such as ash or dash can significantly improve performance.
- # 
--SUBSYSLOCK=/var/lock/subsys/shorewall
-+SUBSYSLOCK=/run/lock/shorewall
- #
- # SUBSYSLOCK=[pathname]
- # 
diff --git a/net-firewall/shorewall/files/4.5.19/shorewallrc b/net-firewall/shorewall/files/4.5.19/shorewallrc
deleted file mode 100644
index c2fce7246c1b..000000000000
--- a/net-firewall/shorewall/files/4.5.19/shorewallrc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-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/files/4.5.21.2/shorewall.confd b/net-firewall/shorewall/files/4.5.21.2/shorewall.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall/files/4.5.21.2/shorewall.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/4.5.21.2/shorewall.initd b/net-firewall/shorewall/files/4.5.21.2/shorewall.initd
deleted file mode 100644
index fef09125db86..000000000000
--- a/net-firewall/shorewall/files/4.5.21.2/shorewall.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.21.2/shorewall.initd,v 1.1 2013/10/26 18:37:26 constanze Exp $
-
-description='The Shoreline Firewall, more commonly known as "Shorewall", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall"
-	/sbin/shorewall ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall"
-	/sbin/shorewall ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall"
-	/sbin/shorewall status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall"
-	/sbin/shorewall ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall rules"
-	/sbin/shorewall ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking shorewall configuration"
-	/sbin/shorewall ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall/files/4.5.21.2/shorewall.systemd b/net-firewall/shorewall/files/4.5.21.2/shorewall.systemd
deleted file mode 100644
index db278fd54585..000000000000
--- a/net-firewall/shorewall/files/4.5.21.2/shorewall.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall
-Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall
-ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/4.5.21.2/shorewallrc b/net-firewall/shorewall/files/4.5.21.2/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall/files/4.5.21.2/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@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/files/4.5.21.4/shorewall.confd b/net-firewall/shorewall/files/4.5.21.4/shorewall.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall/files/4.5.21.4/shorewall.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/4.5.21.4/shorewall.initd b/net-firewall/shorewall/files/4.5.21.4/shorewall.initd
deleted file mode 100644
index d9e0431ab935..000000000000
--- a/net-firewall/shorewall/files/4.5.21.4/shorewall.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.21.4/shorewall.initd,v 1.1 2013/12/02 20:01:43 constanze Exp $
-
-description='The Shoreline Firewall, more commonly known as "Shorewall", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall"
-	/sbin/shorewall ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall"
-	/sbin/shorewall ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall"
-	/sbin/shorewall status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall"
-	/sbin/shorewall ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall rules"
-	/sbin/shorewall ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking shorewall configuration"
-	/sbin/shorewall ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall/files/4.5.21.4/shorewall.systemd b/net-firewall/shorewall/files/4.5.21.4/shorewall.systemd
deleted file mode 100644
index db278fd54585..000000000000
--- a/net-firewall/shorewall/files/4.5.21.4/shorewall.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv4 firewall
-Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall
-ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/4.5.21.4/shorewallrc b/net-firewall/shorewall/files/4.5.21.4/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall/files/4.5.21.4/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@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/files/4.5.19/shorewall.confd b/net-firewall/shorewall/files/4.5.21.9/shorewall.confd
index e5957167b5b9..e5957167b5b9 100644
--- a/net-firewall/shorewall/files/4.5.19/shorewall.confd
+++ b/net-firewall/shorewall/files/4.5.21.9/shorewall.confd
diff --git a/net-firewall/shorewall/files/4.5.19/shorewall.initd b/net-firewall/shorewall/files/4.5.21.9/shorewall.initd
index a4e9b99be4f7..f58978cc2cd3 100644
--- a/net-firewall/shorewall/files/4.5.19/shorewall.initd
+++ b/net-firewall/shorewall/files/4.5.21.9/shorewall.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.initd,v 1.1 2013/08/28 16:45:57 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.21.9/shorewall.initd,v 1.1 2014/04/26 09:29:56 hwoarang 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.5.19/shorewall.systemd b/net-firewall/shorewall/files/4.5.21.9/shorewall.systemd
index db278fd54585..db278fd54585 100644
--- a/net-firewall/shorewall/files/4.5.19/shorewall.systemd
+++ b/net-firewall/shorewall/files/4.5.21.9/shorewall.systemd
diff --git a/net-firewall/shorewall-init/files/4.5.21.4/shorewallrc b/net-firewall/shorewall/files/4.5.21.9/shorewallrc
index 46f5eb9a3603..46f5eb9a3603 100644
--- a/net-firewall/shorewall-init/files/4.5.21.4/shorewallrc
+++ b/net-firewall/shorewall/files/4.5.21.9/shorewallrc
diff --git a/net-firewall/shorewall/files/shorewall.initd b/net-firewall/shorewall/files/shorewall.initd
deleted file mode 100644
index 6dadd306433c..000000000000
--- a/net-firewall/shorewall/files/shorewall.initd
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall.initd,v 1.4 2013/07/13 14:09:09 constanze Exp $
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-checkconfig() {
-	if [ ! -d /var/lock/subsys ] ; then
-		checkpath -d -m 755 /var/lock/subsys
-	fi
-}
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-    checkconfig
-	ebegin "Starting shorewall"
-	/sbin/shorewall -f start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall"
-	/sbin/shorewall stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-    checkconfig
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting shorewall"
-	/sbin/shorewall status >/dev/null
-	if [ $? != 0 ] ; then
-	    svc_start
-	else
-	    if [ -f /var/lib/shorewall/restore ] ; then
-		/sbin/shorewall restore
-	    else
-		/sbin/shorewall restart 1>/dev/null
-	    fi
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall clear
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the shorewall"
-	/sbin/shorewall reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall rules"
-	/sbin/shorewall refresh
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking configuration files"
-	/sbin/shorewall check
-	eend $?
-}
diff --git a/net-firewall/shorewall/files/shorewall.systemd b/net-firewall/shorewall/files/shorewall.systemd
deleted file mode 100644
index bd4638d5dfaf..000000000000
--- a/net-firewall/shorewall/files/shorewall.systemd
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
-#
-#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
-#
-[Unit]
-Description=Shorewall IPv4 firewall
-After=syslog.target
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/shorewall
-StandardOutput=syslog
-ExecStart=/sbin/shorewall $OPTIONS start
-ExecStop=/sbin/shorewall $OPTIONS stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/shorewallrc_new b/net-firewall/shorewall/files/shorewallrc_new
deleted file mode 100644
index 06253dc2b8cb..000000000000
--- a/net-firewall/shorewall/files/shorewallrc_new
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux                              #Generic Linux
-BUILD=                                  #Default is to detect the build system
-PREFIX=/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=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=etc/init.d                      #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/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/shorewall-4.5.18.ebuild b/net-firewall/shorewall/shorewall-4.5.18.ebuild
deleted file mode 100644
index 31c221725d6b..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.18.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18.ebuild,v 1.8 2013/08/17 16:18:28 jer Exp $
-
-EAPI="4"
-
-inherit eutils systemd versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}"
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	=net-firewall/shorewall-core-${PV}"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-	systemd_newunit "${FILESDIR}"/shorewall.systemd 'shorewall.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.19.ebuild b/net-firewall/shorewall/shorewall-4.5.19.ebuild
deleted file mode 100644
index 321986ba84bf..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.19.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.19.ebuild,v 1.1 2013/08/28 16:45:58 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJORMINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter.'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	=net-firewall/shorewall-core-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-	sys-devel/bc
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
-	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
-
-	epatch "${FILESDIR}"/${PV}/shorewall.conf-SUBSYSLOCK.patch
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	systemd_newunit "${FILESDIR}"/${PV}/${PN}.systemd ${PN}.service
-
-	# Currently, install.sh from upstream is broken and will always
-	# default.debian so have to do it on our own:
-	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.21.2.ebuild b/net-firewall/shorewall/shorewall-4.5.21.2.ebuild
deleted file mode 100644
index a5dbff8ba787..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.21.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.2.ebuild,v 1.1 2013/10/26 18:37:26 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter.'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	virtual/perl-Digest-SHA
-	=net-firewall/shorewall-core-${PVR}
-"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-	sys-devel/bc
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.21.4.ebuild b/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
index b91801e8bc4a..de41c8e09526 100644
--- a/net-firewall/shorewall/shorewall-4.5.21.4.ebuild
+++ b/net-firewall/shorewall/shorewall-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.4.ebuild,v 1.1 2013/12/02 20:01:43 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.9.ebuild,v 1.1 2014/04/26 09:29:56 hwoarang Exp $
 
 EAPI="5"
 
@@ -43,8 +43,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	>=net-firewall/iptables-1.4.20
-	sys-apps/iproute2[-minimal]
-	sys-devel/bc
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 63aaef236d6b..8e9891457455 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-firewall/shorewall6-lite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.73 2014/03/23 18:01:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.74 2014/04/26 09:31:40 hwoarang Exp $
+
+*shorewall6-lite-4.5.21.9 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/4.5.21.9/shorewall6-lite.confd, +files/4.5.21.9/shorewall6-lite.initd,
+  +files/4.5.21.9/shorewall6-lite.systemd, +files/4.5.21.9/shorewallrc,
+  +shorewall6-lite-4.5.21.9.ebuild, -files/4.5.19/shorewall6-lite.confd,
+  -files/4.5.19/shorewall6-lite.initd, -files/4.5.19/shorewall6-lite.systemd,
+  -files/4.5.19/shorewallrc, -files/4.5.21.2/shorewall6-lite.confd,
+  -files/4.5.21.2/shorewall6-lite.initd,
+  -files/4.5.21.2/shorewall6-lite.systemd, -files/4.5.21.2/shorewallrc,
+  -files/4.5.21.4/shorewall6-lite.confd, -files/4.5.21.4/shorewall6-lite.initd,
+  -files/4.5.21.4/shorewall6-lite.systemd, -files/4.5.21.4/shorewallrc,
+  -files/shorewall6-lite.initd, -files/shorewall6-lite.systemd,
+  -files/shorewallrc_new, -shorewall6-lite-4.5.18.ebuild,
+  -shorewall6-lite-4.5.19.ebuild, -shorewall6-lite-4.5.21.2.ebuild,
+  -shorewall6-lite-4.5.21.4.ebuild:
+  Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   shorewall6-lite-4.5.18-r1.ebuild:
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index 8d8eb52816ac..91a93644f344 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -4,58 +4,42 @@ Hash: SHA256
 AUX 4.5.18-r1/shorewall6-lite.initd 2187 SHA256 f09a31e2c7595411b85e4e17d6970d24634cfd75b21393b6d725eb9a727723b0 SHA512 55291fcb03c8751b779f383dfff719d7a8c2f4754015b8a5696179349b95cc8883b3df0699f1cea6fb1a7864b2271065e3804a69471d1067d7f8d5aaef340d08 WHIRLPOOL 5849838cf3f32c3da921ffec92c1f5768f6f5f0ebe10d68064ef0466b3ec8224bd959e079cde76def2ef5f286d1ae48b53ec4cb9efac8be5df500399d5ba3346
 AUX 4.5.18-r1/shorewall6-lite.systemd 475 SHA256 95dec92e61eda3543ada0bc05c9eecf87ca5dcc449448b5c04dbcf72045006cb SHA512 a9a258b0b430a88bcf6d6ccec56ded96422c0c52574cd45b552c04f4c1b5758476ea708d13b517dab686d859f4a503a348de6bd2acb5e60797172e502e387831 WHIRLPOOL c38c053ade59895c5605182241e154ab2624187a8367f7d371111ccdf5f4145d32b3c3bc358fb590d85cd044ad1c76a7f49af57d6ea6ec71fa25f773b644fd0f
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
-AUX 4.5.19/shorewall6-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.19/shorewall6-lite.initd 2285 SHA256 c91073e6c99d2e1dd36992f6682989c6b911bf637fc61a01ac3a8c5eb6b40b4d SHA512 2d9462a58533738038609d3b1fa7484fa58b25c82f31251354a9401bcd0bfa4d47b92b25e23b79c14ee67aa0700ebe942d98175cc3f161dba2359ebdcb50aabc WHIRLPOOL bfd66560c5a2aee6affbffb78460af26065d9bd7435eed486ed7729d8ccb98e09233c62f2fa345b9e220db598a9592db77495aceded80cd04cb1d49a32f6e164
-AUX 4.5.19/shorewall6-lite.systemd 488 SHA256 f8e0a127bb4e7216120a38ec09e35e2928b54dd5fc4e2bdefc66dbe20897ba43 SHA512 3710760fe27ee07a92170be6ebf423a6353e4712080a6c0c2c63958ec4f658add4743d60dcc91348b734c896d029227a4f6024d316ba96ea558f6c1db2246074 WHIRLPOOL 7541bddbce4c105c3a0dc1aab3ab64d96b41a27a87650fc48b63b07cb5a0b55524c1f4b50fee05104e82afa1b256ce8b809ddda5d9ac05da8b06991220c9da55
-AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
-AUX 4.5.21.2/shorewall6-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.2/shorewall6-lite.initd 2287 SHA256 d6d1dc9ff2060dde3affc4004d4e543cbca150b129d7cfb478a3f1803af0bb7d SHA512 c55c419533f4e720246d3f7915ee94c349bba49adb299be913aa99424464b3d0d774c1edb65b92b92ba2d6d846fedfa8f73c86b60b8c02be5cdaf70bfe6bb8a7 WHIRLPOOL 0ffcd3a7a188a5e73c04c2ed1735cc34fe09812a6117dc9f47892e09ab7fbb3c4913b3e21bf867ee99b6ad5112ff438510818df592f7172dbc6c502f0473c915
-AUX 4.5.21.2/shorewall6-lite.systemd 488 SHA256 f8e0a127bb4e7216120a38ec09e35e2928b54dd5fc4e2bdefc66dbe20897ba43 SHA512 3710760fe27ee07a92170be6ebf423a6353e4712080a6c0c2c63958ec4f658add4743d60dcc91348b734c896d029227a4f6024d316ba96ea558f6c1db2246074 WHIRLPOOL 7541bddbce4c105c3a0dc1aab3ab64d96b41a27a87650fc48b63b07cb5a0b55524c1f4b50fee05104e82afa1b256ce8b809ddda5d9ac05da8b06991220c9da55
-AUX 4.5.21.2/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX 4.5.21.4/shorewall6-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.4/shorewall6-lite.initd 2287 SHA256 b8a494132173862d6a9dd324b378ab03d712c2d4db941774bb017cc000566091 SHA512 3990bf16e9f4b8e62e7823dbdbc194d4c3db2bc3ba82ab2f4a6e0484c4432a62317e8c9889a25e45f2af8cb2522fd924c92726a129099d7a80c3f9f0177cfe17 WHIRLPOOL 3a7bc75e551b38c55782dbc20a469318b2a0ab058927bc58ac454db3c4a240be30291fb73472563e24a876d28f91dd17ba25f47d4fd83ca225d542bb7ae03ef1
-AUX 4.5.21.4/shorewall6-lite.systemd 488 SHA256 f8e0a127bb4e7216120a38ec09e35e2928b54dd5fc4e2bdefc66dbe20897ba43 SHA512 3710760fe27ee07a92170be6ebf423a6353e4712080a6c0c2c63958ec4f658add4743d60dcc91348b734c896d029227a4f6024d316ba96ea558f6c1db2246074 WHIRLPOOL 7541bddbce4c105c3a0dc1aab3ab64d96b41a27a87650fc48b63b07cb5a0b55524c1f4b50fee05104e82afa1b256ce8b809ddda5d9ac05da8b06991220c9da55
-AUX 4.5.21.4/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 674 SHA256 cfafd066833dd6e22e6247371b0f0077f941179df83d3b4dbf3af5cd2ed7f6fa SHA512 d6a3bb804a81a43244e96e30024b54beb7d20f4951872805327cc235b67c1a447a60a0f6fc33c790754519603de0d464c4329ee88bb389aca36bfe71206a0b49 WHIRLPOOL 53ec75c0eed4be18a4d364e9a6fdd1b3e233ea0a6f093519ce26d57b9cf9ed449d50d14777cd88f85c2256ec346c275bfeb589f22839cbd084ff11b7bfd9a73f
 AUX 4.5.21.7/shorewall6-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall6-lite.initd 2286 SHA256 61dad08f2bf0bd149905d2b1f03693e10e129165e068d8543c3354447698f5a1 SHA512 794d4a8af5185ef4a0bab2cfd73f2a49e4e7f1c8ed7d959abd06a969f41cd9f46fd0b29e14e42fc672dc2b86365bec0b5f39cba5b670d1b6c5bb144b48c46504 WHIRLPOOL 3a1f9f0eb6ba1d5a9d794528ce5e488bec790bc42285f403da0c54535bb7a2e082ba9d44351015dc0561d406e3e34415564402e069d7cd5012db8cfed451f950
 AUX 4.5.21.7/shorewall6-lite.systemd 488 SHA256 f8e0a127bb4e7216120a38ec09e35e2928b54dd5fc4e2bdefc66dbe20897ba43 SHA512 3710760fe27ee07a92170be6ebf423a6353e4712080a6c0c2c63958ec4f658add4743d60dcc91348b734c896d029227a4f6024d316ba96ea558f6c1db2246074 WHIRLPOOL 7541bddbce4c105c3a0dc1aab3ab64d96b41a27a87650fc48b63b07cb5a0b55524c1f4b50fee05104e82afa1b256ce8b809ddda5d9ac05da8b06991220c9da55
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX shorewall6-lite.initd 1810 SHA256 525c21d81294cbcbb25cffd1a0caa86e9ae481da322f817f582f2f5be8d798be SHA512 ce9c3ca091003b171e62ee9f656174547e88beb6cc2fba78589cc37d56907dc9616bbf5930f76dcbc553597fc549750b7299946ab9b8dc00149e33f0f1f6c476 WHIRLPOOL 9a569dd111c00700163b3677e434f5b12bc9f3762e79221c7883f08bfee2cba58881b213e5a5ba05c615816a024e9bf995942202a68ed5773469f5f05eee3e0e
-AUX shorewall6-lite.systemd 475 SHA256 95dec92e61eda3543ada0bc05c9eecf87ca5dcc449448b5c04dbcf72045006cb SHA512 a9a258b0b430a88bcf6d6ccec56ded96422c0c52574cd45b552c04f4c1b5758476ea708d13b517dab686d859f4a503a348de6bd2acb5e60797172e502e387831 WHIRLPOOL c38c053ade59895c5605182241e154ab2624187a8367f7d371111ccdf5f4145d32b3c3bc358fb590d85cd044ad1c76a7f49af57d6ea6ec71fa25f773b644fd0f
-AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
+AUX 4.5.21.9/shorewall6-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.9/shorewall6-lite.initd 2286 SHA256 e0a6a2259006fba5de701e7602bfa640340012bdbf95ba74ece05d8e9817502f SHA512 5708549dcc7f56665b706edfe83737a8625d8454058417e6f6835d1133e44245dd4d1a2ea7fb8e36152e04a34c6e4db42e9ec63945e952433112e28dece0594f WHIRLPOOL b915db9aa213819782cf65585b9a96b48eb748e1a4d57ea534b86cd8bc7cb4a4458ff46a7697291654bcea347d869ca41889bdfb114a01ab3faa5139390e6fa0
+AUX 4.5.21.9/shorewall6-lite.systemd 488 SHA256 f8e0a127bb4e7216120a38ec09e35e2928b54dd5fc4e2bdefc66dbe20897ba43 SHA512 3710760fe27ee07a92170be6ebf423a6353e4712080a6c0c2c63958ec4f658add4743d60dcc91348b734c896d029227a4f6024d316ba96ea558f6c1db2246074 WHIRLPOOL 7541bddbce4c105c3a0dc1aab3ab64d96b41a27a87650fc48b63b07cb5a0b55524c1f4b50fee05104e82afa1b256ce8b809ddda5d9ac05da8b06991220c9da55
+AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
-DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
-DIST shorewall-docs-html-4.5.21.2.tar.bz2 4144789 SHA256 b4cfdcb84525a3df1430c71eba4c1f86378d96283c250d8c2a9d81ac921bef88 SHA512 57a5dce628301a043110a28874dc73244ac8aedb756c62bdbc9ebc66ba324c989debc6dfdc6e9f19538356b60230d88b708fb9562cb9016783d41d9efbdb495a WHIRLPOOL fce6eca901c7444fe05cbd72b59aa836967de19bccbba3335b74b05e220ad297da15451d853188d5dc65276b13af70c7134eb17a0119dd695e571fe23ee71b07
-DIST shorewall-docs-html-4.5.21.4.tar.bz2 4144800 SHA256 92167814eb92f2b7d0f3d94ea16542ad946f566cfe44b86ff447cd11c75391c4 SHA512 e65836162fe376da9f992b90e839d8ec5d3d1213449dce7f97f04e93fa1b2d52ce0acb2741be68eafe6101fceec9bece767d870d67beb48709de5421ea175c4e WHIRLPOOL d3c353735099677b084a8ca6b8aaeb802f0acb0aadb7e3f8bf6fbe27dedc388affc1a8113b383b055f3ef89e2b441bfba3f564a4ad16412d8bdd216277879693
 DIST shorewall-docs-html-4.5.21.7.tar.bz2 4146237 SHA256 cd7de8343924828cea0959496a96f830086421d8583783158a80ba0900ae021d SHA512 4a945aff7d03b726ca14cc9f0bf9b1d42d06ea670f7aa917bb3ec085eadc3dee004582228702885b3d6ed56bf24e291bd7cae03e327e2dc9c8d7dc616962ddc7 WHIRLPOOL 09fe3c7f532a3092abc4aede6bcd62dcda962de4e9ad4179797a0e653e971fe3e8199f751fecd9cacb35f03ba69d8eb4664e8faea215538ebc40dc7bf50c1ada
+DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall6-lite-4.5.18.tar.bz2 73212 SHA256 f4fa454812ac0fa3da96569dcac3c6bff0022477e1ba55eee0df5d260f8091f0 SHA512 42939a8fbd6190f396ad31d5107dd28df831ee5236329d714f209c33cdaa00976931da3e3c0e6e92f5f963d054aac6987686e90f47fd4879a96320e93a769e8a WHIRLPOOL 156e60c4c4665cc6b8c5c0687880f07a9d27151dc0919cc6add388c84e1c3e23dd9ac46fa0ae941e0ccd674a70ff89b8573bf1463b350574cab469cdac7d9945
-DIST shorewall6-lite-4.5.19.tar.bz2 73853 SHA256 c42b43c95ccb4de1f4ba2392321909c4e060b1facf1265745ec320a2b27b92a5 SHA512 51e72981acf5421db84472f707ccfd4af6c3b761453d144b6d57def3937d02c2200afc4669e3a9b3e7c200e308ce6cc8e1526231546ac9e3b8aa72b4593b93ac WHIRLPOOL 8f5c7c490b8f2346686d68c6c6e7d0227ff47a52eb70d9220b2f967eab725e2ed2486d91ded8c0944dd1d0a294e9e192a0bfb7cab4a5284e1837bcb8bba35219
-DIST shorewall6-lite-4.5.21.2.tar.bz2 77438 SHA256 dbe97281621f8af2cdc8a347b0cf6f34f9f42da786fed56b6bdc367752f66817 SHA512 3cdd70370ede5e1c77007d219b6313bca818e4de9d4e8a7056903b00a8586461370bcd6c18a3a8cf8e96b33a36d91509687b59abad1e549fb31d186b8fa2466a WHIRLPOOL 946873ced8e08c15b9422b4849bc72d63657fa01e816e189613717c283acda9951d2e90016b4ae55a43dde9c3f87b32dd7bc66fb2e98500c81883f50f0600d9d
-DIST shorewall6-lite-4.5.21.4.tar.bz2 77632 SHA256 e2df3dfe5b3308afce491cd71881ea01fb999e400cdadd85afc209aa3af299a8 SHA512 d4e599b59185563125a3d18207e1224d69cdc7d223a12a40bce1e5e938af0983fb4ef68f2061c9881f9e48ae191bba045e5774ac0e589e58170cc21635e434ef WHIRLPOOL 7b313cc8a0dd654db80215cf9a2d9b1eec00a46675b9497d96fb8481ccc8df93380fe36a5544c09075ae40d093d3d1d39892861509d19e278017912dd97855fa
 DIST shorewall6-lite-4.5.21.7.tar.bz2 78226 SHA256 bb3ad58c832c67c83a7a545162ec697d722709c0f69056fa1834040494943197 SHA512 1e16f6e933ac25fcabc122ea370e24d3941dcde226a32af4d94db2d14546be1e07f2b322f3d542a5c93a473ab4e4fa45a132d2610a3b05e836ca8f67a1d7d74c WHIRLPOOL 7c436ad0f8d0ef4458436e20637c89cc886256f51964ed24bd4a20340430f4cd89bb5c2d535b4231fb5c587e398c0eb26d9bd743ec405d687bba3effe6df0776
+DIST shorewall6-lite-4.5.21.9.tar.bz2 78451 SHA256 7e062c2bcc839ee7d84e958cf45c17a6cd00cfa25d5ee12a8644ac2ff73b40bb SHA512 ec62c0564f83090818060bc743b395cc96378b4249b2a68f54bff39012324c31705d7ad3b02564a9f32bcc2f536af38cbddd704fabe0ed4516f894b0218ca56a WHIRLPOOL e44a9e1e209b4540f1c0fae77d5d7eac6809505dc8956156429cd7b745fbd2fee3ef56811ecf681d7a82e138151a2d1425c5bd30593412fd01f5c7aad62665e6
 EBUILD shorewall6-lite-4.5.18-r1.ebuild 1837 SHA256 c9de1181e4eca8acdbdf2bec54ace8f5ec535a71dd7ec9ce0915e852de13450f SHA512 6987a34b060a1d7529c7e9e2f451f53ee466b72436dd32a826be65c67f57ba25555602f7930fc71540bfd2a89abcc27637f45e7839efad2e7c5b8a0b177f8f1d WHIRLPOOL 4897bcacb9b8ddbe68c73ee2c432db7100453dddb3583e32feabd831bb884885553eb1f7ddac21ee48f45ee587f7a50045667840469386fe9ac7fae87336699a
-EBUILD shorewall6-lite-4.5.18.ebuild 1594 SHA256 16b1e974275ce30be5e1310e73d24e135a0117960574d8a886c46c27fed2be03 SHA512 67190d8004b43680bc478262685ff089d97d081906aace42828921a7ea1dd2ecde9a1660b79aca758c0155beae77baa93d6eb7b5d8625bdc5eadb350f9f9c081 WHIRLPOOL 2f15e9a17b6271c0d6c0bbd737c8b4e70a5d11b84ae1089cf9bb1cca45ba9ec29d0dc9432dd56dc2897dfa68aec46b1bba6d08a966af7b0cbd2cfc48e4138ec4
-EBUILD shorewall6-lite-4.5.19.ebuild 2722 SHA256 d60a581080ad0437af974cdbf39521332a3082b47215550af38728c0ae3c5ec1 SHA512 be7e4cd1e36212fb0eee055777eb7e44d5b4ad531a450db9c1b8624173074d2e4cd519ca613a61be4a4e44d3da22154fafc707c4f67a9bd99fc0524856d1c34b WHIRLPOOL 605f56a6b59f7809d994392224b7376561f0b7ec3b8df209d686f9edc2bb2ab30a51cd638ca636b54d9e365138c5a038022f8d77a3d92ec62f98f611f5283ec1
-EBUILD shorewall6-lite-4.5.21.2.ebuild 3087 SHA256 547ba64379295c0a240e2c6fb7421ab1e6130bfdba18a9b29ba9a0f11646b5ce SHA512 df42267f3c33e686982ea243da2ecea52b21a2b6745d2dfa4a265b5d64aecb259d4ff8c42c26fdf059b45302c97853244bda6cce860c7d05c136944700bc771f WHIRLPOOL 9343a888aaf25b0d4878e36d796adb5746ab809f5f10aefdf51754a95fd22112799b175bb08299481d49d9a40060dcf5afe46718f517be9fad2f03a9ea72c4c1
-EBUILD shorewall6-lite-4.5.21.4.ebuild 3087 SHA256 fbde69b597d9285e63d4f72f2e00e7b706ecf2299844048ef491e3a3cd95c270 SHA512 915d50a97c7744d1299062a31775754a355ce1e6d741a753bd0964b71c7d27a6ce757bd8852b8ea02ce1bdc0739dd257ed9125aa1b2acbdd2b7b1307df17179f WHIRLPOOL 1a55c2b58494dce30e7cad1bdf81c51f81d02652be419cacff2968742e0a6d1cadcdd6e2ee494d13d8830a35513be61f494f0b80790516a49f38eeb66767d0e5
 EBUILD shorewall6-lite-4.5.21.7.ebuild 3156 SHA256 db3e419a76414335cfdc7243de749e98f830cc6d81f4c16c47bfa74c234f6b0e SHA512 5cf84204a9c37e74f46c4c89bdb3cf4c8848d874b3d3a449f7e8e2c63c36f4c46aa14aab85b909162734bfbd043edb6448452512bd625a4c85db043665c73d63 WHIRLPOOL 078bfcf81799047eb7078ec7fec935fcef037b587b78031f4dbc0bac8e60db0a01ee9a47b86d693e4e06a23162f4a3bd929becaaed8f9359ff2059df6e335dce
-MISC ChangeLog 13158 SHA256 400d97d912fc3374bb3f7e86167346473f53f62b105b9ad1df8b69f4474d729f SHA512 679f71cf598bd2c0be91f657375b2c86842135d623208e343f1a9431848771e7cd2049486dfe57f345eccf590f1fbc1bce6c95b81f83dd2082330c9f7128675b WHIRLPOOL 0a59b8d83b68139b8c34a0199f237c14bb893c89f4ac75222a4141e4d5a6358f1d7cc79a10cabb04108d1475e042ec028d55a5114909590257bb5a906981aaae
+EBUILD shorewall6-lite-4.5.21.9.ebuild 3104 SHA256 27f381b7cd04025739b1b9ac8b61b8b8b97bcb9623c9f3986832225e112a80bc SHA512 683ac792e02447e1978ca7908692c956dd86ceb5c31f910521b2667a0b70f73c5a8c068284f3c500ba63519054cba63055cb9433bd03293b42f1cd160b22e76c WHIRLPOOL 3d685d59a77490203e63803e806de2c2721bb3637e3e65eee303e3855d19d28105981420af2cbcbe7f58ce261e882c549dc20dc3db8f2f217a6d74bb3a2c20dc
+MISC ChangeLog 14199 SHA256 80c009841dd23e86f041e03c508ce409bbfc6e233e78480c113bd1bf2481742d SHA512 037b6acefc9f30c5bdfc26dd30a2360a411d171ff98494898aac21db5698faa0f0595f4f78116453d24fda00c497b68fb22829e6a13ac128fb28bbff46b51c1d WHIRLPOOL 56833b56f19d74f7a64c2b32d5b24ea6b12844cb38feccf9e1a96352d323a176742a43969f9f916764c0566d6833fbd6c7d24271e94c723143e271c2d3e92aa6
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLyGTAAoJELp701BxlEWfuFYP/jUAN7Pb241MMxllrTMxu7F9
-KyWSNs5xenTrw5IO7V65pKcz/tvK0EPjNn6sAbixBDeq6PpiXWTMXhif/RZguYtU
-mdmaZneYv427N877jfyD6S4otIh9531nNUUe5oCuYv3ENMhA3/q2oLJKFbf2h7VW
-G0D7isOZYBruvPid+sD0f5OybfFgaOqId9ujgSR2y70my+tn5O2d4+AVsIecUgGe
-N+mXLYpnv6uyuc7h6aPoBE6SPmnZBXjuZF9R2q0ElQlz3j2uyc1SSubHMQ/z/sV2
-qi3zipeQInzP4fsTw0CbgEciagA+WHPHuAZQf5rFXG47sizv42k4EOM+d0GHIM7Z
-1A7k+8fHp1HnsKweDOi+L6lsGh5TC+pmHhX5BENKW5Y1CnNZXfRLfAqrPwCUw8+G
-/au2+spzMgxyYzG73clkQ5IJkx7TJUTkodQrmHqbievje8pOT3t3CRwTg0J49fO4
-vO0v4k3kcQyZvdUuL3cJIFYHV+hi+RgLyJrZZfGlWlEUoYMpv+1VFBkYWRj6qh73
-tqCZgTNKLcZASPNp7K/FBq3ha6ajQMYv1k0JiKa3yW9yWnp67iFxDUTAb0C7qVZK
-PI6eHr6LfRwxobo6WIIp3gXGfBHmFngDc/ms0L/Zhy3KWPqgJk779bFgP64LofMs
-d/LxfdSbZ/JuifQFk+9G
-=MXyu
+iQJ8BAEBCABmBQJTW3yrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88B5UP/1Qk80ON7RBoFHm4mWJfOG6j
+o3kUa6RQDg2RjE/ZFm4pJrjfacvS3JqjMtzWldUBse50H8ONMev6k/RPqQc9sks6
+lAe2NZYAAm/T4z2LSc9Wtykb13uPAe1HdYOmp1Csg9pRuGClMK7QrQ1X8M0DdKIo
+KKf1S815Kr0mImJOmbw2MqNXXXQVXFBufxvn5bf+V1gKYDcT9cempLdlO5mujuBB
+X0uPk7Bq5sjsy1uZHgjFVNUwWdFgeMqWP7WSHQWPSL5XEldqdlr/GG5n1DR62jv3
+w4GEGKPxoxyovz+YMVia1y9td+5y6Wa6pJOHgetvgPx4LSo3o1ra2kNWch06GZ1t
+2ZHgUdQ+jXSAUPH3IlX3EiZXkOFgb1hxYE9kZAWwAA2DoZlZaX0b7TFxYmpLrYGw
+n9Fji6IXaeaH2O2V4gK65t18DW3sCDF+/Gje+FlLOL5gTQezIy8IJhFcN2QhqO1j
+vtNGFs/EY+8KL4SASZKbqswynoGZlBMixRi651sPEEtIMb5pycNfGrb+qhOuDsv1
+8Nfvl0cMQ3iWSqvGLCFFnHKUupCHPF2N51D4SyH/tYEcaM1UsAd4n9x0+YeW/+zr
+fDQv5o0hTYkVq0sLwNg2E/mRis20pa6IbPutjdN49SWKhQ/PvKK7ZNqve+agF7x9
+BsrLVq15eY/oFIzoj3qy
+=j419
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6-lite/files/4.5.19/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.19/shorewallrc
deleted file mode 100644
index c2fce7246c1b..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.19/shorewallrc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-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/shorewall6-lite/files/4.5.21.2/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.initd
deleted file mode 100644
index 791fcdd583da..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.initd,v 1.1 2013/11/10 17:37:51 constanze Exp $
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6-lite"
-	/sbin/shorewall6-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.systemd
deleted file mode 100644
index 5af21b6c19bd..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall lite
-Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6-lite
-ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.2/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.2/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@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/shorewall6-lite/files/4.5.21.4/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.initd
deleted file mode 100644
index 80196b957b85..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.initd,v 1.1 2013/12/02 20:06:45 constanze Exp $
-
-description='The Shoreline Firewall 6 Lite, more commonly known as "Shorewall6 Lite", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="clear"
-extra_started_commands="reset"
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6 Lite. The firewall is"
-description_clear="${description_clear} then wide open and unprotected."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6-lite status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6-lite"
-	/sbin/shorewall6-lite status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall6-lite ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6-lite"
-	/sbin/shorewall6-lite ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.systemd
deleted file mode 100644
index 5af21b6c19bd..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 Lite (Shorewall6-Lite) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall lite
-Documentation=man:shorewall6-lite(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6-lite
-ExecStart=/sbin/shorewall6-lite $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.4/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall6-lite/files/4.5.21.4/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@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/shorewall6-lite/files/4.5.19/shorewall6-lite.confd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd
index e5957167b5b9..e5957167b5b9 100644
--- a/net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.confd
+++ b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd
diff --git a/net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd
index f32be9a60ec4..941e2ab916a4 100644
--- a/net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.initd
+++ b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.initd,v 1.1 2013/08/28 17:02:20 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd,v 1.1 2014/04/26 09:31:42 hwoarang 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/shorewall6-lite/files/4.5.19/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd
index 5af21b6c19bd..5af21b6c19bd 100644
--- a/net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.systemd
+++ b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd
diff --git a/net-firewall/shorewall-lite/files/4.5.21.2/shorewallrc b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc
index 46f5eb9a3603..46f5eb9a3603 100644
--- a/net-firewall/shorewall-lite/files/4.5.21.2/shorewallrc
+++ b/net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc
diff --git a/net-firewall/shorewall6-lite/files/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
deleted file mode 100644
index ae2d516b4297..000000000000
--- a/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/shorewall6-lite.initd,v 1.3 2013/07/13 14:13:55 constanze Exp $
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-checkconfig() {
-	if [ ! -d /var/lock/subsys ] ; then
-		checkpath -d -m 755 /var/lock/subsys
-	fi
-}
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-	checkconfig
-	ebegin "Starting shorewall6-lite"
-	/sbin/shorewall6-lite -f start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6-lite"
-	/sbin/shorewall6-lite stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-	checkconfig
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting shorewall6-lite"
-	if [ -f /var/lib/shorewall6-lite/restore ] ; then
-		/sbin/shorewall6-lite restore
-	else
-		/sbin/shorewall6-lite restart 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
-	/sbin/shorewall6-lite clear
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the shorewall6-lite"
-	/sbin/shorewall6-lite reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6-lite rules"
-	/sbin/shorewall6-lite refresh
-	eend $?
-}
diff --git a/net-firewall/shorewall6-lite/files/shorewall6-lite.systemd b/net-firewall/shorewall6-lite/files/shorewall6-lite.systemd
deleted file mode 100644
index c34c688b137d..000000000000
--- a/net-firewall/shorewall6-lite/files/shorewall6-lite.systemd
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
-#
-#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
-#
-[Unit]
-Description=Shorewall IPv6 firewall (lite)
-After=syslog.target
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/shorewall6-lite
-StandardOutput=syslog
-ExecStart=/sbin/shorewall6-lite $OPTIONS start
-ExecStop=/sbin/shorewall6-lite $OPTIONS stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6-lite/files/shorewallrc_new b/net-firewall/shorewall6-lite/files/shorewallrc_new
deleted file mode 100644
index 06253dc2b8cb..000000000000
--- a/net-firewall/shorewall6-lite/files/shorewallrc_new
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux                              #Generic Linux
-BUILD=                                  #Default is to detect the build system
-PREFIX=/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=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=etc/init.d                      #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild
deleted file mode 100644
index 803352c9c39e..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild,v 1.6 2013/08/17 16:19:06 jer Exp $
-
-EAPI="4"
-
-inherit linux-info systemd versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa sparc x86"
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	=net-firewall/shorewall-core-${PV}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/shorewall6-lite.systemd 'shorewall6-lite.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.19.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.19.ebuild
deleted file mode 100644
index a3c4be666438..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.19.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.19.ebuild,v 1.1 2013/08/28 17:02:21 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJORMINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PV}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	sys-apps/iproute2[-minimal]
-	dev-perl/Socket6
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV6="${PN} requires NF_CONNTRACK_IPV6 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
-	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	systemd_newunit "${FILESDIR}"/${PV}/shorewall6-lite.systemd ${PN}.service
-
-	# Currently, install.sh from upstream is broken and will always
-	# default.debian so have to do it on our own:
-	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall6 (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.4.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.4.ebuild
deleted file mode 100644
index 7ed9ba23c131..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.4.ebuild,v 1.1 2013/12/02 20:06:45 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-core-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	sys-apps/iproute2[-minimal]
-	dev-perl/Socket6
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
-
-	local ERROR_CONNTRACK_IPV6="${PN} requires NF_CONNTRACK_IPV6 support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
-		elog "create using ${CATEGORY}/shorewall6 (the full version, including the compiler)."
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall6-lite-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild
index 180fc775874e..6474803c6576 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.2.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.2.ebuild,v 1.1 2013/11/10 17:37:51 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild,v 1.1 2014/04/26 09:31:40 hwoarang Exp $
 
 EAPI="5"
 
@@ -38,8 +38,8 @@ DEPEND="=net-firewall/shorewall-core-${PVR}"
 RDEPEND="
 	${DEPEND}
 	>=net-firewall/iptables-1.4.20[ipv6]
-	sys-apps/iproute2[-minimal]
-	dev-perl/Socket6
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=dev-perl/Socket6-0.230.0
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index cf87ab3548a8..4463ca96359d 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.96 2014/03/23 18:01:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.97 2014/04/26 09:34:36 hwoarang Exp $
+
+*shorewall6-4.5.21.9 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/4.5.21.9/shorewall6.confd, +files/4.5.21.9/shorewall6.initd,
+  +files/4.5.21.9/shorewall6.systemd, +files/4.5.21.9/shorewallrc,
+  +shorewall6-4.5.21.9.ebuild, -files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch,
+  -files/4.5.19/shorewall6.confd, -files/4.5.19/shorewall6.initd,
+  -files/4.5.19/shorewall6.systemd, -files/4.5.19/shorewallrc,
+  -files/4.5.21.2/shorewall6.confd, -files/4.5.21.2/shorewall6.initd,
+  -files/4.5.21.2/shorewall6.systemd, -files/4.5.21.2/shorewallrc,
+  -files/4.5.21.4/shorewall6.confd, -files/4.5.21.4/shorewall6.initd,
+  -files/4.5.21.4/shorewall6.systemd, -files/4.5.21.4/shorewallrc,
+  -files/shorewall6.initd, -files/shorewall6.systemd, -files/shorewallrc_new,
+  -shorewall6-4.5.18.ebuild, -shorewall6-4.5.19.ebuild,
+  -shorewall6-4.5.21.2.ebuild, -shorewall6-4.5.21.4.ebuild:
+  Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de>
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> shorewall6-4.5.18-r1.ebuild:
   Stable for alpha, wrt bug #487690
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 3a76457bbde5..4d22ef8157c2 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -5,59 +5,42 @@ AUX 4.5.18-r1/shorewall6.conf-SUBSYSLOCK.patch 709 SHA256 6fcf06104fade54ae601b5
 AUX 4.5.18-r1/shorewall6.initd 2844 SHA256 ce1e60d23ecce4a2c6d9e0829c152411439c275e1eafc1b8a8e834e5da72f3f7 SHA512 a8d03bf3652a6488bb7d5bc8ecaa9febeefac1b7d1f2e86ab52a7de79a8d01ac70b243cfe626c244e4ffbcf64de13dfd3500d5222009b6955636303433e22e6a WHIRLPOOL dd2957be764ba457b6e537de0337b39fb2ebbf6061f1da84c6939f2a5b5ed58067ce446ca248e74274ef2a60fa9c002df7b6e576bc70a5d1302df8f5985768a5
 AUX 4.5.18-r1/shorewall6.systemd 453 SHA256 9e1e5d7657591a395b3f66849f323e00226c0bf739e7c875b9787b43cc64d11c SHA512 a7cfe34c106bdc2d50cceb607d92888f4c6b0d618d5dfa96f0c3a78689ab1f2092db609427393718495ed6753f89a4279e6883d44743da6bdeb1da3a111b1da3 WHIRLPOOL bd4253a8b58975674bd40b0606efcbcbdc6facf8ecb48e9c14792f96fa1fe49eb84fb05f89e7a54b1cd01d7f9b4463894670738b3b0b0ad2b7a01fbadc64ade6
 AUX 4.5.18-r1/shorewallrc_new 1893 SHA256 f24c31f70e1de7b802d8fdb400833885df2a04a1fe15a0b53e828cd877995de1 SHA512 ad0b4aa60ef414ba279fc425995ebc088b7a6913ba4748cd205542fec7555ea6bd2cb31cb109d9eb11767ee259cda9aa2a05f979269a54c905bb59a3cc4c014e WHIRLPOOL d37ec5e41ba96a3e54ea6bcdb10f0623518949360b5553387669d2bdcbbd5d22836b176d566a21efcfafb854605cbde960b19a69b9c486a54ee5a659e78afb81
-AUX 4.5.19/shorewall6.conf-SUBSYSLOCK.patch 709 SHA256 6fcf06104fade54ae601b540dc2e6a1c282233742f6ee6a68b8d8599e8fd68c5 SHA512 16a20ac4db95f1d4658038553d816a5158a23ab241cce7bb5103f48d5e83bf438814cb26bdaac62d4733e41653c557dffb83a3c15ec11e7346b3d6ac355ba8e6 WHIRLPOOL bb2dfdfea1df96e0a72c0c9ae4a5b7a1f151de4d83513f97f716e9f22c354cc02f23b063940fa3a602dbf69bde45b7a2d0945012b21ec71de307275a5ad2b046
-AUX 4.5.19/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.19/shorewall6.initd 2964 SHA256 9ab8d2afe04ac64af42bd515ce54f39bc93c44a0f6e943e723ddcaf92facd4bb SHA512 80ca72cea77f9274ef4de7e44515072ff5d2267757cef3605b61376d37484234c99377623fa49ced8c43a983af1dcc61afb23807e71f8a38a2f3819f5e9a60a2 WHIRLPOOL b5bf30f8af4319b01db595aab9290303802a347ac2cd439f89224e2f3f04096ffb77a1f5af04a4b688a7c0b314769269a388c4b2e93758f952fa8f04cf38c9b8
-AUX 4.5.19/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
-AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
-AUX 4.5.21.2/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.2/shorewall6.initd 2966 SHA256 56b9d8c79a07ac35298d6f48bfc91ffb619fb6fba7107d65f9a22be0e67c1f47 SHA512 430758539a369222732f568db1b0d57044aaa1cbb36fddec434a3a7f3ed689613f7053956c87b1fde3f15ce3e6e6ee567429225f17d9a3b9745e9b3a2b990870 WHIRLPOOL 325dfbb718593c523f6c63d4cd648c13064a31606a40fc7399d63feea57e489a3b5b96d1810960a0d95f6ee7435d573d16f769a712984c46f6e3e04fa3085168
-AUX 4.5.21.2/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
-AUX 4.5.21.2/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX 4.5.21.4/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
-AUX 4.5.21.4/shorewall6.initd 2966 SHA256 25b2fa0f7eea23828a7a29d4553921ca7f887457c21887769c88e070ca050e1a SHA512 6e1f09aa4a53a0938e3b719a03f6f22e842cbfffee475a8e5a9e675957d66f6344a7fd6965b04c78ff8fddb24a6cdf7e2dbf7af9a02320f27a226c6d55381c5d WHIRLPOOL 23057cc5f8c8500b2d70d28d484380cac24f608d1e6702d149c0a402eb31edc65848ac605799cde569e7ac1decee153510deb517505513daeb34716da797b171
-AUX 4.5.21.4/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
-AUX 4.5.21.4/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 AUX 4.5.21.7/10-releasenotes.patch 664 SHA256 4ee659b57587ef099e7a3b14f29045cbdaf19ce7a9bf65399cf605b4468f99af SHA512 89c5b3f065a7424de74c0e56ccd82c57319c12f574df3ff61b28f758f7a3745a5cf4570febd9229709fe1b309fcf4d19c49c55f4b558b1bd6db1f6e2991fd321 WHIRLPOOL 636149cfe237cd3186b92e8fecc922c76f11620f2c416c338a80e72d45cc480fa3c17cb3bbaf237ef4d301c986aec256548ff428c5e70859b38a3a6b83e8596d
 AUX 4.5.21.7/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
 AUX 4.5.21.7/shorewall6.initd 2965 SHA256 8971419be63eb1dcd52038b633f3ddf2d393347471f4ccaad6ad198058091d6a SHA512 0d1a266e453a801ea154fdea8bb7573747e7e1a573daeee0e7e3513a6ace9e05feb3100c1633fa0dc7d006ade82b58640e78320dc52b7c6e89734a924229c2ea WHIRLPOOL 7c1f7bec4bddbf34979da840dc682126ed5a2ecabb4b502f7a074aaa03c8fd3886b10288501e27e68ba484ed326c6fc1451190dc835308094e92593c38d9f779
 AUX 4.5.21.7/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
 AUX 4.5.21.7/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
-AUX shorewall6.initd 2082 SHA256 a4c0a5ec7fe64e4af91b7ded8ca983fcc58cf003a778948b65b01669641b7ad2 SHA512 a2f21727870b841ca3aad0c70ba233798513504d5e5ecac2f002fe754230042a6cd5308a385de4a9f3204f36f4f1e751391b8f49d784c31e8f7ee6546f7e349b WHIRLPOOL cff3753023ab4125fa1bd15541c85dde6da6a43bd1af70357ba87f7e90be5582f724079abe649075acd891f6236266e54c2b979a205f052fffa739fbbec69988
-AUX shorewall6.systemd 453 SHA256 9e1e5d7657591a395b3f66849f323e00226c0bf739e7c875b9787b43cc64d11c SHA512 a7cfe34c106bdc2d50cceb607d92888f4c6b0d618d5dfa96f0c3a78689ab1f2092db609427393718495ed6753f89a4279e6883d44743da6bdeb1da3a111b1da3 WHIRLPOOL bd4253a8b58975674bd40b0606efcbcbdc6facf8ecb48e9c14792f96fa1fe49eb84fb05f89e7a54b1cd01d7f9b4463894670738b3b0b0ad2b7a01fbadc64ade6
-AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
+AUX 4.5.21.9/shorewall6.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.21.9/shorewall6.initd 2965 SHA256 c307d2c49141dc5d9cb1dce5af82a6cea95fb03bfa8e32f652621637fbcb91cb SHA512 fea12b3cf0ba1510137d26c6ed72a331445a81b1b754e2ec580134667cb6136e23a56a275f921a5c88f72e6b2965bb7078a28dbaf7c21f9a2be191c90a4015d3 WHIRLPOOL b4ddb871e93b5c1a6aae4e12415e0dd0086ff8c5773208483f22a29e395fa92fd4ca5ee2a672cc63dea268bdf9be7414c245673dce645a56c9c1900ef3f89d6e
+AUX 4.5.21.9/shorewall6.systemd 453 SHA256 8d6bb489efaef58a09c0588feb3e281c3fc2b8bfbe44306c6fd9f4cf6b7a1546 SHA512 df02db52e24ba80ec2b9c25e68049ddc6ee49aa0468fafc882d322faf05bc4e000fc57d06301252723e6f6f43fee603c805f26d0ac9174c944c3af2ca816ca68 WHIRLPOOL 215fc9911a1e77a69c9a53334d7d9e2b2e0c27cdbd06cfd8ad93049bba0f0b0bd86c41836dd1a56836836785aeb4207df607dad81817e2b9577de9b03178b6d7
+AUX 4.5.21.9/shorewallrc 2006 SHA256 1f5a784ccb33ffe50cbacc066f783e1446996a60d99deb473ffbd5a69e9150a6 SHA512 c397c556f56444b08b091f405f2b82d16cf4b4e42d98176bede01ff32f270841fbaa6e0e5f5e7e1e4871ed5a0be22b654ae5c07f728e747449ab5f43025cde9f WHIRLPOOL 1d94b8bc7a9a4ac73480a610be58d4842bf0243f004fd7d5f668eab9be0e02ed3ce58bef9281bb638e5e5d346f47e8a15cc33d9a1e0bba1d642e125923d953e3
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
-DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
-DIST shorewall-docs-html-4.5.21.2.tar.bz2 4144789 SHA256 b4cfdcb84525a3df1430c71eba4c1f86378d96283c250d8c2a9d81ac921bef88 SHA512 57a5dce628301a043110a28874dc73244ac8aedb756c62bdbc9ebc66ba324c989debc6dfdc6e9f19538356b60230d88b708fb9562cb9016783d41d9efbdb495a WHIRLPOOL fce6eca901c7444fe05cbd72b59aa836967de19bccbba3335b74b05e220ad297da15451d853188d5dc65276b13af70c7134eb17a0119dd695e571fe23ee71b07
-DIST shorewall-docs-html-4.5.21.4.tar.bz2 4144800 SHA256 92167814eb92f2b7d0f3d94ea16542ad946f566cfe44b86ff447cd11c75391c4 SHA512 e65836162fe376da9f992b90e839d8ec5d3d1213449dce7f97f04e93fa1b2d52ce0acb2741be68eafe6101fceec9bece767d870d67beb48709de5421ea175c4e WHIRLPOOL d3c353735099677b084a8ca6b8aaeb802f0acb0aadb7e3f8bf6fbe27dedc388affc1a8113b383b055f3ef89e2b441bfba3f564a4ad16412d8bdd216277879693
 DIST shorewall-docs-html-4.5.21.7.tar.bz2 4146237 SHA256 cd7de8343924828cea0959496a96f830086421d8583783158a80ba0900ae021d SHA512 4a945aff7d03b726ca14cc9f0bf9b1d42d06ea670f7aa917bb3ec085eadc3dee004582228702885b3d6ed56bf24e291bd7cae03e327e2dc9c8d7dc616962ddc7 WHIRLPOOL 09fe3c7f532a3092abc4aede6bcd62dcda962de4e9ad4179797a0e653e971fe3e8199f751fecd9cacb35f03ba69d8eb4664e8faea215538ebc40dc7bf50c1ada
+DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall6-4.5.18.tar.bz2 245009 SHA256 f3fb0cec903b98bed6c968e2d6af6faf49b346cbb6508731888304e1372cf62c SHA512 d3ce8d70239cc76d05520d244b958078240af795cfbbfddf010cb31681f1453d40817497939ff02b7e0a5da57291b707254a9eea420d7ad4921edad126eb585f WHIRLPOOL ed6e83b67d680493574818f0ada820f704aad37baf9dd973ea7702890d25a2989c53c5a4f1d8272ca4741aac595c9124011fe95071ee87ab3064e048d65192d8
-DIST shorewall6-4.5.19.tar.bz2 245873 SHA256 6681669055d86338bcb3959afce43b9d073fe8e10ba9b482b5664ddb196a9201 SHA512 aa38fbc494a2c5f59f7bf4e5f84443c092e7bfff757e0b9e4f2669a0a214ce28f0022cae9a4ed51624de1974a261df6a3c43055b2e990af011e2027929e250de WHIRLPOOL fcb736bb440973b7997b79adc8021b618e8e8a9ebc0df81e9c9c07736df072de16f6a9d9a727520528b396c96264497d9f6f367bd6125a389a66a6d3a442db1c
-DIST shorewall6-4.5.21.2.tar.bz2 251470 SHA256 1d9a560e0f2a1d959ac5e2d8a351a05906b843bd8ea717c5f5e38173009c857c SHA512 7f406fae1635e3d0e0bb4637155c7548a27bea131117fadb33da55a83b60682ed35a9781d1ad066804ccfae4059ac10c6edad7522e5145f26445fed957b96f4a WHIRLPOOL be7d7bd75be7405b12b949c62516ac270874f361c10b850ec66c07b2ab62d6e20d6cede14bdd1f5250087a7e292142e6b42112cfb0c5e0c28e2f3b3387ca37cf
-DIST shorewall6-4.5.21.4.tar.bz2 251455 SHA256 32c76e983c3f5c559a9de29cecfa9e918ed3f242d7bd4c1d49c4dfe5fff49a5f SHA512 4935752e77826bbee0cf241a9f6800f9437f1fb5fc9cb1201a4abb8f93c7a323c41afe7019771e8730568771b2a71087a0cdc8e7caf13b894a7c3eac136f3cfd WHIRLPOOL 7918322ee736774b411baf3fffb41d6a7bd645b39244c0327b1858f740f79c79b0f6617d5aa5abb9a68a090024d954a69353b79ead392644d1ee11469b7f1ccb
 DIST shorewall6-4.5.21.7.tar.bz2 251998 SHA256 af7e247f1c4598c24c6128eb791bab9b59eaed2b0f832ff548a02658f20c6c5b SHA512 64f0b21c3b505a222af17947f26bd320945b73a760bd2a7fdeb010b671c2b4ec883a1899cc966dee8abda2e9689a7c355b3e6a34e5f1c46d832174ff03e4d0c8 WHIRLPOOL ad29f38a671aa6ab54a272f415996f340d48ef6d6566915e6a7d9a83c8eada07ea7db3a6b84266efa1603b51342bfa0a8f2aac20f82bf7b77a168950c6d906ca
+DIST shorewall6-4.5.21.9.tar.bz2 252533 SHA256 2c4606fffc49b0129ec79142493949d8efe15bdef4f6e1619af32e694cbd5aba SHA512 91be0dd55485d56b33f52a91f315562998e6aaf7f2f5ddcb1882fcda589146132810d0f1d5ae2ab6e6ec1256319084969e1499bdd3f37e5a63e0cc65d5ed77bb WHIRLPOOL 7e129116662c8501fb12b23f9552a01d9ae14501194376026ea43758d1470ee7739ff90e26985c7d1e9e9a8c7db7cfdc26b64943e8e470893f5d38d7ef51509a
 EBUILD shorewall6-4.5.18-r1.ebuild 1928 SHA256 aec9bd90a4575ec255e979c8a31ae65b391ce8ce4dd6c1dc349ac6b006eeb730 SHA512 4a30ea4326adfcb1470e47cb08fea7261423f034f3ecd41197eee79f38be3075bc5eba875e425db222f339472971af7f5a71bc07de7d7c2162df77d86106f722 WHIRLPOOL a1411fdcb29e8c89d3c2fa14df99afbf88238e3c2261a723da036562ae35a1bfa9575138279fba5ba7e61b7dcfff5f4fa6ef7da25734b193b0624a27735e4db5
-EBUILD shorewall6-4.5.18.ebuild 1631 SHA256 4ad78a59af8c9ea6f657033c1aa332b865bd8888a069ef2c5db088df92e9abb2 SHA512 278f7c3824d266b24db67c71709955287fef59c1a5467a5e8be935b0117fc0d3171ae09d231f5379ba3a21e4be941a82c38bb7cb9205c6e3925701cd06b753bb WHIRLPOOL e7cb6faa7cbc1ec6545b0237c8be6a861a8b6ce702461c52f202b97df795cc3cc8669fd01772646f251caeadecb9f3ce29a83fea79f69ae69ddc3ae3f2b814e1
-EBUILD shorewall6-4.5.19.ebuild 2902 SHA256 f8fa92a85d7cb5352cf14b77acf0e81db461583594ca214ea93895e50375b4a6 SHA512 9ee94ef13cb107e819281e15d001de92cc3e57ba595d76260ac8b535a842155fa1e873ad2bba14d71b960300764af6858f34bb7f8ab367fe32491764d3427a2a WHIRLPOOL 5c40af6bee9616486b6a35f0988e3b93a2529ffacbd88530285e29f8d2178d107090daaa2d29e39e82c4bceaad1eea69daed3382bdf99d5cbab8b3d097a7c7a4
-EBUILD shorewall6-4.5.21.2.ebuild 3208 SHA256 98969e02f33f6ef86a4a9146e80f1de242b19ed417e26b2a3816a98b835c9906 SHA512 d87be24fd3a6b4494c246020a8075d7f3d68661e9ad574a1eae325b39631be5020bf147e5f43e65ad8855301af2f3fa326a8fcaf62213095fccb63d9fdc7273c WHIRLPOOL 202a70574cc1d17b9140a25347a2dd50139cb9670487bd533dd0aa049290d3c2464f6ebc6be8318a7afb62be3a21b32da2a036fd3b6d8bd69e3c960fbdaa94dd
-EBUILD shorewall6-4.5.21.4.ebuild 3208 SHA256 b4090f7adf0020b98cb4786d92ca1a57f51a98a047ba7b310b7ab01dee4a608a SHA512 11b94d1daa50f4f62121d3777e1964dae65e6e2cd5bcb53b1126476d0f55c86a7e7ba8f6a2d6bab5fa76e439cc8a93bc7f9c3bcf1f4c7a35006c856a9131bd8d WHIRLPOOL a7b4edce2f0c0127df602d99011e60eb973545698d29479e2937e257e060b396c04bb5f7edb53776f9572beb5ab0de8a6e43b20c63cbf8e58b4a755d55764edb
 EBUILD shorewall6-4.5.21.7.ebuild 3277 SHA256 4a41224a316cd117a436e733ebf6a89aa711d8d16f23d653ce043fe8f8cac624 SHA512 3cba75c6ea5f9236b2f18a7f4a14848ff52a0da53aac57ae145e812ce07e774fa6bf5ede2470761d7fea57b32974f7ed804f337f55cea75670a35d65f8ee6dc0 WHIRLPOOL 888b3840acba529705867843bc067954593dfe4b833e1086d610f4a5a671eab342b3adeb11f21296d200e1d001a6b24d52e82d7aee603e4717e58c36bd5842d8
-MISC ChangeLog 15547 SHA256 6f2202545c7b507a8784a84ff7ea80548be0825e9b9ca04f9f57d2dbcf5d6169 SHA512 2bec14446502da7d55ed67e068d91b3e9b5b22cee6bee7b77e079cbd9410448f584b5bd586d0e7f67f872f343f0aefac50d7cc36036b17f4445a860ea59a0ca9 WHIRLPOOL 6fcde072564e2255fa8a64efe275075e5e3333a09aaa88c784b5be9056644507fe599ffbab194bf018ce3ed6e4a9cb2e58d091525a9c7af7954b93b95b4e6fd7
+EBUILD shorewall6-4.5.21.9.ebuild 3225 SHA256 e165aa110964abb301bb95f99ae3409728fecd4fd066a9fadf5f7edd7e9b6553 SHA512 381ae595f93466c46a849782c3d60d5bb4a0378d9bf3272d590ec79c710d2a545e2f7a4b438c597af53513c6f33c6a1f8b606f6864f6b9b8dd36cc1f10aa4d27 WHIRLPOOL 344d054a4c39c865afa25895032b753f886367d25c1016197acb43edf5992a86984638b1630894269cc9702c885f5f366c68c3b7460dd96dedf7072bd7e1d35b
+MISC ChangeLog 16534 SHA256 2346d4e1610f4183300977de51ebb6009c634ef2140a660de72381491b1b5ec6 SHA512 1cd049e64d5937fada65993b06b6d1425d67d0e56dc1f4c0fdd660ff775b2a96c0c4bce75826ad9e87a166d1a88cbd1597a1e565d032194606d17ee22c3ba50d WHIRLPOOL fd0152fdbe7a2954c2c2ee8b2ff2ad559b69f521da42f0ae746c655ba4f91caa73098057ca4afc833218fc2cc648a8c2ff9657eb968b205fd273dde22ebb679f
 MISC metadata.xml 289 SHA256 8c1fb547b467632a3f8f41524f2aa2fb7bfcaaeb980e5b9eb7dcde83464df222 SHA512 b626395ae7b75ae4bcd3ca4120e967f649ceb514661dcc967679f9e5e93a9974baf890ea77426144623821f01e9f42d6fbc405172d0530e1e7d8bb0f046150b0 WHIRLPOOL d0e1145ee0aa32be11b6ad80c3d6e69392b3853a72af757fea16deb5f84e01c5fa8f943589662697efc2eda5f7149dd9601e95bf653cf2bd24917d82d3844449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLyGQAAoJELp701BxlEWfnTEP/21W8gj3hBg5aimxoIuNqKXz
-anWgUFguqTyso6dvmPPTIdgL9b/sDBbwf26yZMEWF1jGOGdcz4egwORW7cMdS/QG
-FaLrOtT2HmlePHt8We6nuHsAG8cO3nkhpJugY0Pa4OJ2KxeukNYEW0GWE2O99Jwc
-C+NL2yEvL1B6CUaNOg3QrRhQ2p3V7vlaVobS1K0ZiiKuywE05i4kzgiX3KE+pQDu
-eFGwmz+JPomrSx0097UiRQHXUQtwtzP4pHGGmwgYnKTrdNAOhya74bkblJoS4gf2
-+7ErmMny6OypzstfPZvY7tm7fzbtXgU75v2sJZQl3s7dQ80hA0FMAG5US7f8ZPsu
-+G0+yh6MMML2Nk5jgNOf+8/wrquWyFrlri+bfFhO9qItktuAemQA1CvgHjq7kRjt
-PrUtUXILTuuZli7ii5RLPbchGClJmMBFm8s5MuSPN5cOSoRTvYO4RBC7UNrBuDyH
-9VOe8kueXU/o6Ljea12/6NkaE6o27I8e7mBt5ZEq/knhfFTOsFZSdM66uvM63fkd
-46YGGKi7J/xdhK7O3c/9XUWhVt3+ZV2rx82yoPISPcG0GdmuuVtq7yQHY3+bZXFz
-7qZ3QQruDkpKPyi51DnRerkjLRV545RotcoUCcEGbKehCdoWkq8rPZZt6rqPDE97
-QzYFlHwfsrpZ+gzUpuZh
-=7W8U
+iQJ8BAEBCABmBQJTW31WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88UagQAIsMfNVCnVUd30O38X7QMm+y
+3jNSu5lttUyTr3pMFRNmueQ5Sx9xMVCrJbPjVRafbt9btoI27wj1f/1zhtp8/Tgs
+8n3e6xMeeeOGD4n0YmtusVoAuhQFHeAAp3e4PC0yBuQH4JSBBRSM83t1SiuDx8Ky
+DAkzlyWtRymeMZMK4akmT8QEX2W5P7QS1PGBWQKPS03jTmvVUHzu2ZoOM3lrfxdu
+9WBeqb5Qrm3/bdKeZGFilbMUXtyTxHGb3yY+iffRzHY2k0R22fIW2HnO2V+gXz6b
+q1CaxQvesBKs3VHO+KedNDRkSb72IY2ctavfG/h8kVm5v7xcY4Mtwe3hi65zu+ae
+VLVO13L7DaFU8XwIgjIstC2opWwiKxZKyVcKe8kOE1NQlSId3mWN933Je7OAz33v
+weAz/qPphFZ3uK10HlIDM5cRIvL+cq+Cs6+KqG/Y9ixXG+TvmF115dIBuxQ15nAo
+6G6YQyhLOxdLNgt0G1aa9Pg6Vg6v91ArQ8h0vb4+n4cYatRMS3pYucKLxwhi4GHi
+T4BNsmMDDCjLDZQBNkEbKXL5ITuhBPEV/j0KuCyNQupTwomvjA+orMmcTchZjFUl
+Mscfdhx91WEy6EuZDTB4FxRPqvnSFPY1tEo3y/JVFtb7BmMzQ+f+/xU8pewdZ1AB
+8ia/JEgo/WluMzEUd0DV
+=KwVa
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch b/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch
deleted file mode 100644
index 9f3742a83568..000000000000
--- a/net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configfiles/shorewall6.conf		2013-06-24 22:07:38.000000000 +0200
-+++ configfiles/shorewall6.conf.new	2013-07-01 15:50:54.747711444 +0200
-@@ -85,7 +85,7 @@
- 
- SHOREWALL_SHELL=/bin/sh
- 
--SUBSYSLOCK=/var/lock/subsys/shorewall6
-+SUBSYSLOCK=/run/lock/shorewall6
- 
- TC=
- 
---- configfiles/shorewall6.conf.annotated	2013-06-27 20:32:22.000000000 +0200
-+++ configfiles/shorewall6.conf.annotated.new	2013-07-01 15:51:38.448332964 +0200
-@@ -444,7 +444,7 @@
- #     or specified as a null value, /bin/sh is assumed. Using a light-weight
- #     shell such as ash or dash can significantly improve performance.
- # 
--SUBSYSLOCK=/var/lock/subsys/shorewall6
-+SUBSYSLOCK=/run/lock/shorewall6
- #
- # SUBSYSLOCK=[pathname]
- # 
diff --git a/net-firewall/shorewall6/files/4.5.19/shorewallrc b/net-firewall/shorewall6/files/4.5.19/shorewallrc
deleted file mode 100644
index c2fce7246c1b..000000000000
--- a/net-firewall/shorewall6/files/4.5.19/shorewallrc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-BUILD=                                  #Default is to detect the build system
-HOST=linux                              #Generic 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
-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/shorewall6/files/4.5.21.2/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.2/shorewall6.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd
deleted file mode 100644
index f29a4c74cc88..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd,v 1.1 2013/10/26 18:38:21 constanze Exp $
-
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6 status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6"
-	/sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6"
-	/sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6"
-	/sbin/shorewall6 status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall6 ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6"
-	/sbin/shorewall6 ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6 rules"
-	/sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking shorewall6 configuration"
-	/sbin/shorewall6 ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.2/shorewall6.systemd
deleted file mode 100644
index 448226c88736..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.2/shorewall6.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall
-Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6
-ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/4.5.21.2/shorewallrc b/net-firewall/shorewall6/files/4.5.21.2/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.2/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@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/shorewall6/files/4.5.21.4/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.4/shorewall6.confd
deleted file mode 100644
index e5957167b5b9..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Global start/restart/stop options
-# 
-OPTIONS=""
-
-# Start options
-# 
-STARTOPTIONS=""
-
-# Stop options
-# 
-STOPOPTIONS=""
-
-# Restart options
-# 
-RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd
deleted file mode 100644
index 6417a25d18bd..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd,v 1.1 2013/12/02 20:04:55 constanze Exp $
-
-description='The Shoreline Firewall 6, more commonly known as "Shorewall6", is'
-description="${description} a high-level tool for configuring Netfilter."
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-description_check="Checks if the configuration will compile or not."
-
-description_clear="Clear will remove all rules and chains installed by"
-description_clear="${description_clear} Shorewall6. The firewall is then"
-description_clear="${description_clear} wide open and unprotected."
-
-description_refresh="The mangle table will be refreshed along with the"
-description_refresh="${description_refresh} blacklist chain (if any)."
-
-description_reset="All the packet and byte counters in the firewall are reset."
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-status() {
-	local _retval
-	/sbin/shorewall6 status 1>/dev/null
-	_retval=$?
-	if [ ${_retval} = '0' ]; then
-		einfo 'status: started'
-		mark_service_started "${SVCNAME}"
-		return 0
-	else
-		einfo 'status: stopped'	
-		mark_service_stopped "${SVCNAME}"
-		return 3
-	fi
-}
-
-start() {
-	ebegin "Starting shorewall6"
-	/sbin/shorewall6 ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6"
-	/sbin/shorewall6 ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-
-	ebegin "Restarting shorewall6"
-	/sbin/shorewall6 status 1>/dev/null
-	if [ $? != 0 ] ; then
-		svc_start
-	else
-		/sbin/shorewall6 ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
-	/sbin/shorewall6 ${OPTIONS} clear 1>/dev/null
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in shorewall6"
-	/sbin/shorewall6 ${OPTIONS} reset 1>/dev/null
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6 rules"
-	/sbin/shorewall6 ${OPTIONS} refresh 1>/dev/null
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking shorewall6 configuration"
-	/sbin/shorewall6 ${OPTIONS} check 1>/dev/null
-	eend $?
-}
diff --git a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.4/shorewall6.systemd
deleted file mode 100644
index 448226c88736..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.4/shorewall6.systemd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	The Shoreline Firewall 6 (Shorewall6) Packet Filtering Firewall - V4.5
-#
-[Unit]
-Description=Shorewall IPv6 firewall
-Documentation=man:shorewall6(8) http://www.shorewall.net/Documentation_Index.html
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/conf.d/shorewall6
-ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS
-ExecStop=/sbin/shorewall6 $OPTIONS stop $STOPOPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/4.5.21.4/shorewallrc b/net-firewall/shorewall6/files/4.5.21.4/shorewallrc
deleted file mode 100644
index 46f5eb9a3603..000000000000
--- a/net-firewall/shorewall6/files/4.5.21.4/shorewallrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Gentoo Shorewall 4.5 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=@GENTOO_PORTAGE_EPREFIX@/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
-SYSTEMD=@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/shorewall6/files/4.5.19/shorewall6.confd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd
index e5957167b5b9..e5957167b5b9 100644
--- a/net-firewall/shorewall6/files/4.5.19/shorewall6.confd
+++ b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd
diff --git a/net-firewall/shorewall6/files/4.5.19/shorewall6.initd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd
index ce5f305c69c5..7ddd90b0c681 100644
--- a/net-firewall/shorewall6/files/4.5.19/shorewall6.initd
+++ b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/4.5.19/shorewall6.initd,v 1.1 2013/08/28 16:59:04 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd,v 1.1 2014/04/26 09:34:36 hwoarang 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/shorewall6/files/4.5.19/shorewall6.systemd b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd
index 448226c88736..448226c88736 100644
--- a/net-firewall/shorewall6/files/4.5.19/shorewall6.systemd
+++ b/net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd
diff --git a/net-firewall/shorewall-lite/files/4.5.21.4/shorewallrc b/net-firewall/shorewall6/files/4.5.21.9/shorewallrc
index 46f5eb9a3603..46f5eb9a3603 100644
--- a/net-firewall/shorewall-lite/files/4.5.21.4/shorewallrc
+++ b/net-firewall/shorewall6/files/4.5.21.9/shorewallrc
diff --git a/net-firewall/shorewall6/files/shorewall6.initd b/net-firewall/shorewall6/files/shorewall6.initd
deleted file mode 100644
index 0ab2f6bd12bf..000000000000
--- a/net-firewall/shorewall6/files/shorewall6.initd
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/shorewall6.initd,v 1.4 2013/07/13 14:12:23 constanze Exp $
-
-extra_commands="check clear"
-extra_started_commands="refresh reset"
-
-checkconfig() {
-	if [ ! -d /var/lock/subsys ] ; then
-		checkpath -d -m 755 /var/lock/subsys
-	fi
-}
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-    checkconfig
-	ebegin "Starting shorewall6"
-	/sbin/shorewall6 -f start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping shorewall6"
-	/sbin/shorewall6 stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-    checkconfig
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting shorewall6"
-	/sbin/shorewall6 status >/dev/null
-	if [ $? != 0 ] ; then
-	    svc_start
-	else
-	    if [ -f /var/lib/shorewall6/restore ] ; then
-		/sbin/shorewall6 restore
-	    else
-		/sbin/shorewall6 restart 1>/dev/null
-	    fi
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all shorewall6 rules and setting policy to ACCEPT"
-	/sbin/shorewall6 clear
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the shorewall6"
-	/sbin/shorewall6 reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing shorewall6 rules"
-	/sbin/shorewall6 refresh
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking configuration files"
-	/sbin/shorewall6 check
-	eend $?
-}
diff --git a/net-firewall/shorewall6/files/shorewall6.systemd b/net-firewall/shorewall6/files/shorewall6.systemd
deleted file mode 100644
index 1c6e95374a80..000000000000
--- a/net-firewall/shorewall6/files/shorewall6.systemd
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.4
-#
-#     Copyright 2011 Jonathan Underwood (jonathan.underwood@gmail.com)
-#
-[Unit]
-Description=Shorewall IPv6 firewall
-After=syslog.target
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/shorewall6
-StandardOutput=syslog
-ExecStart=/sbin/shorewall6 $OPTIONS start
-ExecStop=/sbin/shorewall6 $OPTIONS stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-firewall/shorewall6/files/shorewallrc_new b/net-firewall/shorewall6/files/shorewallrc_new
deleted file mode 100644
index 06253dc2b8cb..000000000000
--- a/net-firewall/shorewall6/files/shorewallrc_new
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Gentoo Shorewall 4.5 rc file
-#
-HOST=linux                              #Generic Linux
-BUILD=                                  #Default is to detect the build system
-PREFIX=/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=/etc                            #Directory where subsystem configurations are installed
-SBINDIR=/sbin                           #Directory where system administration programs are installed
-MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
-INITDIR=etc/init.d                      #Directory where SysV init scripts are installed.
-INITFILE=$PRODUCT                       #Name of the product's installed SysV init script
-INITSOURCE=init.sh                      #Name of the distributed file to be installed as the SysV init script
-ANNOTATED=                              #If non-zero, annotated configuration files are installed
-SYSTEMD=                                #Directory where .service files are installed (systems running systemd only)
-SYSCONFFILE=                            #Name of the distributed file to be installed in $SYSCONFDIR
-SYSCONFDIR=                             #Directory where SysV init parameter files are installed
-SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
-VARLIB=/var/lib                         #Directory where product variable data is stored.
-VARDIR=${VARLIB}/$PRODUCT               #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall6/shorewall6-4.5.18.ebuild b/net-firewall/shorewall6/shorewall6-4.5.18.ebuild
deleted file mode 100644
index 2cea7fbbf920..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.18.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.18.ebuild,v 1.8 2013/08/17 16:18:57 jer Exp $
-
-EAPI="4"
-
-inherit linux-info systemd versionator
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/shorewall6.systemd 'shorewall6.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.19.ebuild b/net-firewall/shorewall6/shorewall6-4.5.19.ebuild
deleted file mode 100644
index e37ebd9b3d87..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.19.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.19.ebuild,v 1.1 2013/08/28 16:59:04 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJORMINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, with'
-DESCRIPTION+=' IPv6 support.'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-${PV}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	sys-apps/iproute2[-minimal]
-	dev-perl/Socket6
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-	local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
-	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
-
-	epatch "${FILESDIR}"/${PV}/shorewall6.conf-SUBSYSLOCK.patch
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-	systemd_newunit "${FILESDIR}"/${PV}/${PN}.systemd ${PN}.service
-
-	# Currently, install.sh from upstream is broken and will always
-	# default.debian so have to do it on our own:
-	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples6
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild
deleted file mode 100644
index 1fa7ea20e4b9..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild,v 1.1 2013/12/02 20:04:55 constanze Exp $
-
-EAPI="5"
-
-inherit eutils linux-info prefix systemd versionator
-
-MY_URL_PREFIX=
-case ${P} in
-	*_beta* | \
-	*_rc*)
-		MY_URL_PREFIX='development/'
-		;;
-esac
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-MY_P_DOCS=shorewall-docs-html-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall,'
-DESCRIPTION+=' IPv6 component.'
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="
-	http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="=net-firewall/shorewall-${PVR}"
-RDEPEND="
-	${DEPEND}
-	>=net-firewall/iptables-1.4.20[ipv6]
-	sys-apps/iproute2[-minimal]
-	dev-perl/Socket6
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV6"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
-
-	local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-	local WARNING_CONNTRACK_IPV6+=" be unable to run ${PN} on the local system."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die "Copying ${PN}.confd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying ${PN}.initd failed"
-	cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die "Copying ${PN}.systemd failed"
-
-	epatch_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples6
-		cd "${WORKDIR}"/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before you can use ${PN}, you need to edit its configuration in:"
-		elog ""
-		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
-		elog ""
-		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
-		elog ""
-		elog "  # rc-update add ${PN} default"
-	fi
-
-	if ! has_version ${CATEGORY}/shorewall-init; then
-		elog ""
-		elog "Starting with shorewall6-4.5.21.2, Gentoo also offers ${CATEGORY}/shorewall-init,"
-		elog "which we recommend to install, to protect your firewall at system boot."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.21.2.ebuild b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
index f5c5ba72e6b5..70c45d80a373 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.21.2.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.2.ebuild,v 1.1 2013/10/26 18:38:21 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild,v 1.1 2014/04/26 09:34:36 hwoarang Exp $
 
 EAPI="5"
 
@@ -39,8 +39,8 @@ DEPEND="=net-firewall/shorewall-${PVR}"
 RDEPEND="
 	${DEPEND}
 	>=net-firewall/iptables-1.4.20[ipv6]
-	sys-apps/iproute2[-minimal]
-	dev-perl/Socket6
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=dev-perl/Socket6-0.230.0
 "
 
 S=${WORKDIR}/${MY_P}
author	Markos Chandras <hwoarang@gentoo.org>	2014-04-26 09:34:41 +0000
committer	Markos Chandras <hwoarang@gentoo.org>	2014-04-26 09:34:41 +0000
commit	ce807f25a0acfda5e8a623c0fe76802c7a53fdc0 (patch)
tree	0dca1801f5dce5a3d45b372180684b7df4b93a59 /net-firewall
parent	Add ~sh keyword wrt bug #501346 (diff)
download	historical-ce807f25a0acfda5e8a623c0fe76802c7a53fdc0.tar.gz historical-ce807f25a0acfda5e8a623c0fe76802c7a53fdc0.tar.bz2 historical-ce807f25a0acfda5e8a623c0fe76802c7a53fdc0.zip