Cleanup; Version bump bug 472434; Clearify init.d output bug 472790;

Remove keepdir/dodir bug 459316 Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0xBB80F419010E3EC3
author: Constanze Hausner <constanze@gentoo.org> 2013-07-13 14:13:59 +0000
committer: Constanze Hausner <constanze@gentoo.org> 2013-07-13 14:13:59 +0000
commit: 4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8 (patch)
tree: 8e536a7e12bf12d433e6e993043c48f69963260b /net-firewall
parent: Cleanup; Version bump bug 472434 (diff)
download: historical-4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8.tar.gz
historical-4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8.tar.bz2
historical-4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8.zip
28 files changed, 147 insertions, 812 deletions
diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 18937efc8182..1c0800372d8d 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.126 2013/06/30 20:29:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.127 2013/07/13 14:10:42 constanze Exp $
+
+*shorewall-lite-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org>
+  -files/shorewall-lite-4.4.20.3_installer-path.patch,
+  -shorewall-lite-4.4.23.2.ebuild, -shorewall-lite-4.5.8.2.ebuild,
+  -shorewall-lite-4.5.11.2.ebuild, +shorewall-lite-4.5.18.ebuild,
+  files/shorewall-lite:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall-lite-4.5.15.ebuild:
   Stable for ppc64, wrt bug #470544
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index 75836e8c74a2..f9d20f22b274 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -1,41 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX shorewall-lite 1627 SHA256 8f905d62e6076a39fbea514eb00275e28f0a02652d25ea2cba01e2dcb7e9f1ba SHA512 bd93cfef2867aab169d9ba90b1a34eea8c23b0acf0c2785491d2f851b45c808a80560326b9226f9f435851edebeb2c574580a47a0e7c6ff52991d6e3f2398872 WHIRLPOOL fc552d28567e42f2a49d0111dfc84305cf5be17dd4e89d2eba8e2624c8e3eeecaf2ec38120f856c19889678574be19baf00296de66ea029e84bf4127d4407c06
-AUX shorewall-lite-4.4.20.3_installer-path.patch 482 SHA256 d4de4705cf69deda7506741f172315df6011def858b993e1d30be0691703ecac SHA512 10148f175e09c469359aa31372fadbc16599c4cd673cd0afb7b00450715576c543abc023a7992c31885aefc279e0f02ccb5dac716fe4597802fb88eda5ac0d82 WHIRLPOOL 71161582647edc20c3cfe0c375713aadfebf81dfc7be8c2bedbe548574898f92a9de0cf27891c11d2bc69f2a237e6862fdc6970c7864492bb95726885ab82b02
+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
-DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
-DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
 DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
 DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
-DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
-DIST shorewall-lite-4.4.23.2.tar.bz2 95382 SHA256 7bf2647c0001b1f01c5661cafa4a4045289988506858234f640ef2d85ae2e50e SHA512 67a10bc19de0a0e98cdd17d8b62b3dc2cca128271e60da07a0b21d05279fa5f0fb85e02f35b9cbba7e9f01d475f7dc3845a58006d56f123266876316fd5215d6 WHIRLPOOL 72b8d3b1fe075d53e50e21c84c4095d160a0d05f4163d5da56b56c71c31b167e21540b2e9f2d063a3d4004658d6820e233c161cabd8ec6e7fc26554c749c2917
-DIST shorewall-lite-4.5.11.2.tar.bz2 62990 SHA256 01bae549ba5ec82a9ad8938adcb85fda80d80cfc844c5ebf5005109fceae55bf SHA512 776f3eed3504c42d0729b525d78413808669b666b7a03c4b265bcf4a7bf80860ecccb8c83e2b2df8894e185a3328c70b588f51d5d46d7039f3dd9ec74f9954c4 WHIRLPOOL 335dd8f919c1e020437a69f8cc26764d5c8513bddc2e0210c033a3bad69dd68b5bb71526dbbce9f14a9f394fcd38a19385538d2c410c8c74b2f43368e2ca07e4
+DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
 DIST shorewall-lite-4.5.15.tar.bz2 69016 SHA256 214abe1adaadb339cca814dcebc1c669d62a105a11ddfdad6706ffd84c62030b SHA512 13b94802419df5026ee0ad940e844c6a5c72278ca926c9c6337b74640bb164eedb422c34ef53340bb5ee428e81c219c7f6f0bd0f86eca707ed452ce1ff4e1668 WHIRLPOOL ec2f3718b47fd78a40697c6dbbfc6bf8531b3fa6bd66aad679bb7fb2265e67651ab0342fbdd032300607f90f59333e3c6f0d548924f3ed07eaad7d2ac69d90ae
 DIST shorewall-lite-4.5.17.tar.bz2 72916 SHA256 bce1debb8255efbb5886e1c99076cba81b21ef29b2063fd0e8408b93d509e069 SHA512 c6865409045b0d4a12b13a05fc57c9ebe1d13d3c0392915674719468f25d7c7de7c362d8b3c5ee54c9f730207a74a564482207b222e9a53835094f5ee3b642b6 WHIRLPOOL 36b4be1e55295acf1e84b6344e2a1062d11de9576107904daa86113d7951b82e7802df41987b134a7bd6460287be1e430846bb704021e3b5cc4592416d3f4733
-DIST shorewall-lite-4.5.8.2.tar.bz2 57252 SHA256 0a129226086335d6ab6d39ce05132f845a340d4f3034a5d9d3397703bb735555 SHA512 dacf7e2fca365706448148ee651f4799b13c07c3b3ca1570eb0f739e54c847699478e2264f49f286bbfd46e17d291cc9f992283a0fce3b188239a7676746bd61 WHIRLPOOL 20877265ecbda6953d265452b71eea054b8b6c324de08eeeffd755df2384c0cb5270442097d22e7f7ad0b9753c545482a0938a1139f845e4f0fc6b627ecf13ab
-EBUILD shorewall-lite-4.4.23.2.ebuild 1483 SHA256 77c9146219b46f24b7a0ae64e84c37465a4cd4a198159fe8c49f2c21bdc58c71 SHA512 7b3e1e7bdf2f56acfc1b0155737e3529f2fd5c72ddd8a50b97ea92e8e12482cde078da663f3eb7c17ad3ebbc1a2b17ec92395b531d2d1c77b08471a348dfe65b WHIRLPOOL 0a0dba72e163a63db4163dc59b2cec07d7aaa72b77842e6e07e26af65d94e2344d4550e903131c4cc09a656132bf81c2e924c93551e0741bc68c3d47c825b6e5
-EBUILD shorewall-lite-4.5.11.2.ebuild 1407 SHA256 a4cc59b7dc00a925c8beae1562145641a70c59b278389ab8b71f9b8fdb004aa4 SHA512 31951b8aea3e70239075cff20782abdaa7f86afc61fa522675256fdc24690aff2d60a5f3656536819e7c2ac1d5f3b7510620acc1dfa2b28172fd5af311986b4d WHIRLPOOL 8e9f2b04dece6a2eeee335a8498577ea5d9214fb790eefe24ccd042b2bc299a8229909a0538d869743fd46cbe7ac22db0e12268143d2371c0d63c1e6807c9ba6
+DIST shorewall-lite-4.5.18.tar.bz2 73702 SHA256 b66680361c527ac710d33d643f4c233ab8e754e7916de0891a863ca7a973d03c SHA512 de181f2878402bb86b550bcfd4aaa86d874ef8be2674d145052322c80499bcc4691086a2b09612a0228de7d1c9e75c335ac99dbc63dcc0d5c8c2fc305f377be6 WHIRLPOOL cd29da8106f7fb2faa84e07fe2a2fa7e080a36db15c04b09926855a7735310c20e4c29f26695bc3c1dbc91b2c262223b8f83341018da2fa91fad1f8edc99a026
 EBUILD shorewall-lite-4.5.15.ebuild 1405 SHA256 2894aa0ff1b141c32f0f779ebc39ec57d537ff0060f19d3dbfd1bf979d86f788 SHA512 3ae00c01dd61b0380b89d0743b9bd6f949b8da646f10955c38f1b574e90b379f555c0a337d693f686b0585f929ee726ab4546a8fd0905a6fe7bd17f6c653a464 WHIRLPOOL 478aafe53f4bef66cef0ecc23069e3c2a0ae7dd4623432f133328821062007d9a893decbb225fc8ca136357fca9405716987473b7ecca9c6c7677769c397c7a0
 EBUILD shorewall-lite-4.5.17.ebuild 1512 SHA256 4a7821117a72919871f9e7aebb713d0efdc1f921373b5a2ba326190818d2f2ea SHA512 28cc6fb4e556980b4e21746ff1e903833b7d7ab2133f07f5608eb4041f3d85b6553f2015598a1305b36dadba0c4ac4ed190d00a11393609be1d29969c7526100 WHIRLPOOL cb643d6fe9ac50a3cb9c8e593a96b90dbe272d77e2bb71caaff77ebc2fcea7aba3a9ca1bb198b5e35ef5c25574312850699d0673328f87590f225c1d5f7f04a6
-EBUILD shorewall-lite-4.5.8.2.ebuild 1406 SHA256 e6c45a6cb0cad9e35478e3bcd17d499f84f8152139caf6225217e25791fad0fa SHA512 2805152af5fcaf24e6f4c15f94c0ebb4fbd6cc1af79a32a3ed5459c66cdfbe3f2ac4f64ca10d958d95cd43e111145c0cdce5e8200ce48e527308218a3ef8d0a5 WHIRLPOOL 3aab56cc8b6ea5c238a557dd6ab9d8f49f9b187b2a044e7f7c2dba4c63f5e2405d779028c7d1bb937aad932e0b03e9dff1d4f1b57f829ce81e2d4a7d1f895de8
-MISC ChangeLog 19731 SHA256 0aedbeb1c37822a0f65b7896fc4a5ca323da385ac15fcc5e3c7d37e93ce6b490 SHA512 a08ea8b57024435f6de23b3b8b5d8643c4f2fa37bc6efd615fd2a38cc7bdb9cfa1f7d1107cf87b6d2469109de845657380da74ac49127b6cc5ce6b7c9a5aca37 WHIRLPOOL a2653e203b325274501595e1c517ec75b000615651d14dd1e7a0562862d19f3e9f02507846d9976e355cf64082a1af39839b75683f4b3eb49b1a89f4e08511f0
+EBUILD shorewall-lite-4.5.18.ebuild 1512 SHA256 de4dba323ea2a2085294d2ff33edfaa3b0ef523c87a82fa82241d431887be887 SHA512 38a51ee38f3793a723327ee6adad5b9b164a6e51380985a230164b394620e1fdd632be8562c4d433b5ca188b1856bd474e3c74f64b67987c59257a3d956c54b1 WHIRLPOOL 4c94340071b9b604c8ef73a7266f6b5186d59ca6e6cdea1db95b2a4a525c8fee505e82a39934c0f12da6c9a61a56b86f298c0828533b4d12d980a25b604c4a4a
+MISC ChangeLog 20152 SHA256 2a96e46ca3709b7c560ff21c2e628772f8ffeb1162ef0ddba923804996d30c40 SHA512 5a336bb471a74fddf9f32ca37f7051ad3698b810ecdd9c661c17419507899a6376c39b071247cb47d8de437b2ecb5241ffe583012b5bbdb32c9c3ba28666820e WHIRLPOOL 22ddc1c5b61a182d43fb04a70403611464560ed246de7b6c8e36aab4025dde01e099d97a771d4db4e0de53298768ec79f4143d086a2a516c0489b0819921c8b1
 MISC metadata.xml 249 SHA256 cdf32b905fad83550eb790e99cc420f9d31e5f084687dafef696caa74270f544 SHA512 0f1cd0c406c41d29198618f897793943d21cf001fb9751bceaab6e839b9bf632435498a7552f10420ac01ffb6e3c1c37bdb709d416458c5b2ce80078f88f142a WHIRLPOOL 7c41b0e1fc6e004743781d062b73653c41add99d31604fece37d10f00b91549ad28c1c49689723c3f6668607f8b85847f9b6c671f64961ec9938d8d359ec575b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0JU9AAoJELp701BxlEWfKuoP/1ysSJy/XHkngK8MpXU1tU7M
-Is+V1MBbeqdpXVmGHcrWin7lhxZs3ObSSCi6K69xLVjaNr76fyFwyirW6YT0wIN1
-/IqdfrzOrg6QkbJ898Tzcvrl04RWiBxl36W/pu5A5u71zCdOX7DGGbyXoX4g9NH/
-OclSwvCi51KfZjUJQUGH9RQUBMoB3aNEUocSAC47cjJ9IUk8y5p4gR8N3/fe71jV
-m73kARfPAyKXexCW8sD/r7NFRRvnew4F9vCyo8IxFXMXxBa4S3JjtAsq8iqwMsyF
-DOGBgTNDjlvtdYlRxhu5f5vxoXIfjaV8PnyJr1kIqDnoDVS54xiLFR21IlmW9D3x
-xGIotZ3yT3f8cc7iVqB2h8eg/M+letOjFBYBWLq8A7d2fc+pvl8tjXzB0j94UTBL
-Lg27VSLOm0likaQxdenrA+LCyF7nV2RH8hP4MF0vyHPXqBWKLMGv+YvJ1hpmM8qO
-gIahV4YTUxXVATYMGIYLyLWFtSM9JqqlkulMg6DIQMdkMxFm2KoBXliBOlOMWWQh
-8WgXNZErCaPGoV1GIQETm4h0c/yIdVZ2Vf9xldAIn8MaH92B4OQBmvRitUI3sh9A
-JZA8f/45q0SZ0YoEDi2Z6Kjq/wsI+a66wCOVSSPLjP4oxDOJDXKt2rQ1cWr8YvwA
-BX7DmIrPGPRaGICnBwIT
-=XI7B
+iL4EAREIAGYFAlHhX+NfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsN7wQEApO+pLiImKf4xljmSScO6XZUj
+RrevNn5088fyV9Uuga4BAKKdLeIav5BFsQKtWgCpNirUCTMbvjEHdhLxj5tccoii
+=qo9v
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite b/net-firewall/shorewall-lite/files/shorewall-lite
index cf759a312765..907b6a4c538c 100755
--- a/net-firewall/shorewall-lite/files/shorewall-lite
+++ b/net-firewall/shorewall-lite/files/shorewall-lite
@@ -1,11 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2 2012/02/24 18:52:52 constanze Exp $
+# $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
@@ -13,23 +19,25 @@ depend() {
 }
 
 start() {
-	ebegin "Starting firewall"
+	checkconfig
+	ebegin "Starting shorewall-lite"
 	/sbin/shorewall-lite -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	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 firewall"
+	ebegin "Restarting shorewall-lite"
 	if [ -f /var/lib/shorewall-lite/restore ] ; then
 		/sbin/shorewall-lite restore
 	else
@@ -42,7 +50,7 @@ clear() {
 	# clear will remove all the rules and bring the system to an unfirewalled
 	# state. (21 Nov 2004 eldad)
 
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
 	/sbin/shorewall-lite clear
 	eend $?
 }
@@ -50,7 +58,7 @@ clear() {
 reset() {
 	# reset the packet and byte counters in the firewall
 
-	ebegin "Resetting the packet and byte counters in the firewall"
+	ebegin "Resetting the packet and byte counters in the shorewall-lite"
 	/sbin/shorewall-lite reset
 	eend $?
 }
@@ -60,7 +68,7 @@ refresh() {
 	# interfaces, the black list, traffic control rules and 
 	# ECN control rules
 
-	ebegin "Refreshing firewall rules"
+	ebegin "Refreshing shorewall-lite rules"
 	/sbin/shorewall-lite refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite-4.4.20.3_installer-path.patch b/net-firewall/shorewall-lite/files/shorewall-lite-4.4.20.3_installer-path.patch
deleted file mode 100644
index 11849a7a9ce7..000000000000
--- a/net-firewall/shorewall-lite/files/shorewall-lite-4.4.20.3_installer-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shorewall-lite-4.4.20.3/install.sh	2011-06-10 15:04:11.000000000 +0200
-+++ install.sh	2011-06-14 12:09:52.000000000 +0200
-@@ -199,7 +199,7 @@
-     rm -rf ${DESTDIR}/etc/shorewall-lite
-     rm -rf ${DESTDIR}/usr/share/shorewall-lite
-     rm -rf ${DESTDIR}/var/lib/shorewall-lite
--    [ "$LIBEXEC" = share ] || rm -rf /usr/share/shorewall-lite/shorecap /usr/share/shorecap
-+    [ "$LIBEXEC" = /usr/share ] || rm -rf /usr/share/shorewall-lite/shorecap /usr/share/shorecap
- fi
- 
- #
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.23.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.23.2.ebuild
deleted file mode 100644
index 0e1cdc963cd4..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.23.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 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.4.23.2.ebuild,v 1.8 2012/06/26 04:37:40 zmedico 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_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"
-
-src_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-		epatch_user
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	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.11.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild
index b6763841b695..468d6416bfb8 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild
@@ -1,10 +1,10 @@
 # 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.11.2.ebuild,v 1.8 2013/03/31 15:01:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild,v 1.1 2013/07/13 14:10:42 constanze Exp $
 
 EAPI="4"
 
-inherit versionator
+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)"
@@ -21,7 +21,7 @@ SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="net-firewall/iptables
@@ -42,6 +42,7 @@ src_install() {
 	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
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild
deleted file mode 100644
index bd25ffd3c003..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild
+++ /dev/null
@@ -1,51 +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.8.2.ebuild,v 1.8 2013/02/12 20:27:04 ago Exp $
-
-EAPI="4"
-
-inherit 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
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 47accfccde0d..aaf0fea03e5e 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.234 2013/06/30 20:29:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.235 2013/07/13 14:09:09 constanze Exp $
+
+*shorewall-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-4.4.23.2.ebuild, -shorewall-4.5.8.2.ebuild,
+  -shorewall-4.5.8.2-r1.ebuild, -shorewall-4.5.11.2.ebuild,
+  +shorewall-4.5.18.ebuild, files/shorewall.initd:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall-4.5.15.ebuild:
   Stable for ppc64, wrt bug #470544
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index b90936bd3132..805ea0d370ab 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,41 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX shorewall.initd 2058 SHA256 ce68533c3ea8ba114f3e5d3a9223e74c44becf56416d6d09fe519a381ec70de6 SHA512 4873f06177c3b4c238088fb7a4df0dd8d2603789cce5d710d3ef0de72a18a16161f1d27d4b8f41ead9ec62d163d272c10fb3c0f210086737a01b1675068abd7b WHIRLPOOL 62075afcefd99f089a1659d6c72316bb5c935a96214b8d6fd4894a2c983d75ca239b4661d4c25078f5659da50c2707107fff57626fc62acc7d269ceaab2036e0
+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
-DIST shorewall-4.4.23.2.tar.bz2 401753 SHA256 0b8f77e4477e811718e73492e6264901953d8f70462af634c3c129597b588ff3 SHA512 167a8beac46e5ff634819d10f4d935f6db02f812cda8c975e225555ff82fa39c76706aee6e8fd2ed1113cb5e938d30949a7a5451186390a54d2d38f4d44ab043 WHIRLPOOL 04479ec8a772383938399aa026e100ecf2e0fa32511684dba1f95c2afee9e2105937ebbc272db773f07319ade0727a381f9cf38c1b0ea60ec706ac6a58100a27
-DIST shorewall-4.5.11.2.tar.bz2 433099 SHA256 a4020d38c85b1566f795cdcfc3588f385b1fbee53677080cd6c93c29d9ced920 SHA512 573060c19db034193cd3c6b41abc09043569d998f136eee08fa8c898aa334585c22da5787a3e9fea6bf080d59feee57d9fd396f1262649389393d20f76e04003 WHIRLPOOL 2f0590c47d622f3b386d3b260c48bce81660b1ae5f8b5a2c992b3abfc96e3776fd45c75dd622b826bae49a91aa947af1b2e65343c98ef4d14b7762550a66d6fb
 DIST shorewall-4.5.15.tar.bz2 447241 SHA256 c93e1cdd37f950256e7ab168f4f3fbf20f7a76fa191ba9003c2a4d94152150c6 SHA512 2e874579ac7b274bebdd1a86bf0c876dbdf8941505d4e25c19bead53548916f866f0ff5f476a417a9c1dccbd0f54516378f0af1f0fce513bd647db51d7db6ec9 WHIRLPOOL 550266e946db82368789aa2dba078e0e2e9022f0aec6361bbb83db6a1f652d24e8f14d0dc98a540c95dc536a66b410fd04e4c778d6dc47d3d4da6278450ac952
 DIST shorewall-4.5.17.tar.bz2 466628 SHA256 d78d4583938357a862d695630041037e35e13b70f031236b8885d23d6a65260e SHA512 64efb7202ed50d240f65977edd1d3d7b7ee487228ab90e1d2b10e58b50e5a91d808ff38e3b7eac332461da30e56652de923a73ad89b2169c9e34f48874ee4407 WHIRLPOOL 72bd0b3735c750aa1ea0c8945c58863bca220c5b600aba55756f73c42f550a3eb15575cd03374d76ae1cde51a0d730bd7599c69d1e5544e8e392f6486fe70542
-DIST shorewall-4.5.8.2.tar.bz2 424120 SHA256 2874ce51d5e9070c9fe438b455f98a6f6adcf026bf4da78cc815570db7a36ffe SHA512 0daf5f72fc60f1c0356e077dab6b513d2795d97a0574de253849c2cb5e0024edad0e15db35c9e568229614badc882f03ca64ff12aeb3e898d2210974d9a420f6 WHIRLPOOL 28378ae9be776d9400d4593e54866b3fea984680e10b0a729d92ff717c66681faf45946bd43c5d9b8f4707050876dcf2f3bead0b9b031d04eb366285ab978af4
-DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
-DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
+DIST shorewall-4.5.18.tar.bz2 470187 SHA256 81bbcb2cc24d0b54769fb153cb472d78e6eed9cdc9f005f1dd70ef2ae9efe131 SHA512 69857ba9181989a0d0b8ce691e637b313b59d4f5643784e62a801f8d74add0605452011e19e5344aaca97a329fe66980627181e69d9c0fc0625ff23afb192f78 WHIRLPOOL 2aaa1d5fce8170507e4989cb5c11cedeca938a161795894edad0ced658c9af42eac299ff4385b15d5fde003ece87f856ac57b985e4d26ea0adc870f109596082
 DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
 DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
-DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
-EBUILD shorewall-4.4.23.2.ebuild 1919 SHA256 271c0cc319b8e4b23bb90051b7a7f799f4a983062c59edb512803d66ddd720ea SHA512 0b3d9a934224e6f0e2cbc5fa460a5058df6696b219492c8813b2d789f226996e8c2ff222dc7cda8ca62d8cd068b820b563819d3c450f7c9641090f1ac2dcc66b WHIRLPOOL f5127cc639a66df51884b64bdacd4203a05bf66cc4a319296f20061ac0bd535338ce86d400618e542bad2fe4834c2fcbc66bd43f8c50d2b8d87d0f62761ea5c3
-EBUILD shorewall-4.5.11.2.ebuild 1914 SHA256 cb28357c0a4e55adb002cb88f22ef29c084743da414c9569b0a30bc030e39b75 SHA512 dcf994269a772d526ee6652248a478dccf53283e0cd5e99ae8575cffd92c96086b8ecb0f86816e55e31c24dc1abfa88d86a8ebaf5a0fb6a98f3454ec5175346f WHIRLPOOL 6551452175ca5ec438a55c078d5657a92c29bdced59361f9fa1df35676ee9bc2bf89feda88e052c2242cbcc5fa88f75e77387eb3a385677e7aaf7b3650387df3
+DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
 EBUILD shorewall-4.5.15.ebuild 1446 SHA256 1c78fcd6967ce04dce6a899bc145753908ba7c999be5175c9785f17afbd629a6 SHA512 3ecfc87268b91adc6efabfddd899d6ee5a5ebbc909432cd60bbb8c2c65be7f891b4801abe3ad946a7e693d884eb58b69f36551a6629aa13fd903c93372a1c46b WHIRLPOOL 852c1d792f4b0ed0931409ec465f6624515ca5239450695af843fbc1725182d001a42af63e47d5f800ebc13f4f1fce177f9d0c308a264d1cccf3193da5d65039
 EBUILD shorewall-4.5.17.ebuild 1543 SHA256 e1248a85db4e5e9a5f8660db4d5398d15070fb0f398f393d1a3abf36d700e599 SHA512 ee7e0c27cae3bf6b64909047ba0a9d70bc45af07dde25a31db892abcf8d7090d88f671864a328cee07733fc018390348dcba89bdb2445f96efee8135921f7070 WHIRLPOOL 165246e98d91d65dc45072378a470ca4fdf743038f31a9dc75cc8a64946a45f9ea45acdf9e513b72f9b31bcb803786e7d55812a5dfc35cd66f3ca66e44ed3389
-EBUILD shorewall-4.5.8.2-r1.ebuild 1916 SHA256 0a18312379296e2e9f82dab31dffbf9cd3ac6499bc6d338eccb228fc718702ea SHA512 c601127620144f7820bb9da5c5da9129eec6195388962edf0307ab8c4c9ccffdea0b712311c05dc826d92ef0a674fde3697bab57f110d64d7451f52dd403f7d3 WHIRLPOOL e79729c48e12b1dd7c4927a7bc201e371f98e505689b43c7b49ef789ec4e50260aa719325c3b8d5e99bfa2a29ba523ab9ecef72c1bc2ffafcaadfd10d7ab0386
-EBUILD shorewall-4.5.8.2.ebuild 1926 SHA256 dbfd74934d68bde10f08b2e5f864a7c32ba4ed9d6f7ba71eceafdfe0c88b28f4 SHA512 a96565aa4e29bc4fbb8bca42864ef18a2eb547b2454eaecad32cec2d34d152ea194d357dc2ed6f1fc779c213616fc4ab2f398e442a2cd3a790e8310e873f9f83 WHIRLPOOL 79fb029d945fe878c2593835a8b72603f54fc78ed251c834cf9a635fcefa7a9ef6ef0d642edcab6964a2f06a6f2cb6ecb345c1913c2dfa39c61581de864126c9
-MISC ChangeLog 33052 SHA256 38c5e42b6c64236405158ef08ab086a8eef1d849df0bf35348bd619cdbdc218b SHA512 b37ce1d695220d2344c3be65f82ab7ad8cdd2262589ba6be26cec8f65803e1b7863cd263d1c63ca71eb5d661c8e7bf9d0c80a7bec688a186ecf72bb3d06b5217 WHIRLPOOL b1d3da533943f2aeedf8e8a20d7dc0cfc3bddbde796edc507f2d0f678b711b0d66cab19b721a1be3766d07d099148882f6d05e25bf0352862857287a83141c12
+EBUILD shorewall-4.5.18.ebuild 1519 SHA256 aab231226683dcde880d3896c464355c61edeea276a65766e56ee70ee58027e2 SHA512 807f19d7f2ccb89ad1d3cb8ab438cf83f77fd29d4b4570b6db482f39e549a50adf8bb0306728f23d3fc1357b2805073a71799a1e968ec158cbc64f06a0d4bac0 WHIRLPOOL 97ca4da724ca98905df4bfedf39390a480826f309454a8c77d6421c7ea3193307f8a44f34bc12ad9ad6e7e4e4cec914e0e81d6fb06dac58bb8600f3b53cbec55
+MISC ChangeLog 33424 SHA256 a6b602f2737e21603c9110fcc64da36a106e6a7f058803d4ea65d96a0a5b7380 SHA512 1dcb9aa2e2c8263ffcf4838180e105d8f4d3a10fc24220754ac327f313cfec199f38f8caa7c1eb5d5ad3385f8092d768c3803bd9ec0419c1f91facf0284e97c2 WHIRLPOOL 89c0ba506d3eefce0694ffae579055d7337727ea5d7522dd2baeeb518c587f1e1550833d00a5521149b20b9d7b9a7bdd69876596e7443a41a4e3db0d0c50be52
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0JUmAAoJELp701BxlEWf4C4QAIP0HQGjDjqGk+5wla+VdOe2
-K0kv98IoWUFqRmlCf2GCKlyTYX9iMDLj2GQhLR3QZ+7k6/XDNfj7cAlX5wRFtHZw
-aAsh7fOV2S0IiZnDjbJEtrjDqO2iOZksWpfhJLHTY7wghlc1CCTEbz2ovIGUpn03
-hN5WnPEVACdBJhEwU60oMwaegVjBCTSkw8053uO5V9TkP6dKEQgtLSB/3FNDwo5m
-PxJnCPRahrUbLrrSB3WBc2ZmxoNgG8xFCdAhrMPH6rrpPFgZVXQqniA8gq1B9gVP
-GwjOkJ06ALKtRTcdBQOBFBNucWdAQjo/eJuxkQIp3Q7B910VaSnA64DnGX7vciBd
-4hsjLW3gRNVOgvVyX9HEc5CoJYqu3u84TUVeWNodXcRUnqtITh7Bgo9Gi754pH1O
-K0MFZVfzYhVfOwtrJR0d0duhrM1qw+VpnFQYlj17DdUxyyB3DFsfdtMIWbIVsKRu
-urlf+7+NkAM0hlLP0yQm+ji2DpBY4WHz3FwibHpvwAH4RgRcMTmTueZksiI71HIf
-NEzHfRIG9nuA36Rk0giyyoo58WL6Od1jfWTubhmAQAzQDL0BL5dJHNz4t5SCCdq7
-xC/VT260/GS9at5NA5H6x4G1PVJSS3oRt/kVhp4YfkkAwpZcMVkiV18kA4fVqUWN
-s6oZx98JwEfkyEIfjODr
-=me2F
+iL4EAREIAGYFAlHhX4ZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsMSwAD+IKeB3gmcoKSpANaPjUKyvU40
+bquRpD0NnvRDGcPxUcsA+wWb4DozreKvZvX8qmzAJ3j96uSWr5QCAkrp3JqTxz2k
+=IK1X
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/shorewall.initd b/net-firewall/shorewall/files/shorewall.initd
index 01056729292d..6dadd306433c 100644
--- a/net-firewall/shorewall/files/shorewall.initd
+++ b/net-firewall/shorewall/files/shorewall.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3 2012/10/21 12:54:54 constanze Exp $
+# $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"
@@ -20,13 +20,13 @@ depend() {
 
 start() {
     checkconfig
-	ebegin "Starting firewall"
+	ebegin "Starting shorewall"
 	/sbin/shorewall -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	ebegin "Stopping shorewall"
 	/sbin/shorewall stop 1>/dev/null
 	eend $?
 }
@@ -37,7 +37,7 @@ restart() {
 	# 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 firewall"
+	ebegin "Restarting shorewall"
 	/sbin/shorewall status >/dev/null
 	if [ $? != 0 ] ; then
 	    svc_start
@@ -55,7 +55,7 @@ clear() {
 	# clear will remove all the rules and bring the system to an unfirewalled
 	# state. (21 Nov 2004 eldad)
 
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
 	/sbin/shorewall clear
 	eend $?
 }
@@ -63,7 +63,7 @@ clear() {
 reset() {
 	# reset the packet and byte counters in the firewall
 
-	ebegin "Resetting the packet and byte counters in the firewall"
+	ebegin "Resetting the packet and byte counters in the shorewall"
 	/sbin/shorewall reset
 	eend $?
 }
@@ -73,7 +73,7 @@ refresh() {
 	# interfaces, the black list, traffic control rules and 
 	# ECN control rules
 
-	ebegin "Refreshing firewall rules"
+	ebegin "Refreshing shorewall rules"
 	/sbin/shorewall refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall/shorewall-4.4.23.2.ebuild b/net-firewall/shorewall/shorewall-4.4.23.2.ebuild
deleted file mode 100644
index f8aa8f302a9e..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.23.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.23.2.ebuild,v 1.7 2012/05/20 08:42:07 halcy0n 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="${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-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.11.2.ebuild b/net-firewall/shorewall/shorewall-4.5.11.2.ebuild
deleted file mode 100644
index 71804c3e9d05..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.11.2.ebuild
+++ /dev/null
@@ -1,63 +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.11.2.ebuild,v 1.8 2013/03/31 15:01:28 ago 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="${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
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.8.2.ebuild b/net-firewall/shorewall/shorewall-4.5.18.ebuild
index 5884dc568e53..85d5dcdbfea2 100644
--- a/net-firewall/shorewall/shorewall-4.5.8.2.ebuild
+++ b/net-firewall/shorewall/shorewall-4.5.18.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.8.2.ebuild,v 1.1 2012/10/12 18:14:12 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18.ebuild,v 1.1 2013/07/13 14:09:09 constanze Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+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)"
@@ -43,6 +43,7 @@ src_install() {
 	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
@@ -50,14 +51,4 @@ src_install() {
 		cd "${WORKDIR}/${MY_P_DOCS}"
 		dohtml -r *
 	fi
-	dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
 }
diff --git a/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild
deleted file mode 100644
index e51ebcd4a72c..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild
+++ /dev/null
@@ -1,63 +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.8.2-r1.ebuild,v 1.8 2013/02/12 20:26:46 ago 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="${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
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-}
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 900558d50d25..e8c2d37f5769 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall6-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.55 2013/06/30 20:27:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.56 2013/07/13 14:13:55 constanze Exp $
+
+*shorewall6-lite-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org>
+  files/shorewall6-lite.initd, -shorewall6-lite-4.4.23.2.ebuild,
+  -shorewall6-lite-4.5.8.2.ebuild, -shorewall6-lite-4.5.11.2.ebuild,
+  +shorewall6-lite-4.5.18.ebuild:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall6-lite-4.5.15.ebuild:
   Stable for x86, wrt bug #470544
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index ca754a8acf3a..94b96eda9a2c 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -1,40 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX shorewall6-lite.initd 1643 SHA256 92098c57a35eff951e31f1e7afb1cc5ed25215c9376ad141fc24f2569ea5e9a9 SHA512 a0631c5450a874ecedb08c4ab7b50e274ccc48f10951d12f64eec7c918809a7555fbcb19d1575f79e009167b7666e3d10ed648274674a3f6717c19be076231b0 WHIRLPOOL 02309caba6934d0b1f3b0f8ace37e5c381f52ebfc85d52bfd7ca3b5a242797aeccaeef836502cf9857a4cd035146e88b2be48f90284b5caadc4c3c793eae2e5d
+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
-DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
-DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
 DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
 DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
-DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
-DIST shorewall6-lite-4.4.23.2.tar.bz2 91907 SHA256 35fdfd2df47a347e5f79c798f3ce30e3dcdc8bfaabc1c3fee98189c0aa2d4e45 SHA512 960dbf0b9cde1330b3a091b7b619c35cda504d233f5d3279f0dbfb01df02291c23ff991a16e3f8e17dfac6250999f60df87dd2e680a257752a64e6b7a3d3ad70 WHIRLPOOL 349fe99860f6ed7b095fcfaeb1a2676882170a86bfa125ca4af3f6cde68d9a66c344935eca3f2be007c956c9fa6fa4d9f8ec08f572658d895951b16fadb16de2
-DIST shorewall6-lite-4.5.11.2.tar.bz2 62431 SHA256 1783449b87c28e88323551437d19d2d3395d9bfa48af6a7aec20f5de21397ab0 SHA512 673e4cb0250b089562eb62980147ccca0b197a686d90e43489ca2f843f041092086f5340748cfeae8a803d5b7beee8783eaab4014468d30e61d1679f602d98ce WHIRLPOOL cebf0e33e7900ad877e82c7ad37b709b2296b00e9c1598188ef093502b27e62273bef4dd74e320d120af9acb0e26c582458c45543fcc624f5f0a41547fdb2ac2
+DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
 DIST shorewall6-lite-4.5.15.tar.bz2 68632 SHA256 f0924b69fd9dec06f43ef1fadc570056bab75fcc148b3affdd0acf62ba9e0c1f SHA512 e1e7df44abc960e3bbd6a558b8b39f01e3c0b5be3a1bab6db97547c6c784f10a985750ba1915493facc426c78da7219bcfaa8675528769c5e40fb29e0aa03e72 WHIRLPOOL 9a85c8a1a30ed439121cc1a7eedcced5fbdfe29d7dc70dc0cf2890bbb6f9f266d380595ddf39580748def47b37e5bac91143a8d79264729a19aba69af6e1e0d8
 DIST shorewall6-lite-4.5.17.tar.bz2 72465 SHA256 0e52a435eb06cb3d32268f9886b52d3841d2d250f0828bc115cb6f9b7f1675b9 SHA512 16247b72163d50b33b920c749bb86b19385adf40a1dde82ec330c85c26bb1aa3ab519c49e0a44da77c2987eadfcdab3feffe12dc09748700221f6f5bb0d46206 WHIRLPOOL 4163a5abec716649b615c266e3d210f58c7c64d4bfd64236a63e9193a1675d475e7c0e3dd167bcd47c30a5bef8524a0c3d175c8a4943771a82d8fa8fd97ca50f
-DIST shorewall6-lite-4.5.8.2.tar.bz2 56684 SHA256 7b3aa533583b957d8dc58c2c8fe07757347c9336603c171cef24223b31d6cba3 SHA512 1001100bca6837376fbd052b7a003808b74cbb6e2147c29f714e4bc32a38fdac6d2c84ea068b34501b357aeedfb46515a24f833b67d5508bc947f17082c89cda WHIRLPOOL 0045aa6b8b6c26c40c8836fac31d2890fadf538dc21937e63e3bad1e540253351db04db3ce73dfd1759f691742d05294ed61174b9c09b8b20bbd381f43b84f79
-EBUILD shorewall6-lite-4.4.23.2.ebuild 1414 SHA256 b152680986f69edd4ddca3f071bf918c7792fe9e265334880ca9d01b20217b85 SHA512 b1f8112352fafb00fcf3f6913931e9137350557840576585e804e4d49a233658b183e1998178ee0098066b255c92a65b996a89dc1da0960175ea5a3c641ab3c9 WHIRLPOOL 84cbbb2a58758e9e463fd856036fac56cb4447e60d6d70af1174e4500a3547ee66c72fc2161b015ef7073ebac9fe849433af6915d9835c973e6c258fead71de2
-EBUILD shorewall6-lite-4.5.11.2.ebuild 1511 SHA256 8667ec69c0cf67262c0f5b115c1aa7d621acfecb639167a9b4434e843178b416 SHA512 f19e34b46d9fc9b6203a785651a234383facf1ff565f366e010a687e9aee14b67eacb391f82c23e2edb16489d7be2f662a362f1177e895c20a5f13b1f78dc1ba WHIRLPOOL 3c0684f46076dfaba940ad7010607992dbc45e6b1628fe5bf427f7f478cb3a2536bfc8365ce4a209911c66e4968ae342a813f928bd4c11b9255107eaf35e238f
+DIST shorewall6-lite-4.5.18.tar.bz2 73212 SHA256 f4fa454812ac0fa3da96569dcac3c6bff0022477e1ba55eee0df5d260f8091f0 SHA512 42939a8fbd6190f396ad31d5107dd28df831ee5236329d714f209c33cdaa00976931da3e3c0e6e92f5f963d054aac6987686e90f47fd4879a96320e93a769e8a WHIRLPOOL 156e60c4c4665cc6b8c5c0687880f07a9d27151dc0919cc6add388c84e1c3e23dd9ac46fa0ae941e0ccd674a70ff89b8573bf1463b350574cab469cdac7d9945
 EBUILD shorewall6-lite-4.5.15.ebuild 1498 SHA256 2bb2f4dc1513719a9e990bbd7bef68cf5da86ed7cb9d4d5df4c5794fcb184c87 SHA512 b8df13f56a2bf3dde601216acc3c71432c315e86bccc1096ead0347dee86f9ed844e1788d36b3731b9eb737645107b3b15c203e241e1730fd2377cfff4d36099 WHIRLPOOL cc1c62933a6849d0edda37c58d78a7973d63ae1850ce0f81ad9689a0855f468ac288d30a54ac01acdba4b3740152116b1a26f0d79f66368a62626b136538e7cc
 EBUILD shorewall6-lite-4.5.17.ebuild 1605 SHA256 33dda1bfd9571c2104bb6674a7a72aed955087f9bf63879d11b9e1be5bef7202 SHA512 e19cec661d682b7dee3c897bffafdcae2fd72287d29a54301bf76f6f45076844fcb280748c50fda612076da918042703a00149f92edce3ca9d3fa1e02fc80e58 WHIRLPOOL 2a84bf27b55ee147974388ab711d56b2cb092ddf1db8ac71b1fcad1eb5122c5bfba26eb37fcc4c5c1747f1a0c9d161110a08336b2a35befcb4d87bf2185fcc56
-EBUILD shorewall6-lite-4.5.8.2.ebuild 1499 SHA256 5da76bc4a775407f51bee84247da055da323ec32c2972bf43fd8696338045f8d SHA512 407e5fdc0371fef124cb029e3a87c5bc21e88c0c97a08382d05ef46956643057b119e1d45ef41fcd83c9b071aa992130c428bc75c5988a08d04db56a4e800a7b WHIRLPOOL 16018555f77b44c78a41abbeb012ed776b4bbaa3e9c6e4663551df472cd564bf0260e2daf74a2b636173742e0f08f522e239b161440f7edd1cf4dad243dd3aca
-MISC ChangeLog 9667 SHA256 8d99e0a99422d6788c507027067e950ec9dc654cf66741ea827b8ea4826faa7e SHA512 86ceb115218d41f2d4614efd822a9dd337a00c209f6f6849c466ed2c4cc17a6a526f1374896c2cfe5b71df6e41b2cf9006d4ee6bcc9da7b4820b013b54926db3 WHIRLPOOL a004201840055d452e43edf5041bf70ff6171f9aabd20dc7b48a75d4a1bb10030447b25fff47d77fd796179be3510632c9b387d5eb01ee65477f66f13e3129b4
+EBUILD shorewall6-lite-4.5.18.ebuild 1605 SHA256 901bc1a24e846dbdabe46d3ddfc0a2fc78d7dd8dcf684efe2260b32403a84f20 SHA512 16bf0491942fe835cfdb46af25ed1e06eda7c8ff3dc592776af13aa4575a62047f7bfd5305f34af329e3101715294551b7ac0f96fc9e5ab3b3e9e3b6e6972bd2 WHIRLPOOL c30aa6607b939abb4d05ac31ba8920758428920cc3dbda0b511d2e81fc557062e0169eb64b3a27e508f818dd0bf71736711c5b930e5c49e4c117318c04896121
+MISC ChangeLog 10045 SHA256 06277d4e63ba776923c2ee9bb28db22ec61f07b6f81aa8ffb9031977007475f3 SHA512 5c0781629481c81114fa37a4a2198ff7dc13f2c8f0ed4346275068871748890f583f2f5bb1fa613b86a074b83c80b58bd9c79f9747d88aa70fd8a9831cfd5164 WHIRLPOOL 9aa3b433871e4724ec107560dc3a9ec009364c2ed90533396d50ee202313338efe6140bc99387c4e43b9218d5ee8cdb4b13ec945bdebe78cb5cc6152945c9856
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0JTOAAoJELp701BxlEWfDbYQALzG/Y5/BltcmljpgHviNPkv
-PfVB8e1kD4yTi/qKgbKoD+M6rHyWwjTCtoCpdrVo/cyDGp+qbjBbTu6uq5XTfUjD
-0RMybfcxsw84XOA7fF9ArI/FBIxHZC9wttbFGrqABizZAOt9NRpv+Me///+ZZJBM
-FXo81W+z2nseWi0hsE809z2fzgKrJw++y+0YLY22yGIrdvoTiJCo6Q5kXYWoAH6p
-stmHF4e3pS4IJ/w78Yto2CshGEIa9UtntJp0E0V47IBnajRtfWdwEuOSHam7a/5o
-70KedPHuuEA66VLjZnac8K81nokoKHXl67rAj1GS7/f4nntFDNfNZ8D8+xSYUviR
-IczNong1HXLVOaDw1FgRtL+Ep4xdEb+9v+uEIqbJw6P1xOIoEKLOAV9c/7bjc/bc
-i1DNglSeT/4TBBosV3hsa9gGdZ+79fD5yDpY3aL7Fw/lt9nxOWkMNtG5txGboYhN
-y6QiXsUl0hvFYfyyC/MM5QHMqYfMEnEhKCZjWtc5th3Vf2FPrWXJlorRPQGhDa0e
-xQyUxRxOgBJBg9xxLg6zJ5Q19hS00z+EImI/93YkJlAxwuY99T6Bj+rAy8dpmZK5
-nNO7jIpruRSaSywk+ldt2sADGs9sRvoG6iap7LVSvxJ8TbWPV/XXQu/cv77uvgqe
-dILC17asdvhExMDpP/FT
-=EWX3
+iL4EAREIAGYFAlHhYKRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsMcygD+Ka3VkT7XThuPdSXwffw1tnuj
+yG8FK1/x46pZdJyrrrkBAIxERTEqA2entUBpdUwyC90OZY1EroDW8DZR1PqB0FlF
+=e1op
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6-lite/files/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
index a572b7e9b4a2..ae2d516b4297 100644
--- a/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
+++ b/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
@@ -1,11 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2 2012/02/24 18:54:19 constanze Exp $
+# $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
@@ -13,23 +19,25 @@ depend() {
 }
 
 start() {
-	ebegin "Starting firewall"
+	checkconfig
+	ebegin "Starting shorewall6-lite"
 	/sbin/shorewall6-lite -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	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 firewall"
+	ebegin "Restarting shorewall6-lite"
 	if [ -f /var/lib/shorewall6-lite/restore ] ; then
 		/sbin/shorewall6-lite restore
 	else
@@ -42,7 +50,7 @@ clear() {
 	# clear will remove all the rules and bring the system to an unfirewalled
 	# state. (21 Nov 2004 eldad)
 
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
 	/sbin/shorewall6-lite clear
 	eend $?
 }
@@ -50,7 +58,7 @@ clear() {
 reset() {
 	# reset the packet and byte counters in the firewall
 
-	ebegin "Resetting the packet and byte counters in the firewall"
+	ebegin "Resetting the packet and byte counters in the shorewall6-lite"
 	/sbin/shorewall6-lite reset
 	eend $?
 }
@@ -60,7 +68,7 @@ refresh() {
 	# interfaces, the black list, traffic control rules and 
 	# ECN control rules
 
-	ebegin "Refreshing firewall rules"
+	ebegin "Refreshing shorewall6-lite rules"
 	/sbin/shorewall6-lite refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild
deleted file mode 100644
index 0cd8e440aeb8..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 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.4.23.2.ebuild,v 1.5 2012/01/23 13:41:01 klausman Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# 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"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	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.11.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild
index dbf9d9b6fd51..30fec64e2f5a 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.11.2.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild
@@ -1,10 +1,10 @@
 # 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.11.2.ebuild,v 1.1 2013/01/18 12:19:55 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild,v 1.1 2013/07/13 14:13:55 constanze Exp $
 
 EAPI="4"
 
-inherit versionator linux-info
+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)"
@@ -48,6 +48,7 @@ src_install() {
 	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
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild
deleted file mode 100644
index 5fa18071b6bb..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild
+++ /dev/null
@@ -1,57 +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.8.2.ebuild,v 1.6 2013/02/12 20:27:36 ago Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# 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}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 24a7f4e09a4f..96140d3b21ef 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.74 2013/06/30 20:29:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.75 2013/07/13 14:12:23 constanze Exp $
+
+*shorewall6-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org> files/shorewall6.initd,
+  -shorewall6-4.4.23.2.ebuild, -shorewall6-4.5.8.2.ebuild,
+  -shorewall6-4.5.8.2-r1.ebuild, -shorewall6-4.5.11.2.ebuild,
+  -shorewall6-4.5.11.2-r1.ebuild, +shorewall6-4.5.18.ebuild:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall6-4.5.15.ebuild:
   Stable for ppc64, wrt bug #470544
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 240d50bc3426..24ac7e0c088f 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -1,42 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX shorewall6.initd 2070 SHA256 7d71536f017e16f51fd796548d1c1d1c3f30c340cd1506c5db609b3a3e9cede5 SHA512 dca84358f889fe6ca40f44a8fa499a93487a4a596612cc24604c7ca114a52b7d1c5b3c88fec1f48269ef08b67c9cdc6547a9899c7153800083d4ea26d03f61c8 WHIRLPOOL 32aaff95ba26fe0674390742212a25ac1b249123405c99330bd31e4e0bccd1199ebf75cff45cf706e267c1a92ccbc524c9a58332b4a8007dd000c3faf6eb1738
+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
-DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325 SHA512 0cfe18e2d2502b1275ae1ba08b05591653b9a5cc3d94dc027bbcce974a1863823611925b5d7e783e215b086bc21270ed36f6e7a967f3b23e68bf301e92a43fb7 WHIRLPOOL 11b3ad5dbf70e37585f278c78508e7d68db351dd3b4e5b04351fc42d7ccd1259215b7b0f5dba360eba9dfe4341f4a24209b22d9d3b64ba08a0a235270646d9af
-DIST shorewall-docs-html-4.5.11.2.tar.bz2 4019184 SHA256 12fa6c1061f7a4f09dc4e687bcd9e9a46ba822abe815e7b7ba83ddafbb951639 SHA512 c79358f5d77836c5dec291a8521e59634d135987227c9570defbcb22b18576433d2ad58ff28c07f6334cc80bd5f546daabb41ba53f29db83c70e0c6b95fb169b WHIRLPOOL f3b183faa213adff1f48695cf685dee4dd60dea9398f9b1ad817f167dbd85b07b1bf0e6ae24c2f052b22ff73ea7b4a24ca0b6231cc880ddbc7745c231fa36cc2
 DIST shorewall-docs-html-4.5.15.tar.bz2 4017169 SHA256 42dcd882d4a6beb9c91c382d9e4b33e93755e85c468b25b78a6e766cf8449be9 SHA512 e8ea003781599ed149eff9598277d0b77db74f3e66cd83d07e01604d160fb6687b74aaf5136af53bd00957aa62049b0e24001e1b56d58678bc1de336bdbc3a04 WHIRLPOOL 73a28b98b8e816159bb967991e3d8b4cbd6b75dfdfcef72089a784d196dc56366e3916e82b50efabeb0895f6cd54c6beffb1144908d706f3ffe97724907e6dce
 DIST shorewall-docs-html-4.5.17.tar.bz2 4022237 SHA256 a3103b221eda242d2d6debdaab743881b63fe158a6c88b69388dcf3b23f87a8a SHA512 c981574ccd2eeed36d1f4c844ce28efb5d6a389497e8ac372c362ea7d02c040fa153723455e4d5bc8b5046f314737d415625c7850fa31872febc73fe839822d4 WHIRLPOOL b9b5fe3a56bb76882fea7c0e21841499ed14878241960a25ca3c0a353fa2fcda59081b518d3c82b0efb419550b9cc09fe5499889b867bee00f9a01481d4a2911
-DIST shorewall-docs-html-4.5.8.2.tar.bz2 3901788 SHA256 1f14523b5068c52bce6ad1d4d44b0c4b53a77651aa053db03c96aed756f15a38 SHA512 ee0718ca25ba148786be5d17c7dbf9380ccf96d636021234f95dd12c8e584d3918f8fa7d52dd8fa8a06d287efbbe22d090ae0ba3d622384b9de6235a4603e4ae WHIRLPOOL b83b85b2bb0d5bbab84306c1b84730f3a7100eb2e1bd39d524e16e6d341c5f124c5507b5222e088086300c552b0562d04f0cb5335fe74e04b615a9a9c5872511
-DIST shorewall6-4.4.23.2.tar.bz2 217934 SHA256 ecf8339cafbc8e2b98c647e95b6876191147a54e22d51f55356fc7fa6aa4089c SHA512 ab877e4c78620f7de9490a30c8993715d0548bf3a6a8b834f6183221e0a8dd997f88faca3780cf0de66e4ae17936f3fdad0d5662f147ad62f5362723be4268e8 WHIRLPOOL 406edba6b2f9e262f76fe85e24d45467b849fd5b8d70db186ec80792fdac51bbba961b68807975b45e2f5608b1f3ced330a4ffcb2d00b27b27c943c335cbd2df
-DIST shorewall6-4.5.11.2.tar.bz2 220837 SHA256 63151c7cd2ad2cb3daa7cf16384d86492f6d2b288104cfe61da03941bbdb6e5c SHA512 3060a8a70cd98f1b81f3c70ae0fd3c6d990a017b9b75f1126dc5a7ec37dcab7223e2ae2c8e6a3284f5bac14574183ce8beab3d67cb070a37bc7f42a105942f91 WHIRLPOOL e0f35f01cddbf307bdaa7fba74d1ec4fa3fa02d8be5c7688dab9bb5b8fd9b03be1c33f13d381970124bd3d3d00e04569581d6c725c3c739e712586a8834cd725
+DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
 DIST shorewall6-4.5.15.tar.bz2 236074 SHA256 0b8229255c93860f70efaa6698276521290bd22abb4905fdfc1d03828ce9a56f SHA512 6a138aab3ea6f8191f5a7d457504d9776d193e4cd03e2ad580c0e4de4b646773c381f265c6ba59cbc6d83b74e4f422556b001f9ec8e98e39a0e1b1a1dccd4797 WHIRLPOOL 6a87765a077d2699c0e5670ff3bc52d49371c656d77cd0e82c966f003c3992ea05f3c367f15fd4296c07b4845dcb34225b1f0435ad7949bff6f0b670c367de37
 DIST shorewall6-4.5.17.tar.bz2 243900 SHA256 3ed035858161a44bb68025a27adb986ff76607b0f991054b159d3d246a792ad0 SHA512 c24e95a66396971ccc433ced9ffe01e43d59786c8eb162d218970765a03c6255633ac9bfd1d44428243e2bcbb4f5bfdda751f6f17bf0a4b035d47d4786e60cfe WHIRLPOOL ad9df6fb64b49c863ed47d7ca99a43451e489f673b20b96ffdb8357ca862496e4a057710f073472db9736ee64ff0ff7e326352d26c0dc3697b18adf0102be102
-DIST shorewall6-4.5.8.2.tar.bz2 209021 SHA256 c7262e0f11e7e253d4cc3ed0378d4691155d9d8410491887dc3f3db35d73e23e SHA512 e6d2c73da60695b3e197d82201b0326a88a142e4275f23ed4a3cd546bc15b94383cb093b20fffefba32d9a49aa045db2a116c6286d2a0b405fa8bdc3b2a68676 WHIRLPOOL 52a600e1b03e1cf66893c8e0f92394d8260bb176ad036257c29f07fa65f132d1fcd847efa707a2712acfc250db628847728984c5dc7ea2fd9c8df71a55f05692
-EBUILD shorewall6-4.4.23.2.ebuild 1575 SHA256 7a42b9d0d5a27a4ee9888d6eb9326d972c2e905813f0a5630acd7ed4fa731e66 SHA512 19ed4f7d75a48ecd4391acc2e24015c26ef585961d666a95066702794ad7e72a4f9e6d1ac175d46cf5141fc7a5e383a8eec72bc1df0727ab5822b583b16919d1 WHIRLPOOL f7e5779dc2230ba54252b2f1c0f62f3157716eb7c9c808a20d0d914b5df607ec7eeaa56dfdb70ecdd6da9710f8ec03090694f625e26811b1c2c509f5e9d06dd1
-EBUILD shorewall6-4.5.11.2-r1.ebuild 1587 SHA256 d86d0d0f3756697bd02525697369d0a7858157e2a084443eced664cd9afea1d5 SHA512 43141dd55c618cf9f309479e6384d344114494a025f4954b3b10e5e5076448f820a014b5b66dca9c4702370fb407887be942dfea038790e00c5e4c9322d23c4a WHIRLPOOL c14230b74c1a521668a80117e86d720a2e404904367cb1aadb63bf8c88ae63914412c60bb0f69d3979fda003bd34036328e451252e246bfc923ca11ec5624eae
-EBUILD shorewall6-4.5.11.2.ebuild 1586 SHA256 d70444581b895024f70dc00547fc574757675364f997135e140a38e304011b56 SHA512 c2a25866a49eea0ce4160e4d532edfff5a71e3e634ebb8527c69a216acde0a5c8798999daf1e6c38031b7ba45acf8c0bc4350593cca7d86fca9ae730a1e2b61d WHIRLPOOL 93b4caec5414c61bf3faf378996e995ecd581afb5df649404651b0be2279b27e5672d71ec4b93ef0af199f11c22b5183c5e532298f64972ea0afc06bf48f01b2
+DIST shorewall6-4.5.18.tar.bz2 245009 SHA256 f3fb0cec903b98bed6c968e2d6af6faf49b346cbb6508731888304e1372cf62c SHA512 d3ce8d70239cc76d05520d244b958078240af795cfbbfddf010cb31681f1453d40817497939ff02b7e0a5da57291b707254a9eea420d7ad4921edad126eb585f WHIRLPOOL ed6e83b67d680493574818f0ada820f704aad37baf9dd973ea7702890d25a2989c53c5a4f1d8272ca4741aac595c9124011fe95071ee87ab3064e048d65192d8
 EBUILD shorewall6-4.5.15.ebuild 1569 SHA256 ce5fc7847a63687e94271f9ad1c2ad0c580d526dc39ea402c82a32decdda1ebf SHA512 62831bece4a0f1308f35e76b03708df725e85334e8749584c52d23513174a772617df30ef4a3577263775acf95002849ee5e56ed8ac7b6c7cfb39baacbc47946 WHIRLPOOL 19dc8d377cc872681b367af2f48245ddc20f5435b3e836bb42e0c6ff6cb24daac7bc35b3b1e04ff131b8c98ce4c095864a2f4f446b40925cac074647f87398ff
 EBUILD shorewall6-4.5.17.ebuild 1668 SHA256 daf43b8accbd15401397c2e0338ca7918eaf1866ad0245e4bb6c49251fe8a2fc SHA512 2c387ffcd8c5a2ace2140047afbbc5c99febfd8a23707970a1d3806a4160b522030e33d71fc6c769ab9b4c3713a112c6d0294063ab45783bb408a98a84dc5306 WHIRLPOOL 56bc09fe8238bd3d7884549fcfaf00b1f25ba3157b8d5e5e215824d3cb528169d475b4c7c8ba9abdbc7751f477d8b4d29c59f6b4028d26cbf815fac73e2f0cd6
-EBUILD shorewall6-4.5.8.2-r1.ebuild 1575 SHA256 e4fe571dd6feb4bc49cd19994b122a6d695daff1a691c77089579ab295bc43df SHA512 fa293c7c1e3129d5fb40ae82f53df0871606bc697c2d56f45873806e4ea362178dda49eeb9c35c0b4d88efd07ed5cb2cd6731cf88a4b85dd92e01eb3ca0d4f45 WHIRLPOOL 3af8bad253a7b79d6986871d7be9a754a2c896d333d2353be8f3f4d6c2aa59529f0e0cdcb116bc8e555f6b370f25468771cf47d725f6c52472093ee3aaf0423b
-EBUILD shorewall6-4.5.8.2.ebuild 1585 SHA256 f5c52303dc914bd415f14acce9f37eef616a746c5d8fa94b04f3c3a627b0ca69 SHA512 736e240bcfefca9643179cf31af051e6375311d1bdd67bd0718ef96ac3d87fb11785e218986ca4b41f3d325f506d9008b05737d32beee0b3b59c858b079e170e WHIRLPOOL 9bb824aac60ba90e3ec67b0e87f5b0abdfc0d94356e1d88ef54f7fffc59009115fb6edd8c7254f8f8daef1f06fa951c3f0d86ab42c3e0920a62d4f3069741b63
-MISC ChangeLog 11664 SHA256 0c35941b125d4b68bed6424a828bbf7ee18f7b096cbf1e3f58872d0015f94586 SHA512 424c49402d8d3195a308f9cb6a2be6b5021548343d22d57540db66dfc9de190f7267a173e77247511bb7966321d6d5ccbcede56285b843bea898917d618eee30 WHIRLPOOL 3adfc7bf8fb94a1dbbe8b214d30146c2b4498149e7309b7cb427933801d61d263495fb2dac81325f1d10880aa680cf996d5aabf79b15bae53185993c0b2f1903
+EBUILD shorewall6-4.5.18.ebuild 1644 SHA256 f7076561ed8f4690039a61fae1bc5d85a65cf1fdf40dea2494e70e35adcf9863 SHA512 32839b7896bcff2a43e3a8ecda33b48a6d67e641981b4a83c6aa6d15acdc72aa1a63933971936a78f3dab655bd87ab6ce262eef27645d94a8509878c534fea0a WHIRLPOOL 4cff53640a718493977f0e6fe118e53d7f29e8894908823e8e3633c4e16280d93c5c7064d525cc7b54836e034faff48802e770f05539c417d1691735b9c87f11
+MISC ChangeLog 12075 SHA256 929810200233f8ce2e1707d189287431ab092638c3e6e0ad53b7d662732f960c SHA512 1b76ff77a7a1a209d6b571ffccc26caf3c909defa9256bcfa2359be69617371e9cdedb8e718cc699613fe65940932e171bc259fab911611a43a01e5ed6da88ab WHIRLPOOL c9c5f18a276170bdb6784d513f94ae22adde72554fb3e7a67dd2a101f570baaf93505fd0a31e28c728bbedca59eaaf681c715db7e692c8959a73571987a2e6f0
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0JUtAAoJELp701BxlEWfItgP/1487HzI33sSN30syfG+BknE
-t1/0Xy6CYijYyvA4HWeVdJt7cGvBcvGN8iNWQSQV6hqwFAis3mQ+1BQaN+4+YBTU
-jN3q/na5D/TIMHGoMou3tMvYF4IWoQUANGtoucDDXExsKsw9gaT/BsbAHBFWssu8
-EsNCel2/Xwp+de0OAZVAEfMoorCEZrAuvL93MxrWaod7D/r/6nv0kmhSGNp/uRXu
-EpNxBO76dO4e2MJFGWntjT/C1Qv0VT0I349HJD5/0xH+fWdNKZ/p0D1KDKZcwkRt
-dUjtv/Mupu9HslkMYuiBbKOOYnFZpViZcQz41q8ccD4aeHmPeJXLjVeLPtsY9ZAT
-rKruesEUB3Bs7LItPtzVY+9V2h1XLFxfFMbrIMN5IdaK5gpDC889eyIvxe4itK19
-uaKSujgX1+EbkRhHp5/fCDPpiN+PJhKErJSM782bwFex7Ta+WPy5Lw/kO087+aFA
-RnZCJt2RCfWKj34qPtVFItll7hjGznacMdzeqXF4JpM3UR+afvConmj1l+4MjYEi
-bfj4Rmei5kldYynUjNMJYmL1dKaERJjYz4zSfSoCrcYpV6VvScqornNgCFg1ACcA
-4Tki+mMVBt+yf6ed8lDLyuqzGA5ZSeLbPW4LVDy/AozYGaxxOMfKtslfRwTywThc
-4P9pZXYO8ifBGBhI+wB7
-=RkNW
+iL4EAREIAGYFAlHhYEhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsNkagD+NlDYTo0VI6tUONvPtUrzmqSi
+v2I7n+74hWUMNFX4CHoA/1L+I7F6D41C/mpchEdvYd64PoLx1llFug09cu65hzkR
+=cG9W
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/files/shorewall6.initd b/net-firewall/shorewall6/files/shorewall6.initd
index 299b02ef7d50..0ab2f6bd12bf 100644
--- a/net-firewall/shorewall6/files/shorewall6.initd
+++ b/net-firewall/shorewall6/files/shorewall6.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3 2012/10/21 12:56:33 constanze Exp $
+# $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"
@@ -20,13 +20,13 @@ depend() {
 
 start() {
     checkconfig
-	ebegin "Starting firewall"
+	ebegin "Starting shorewall6"
 	/sbin/shorewall6 -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	ebegin "Stopping shorewall6"
 	/sbin/shorewall6 stop 1>/dev/null
 	eend $?
 }
@@ -37,7 +37,7 @@ restart() {
 	# 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 firewall"
+	ebegin "Restarting shorewall6"
 	/sbin/shorewall6 status >/dev/null
 	if [ $? != 0 ] ; then
 	    svc_start
@@ -55,7 +55,7 @@ clear() {
 	# clear will remove all the rules and bring the system to an unfirewalled
 	# state. (21 Nov 2004 eldad)
 
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	ebegin "Clearing all shorewall6 rules and setting policy to ACCEPT"
 	/sbin/shorewall6 clear
 	eend $?
 }
@@ -63,7 +63,7 @@ clear() {
 reset() {
 	# reset the packet and byte counters in the firewall
 
-	ebegin "Resetting the packet and byte counters in the firewall"
+	ebegin "Resetting the packet and byte counters in the shorewall6"
 	/sbin/shorewall6 reset
 	eend $?
 }
@@ -73,7 +73,7 @@ refresh() {
 	# interfaces, the black list, traffic control rules and 
 	# ECN control rules
 
-	ebegin "Refreshing firewall rules"
+	ebegin "Refreshing shorewall6 rules"
 	/sbin/shorewall6 refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild b/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild
deleted file mode 100644
index 68322e1caefa..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.23.2.ebuild,v 1.6 2012/05/20 08:42:57 halcy0n Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# 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_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.11.2.ebuild b/net-firewall/shorewall6/shorewall6-4.5.11.2.ebuild
deleted file mode 100644
index f56d42ae05bf..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.11.2.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.11.2.ebuild,v 1.1 2013/01/18 12:19:24 constanze Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# 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}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.11.2-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.18.ebuild
index c99e5db046dc..f7df82c32b31 100644
--- a/net-firewall/shorewall6/shorewall6-4.5.11.2-r1.ebuild
+++ b/net-firewall/shorewall6/shorewall6-4.5.18.ebuild
@@ -1,10 +1,10 @@
 # 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.11.2-r1.ebuild,v 1.1 2013/03/17 09:31:45 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.18.ebuild,v 1.1 2013/07/13 14:12:23 constanze Exp $
 
 EAPI="4"
 
-inherit versionator linux-info
+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)"
@@ -50,6 +50,7 @@ src_install() {
 	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
@@ -57,5 +58,4 @@ src_install() {
 		cd "${WORKDIR}/${MY_P_DOCS}"
 		dohtml -r *
 	fi
-	dodir /var/lock/subsys
 }
diff --git a/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild
deleted file mode 100644
index 2fcc7b853d9d..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.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.8.2-r1.ebuild,v 1.8 2013/02/12 20:27:22 ago Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# 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}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild b/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild
deleted file mode 100644
index 5176002904b4..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.8.2.ebuild,v 1.1 2012/10/12 18:17:00 constanze Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# 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}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	keepdir /var/lock/subsys
-}
author	Constanze Hausner <constanze@gentoo.org>	2013-07-13 14:13:59 +0000
committer	Constanze Hausner <constanze@gentoo.org>	2013-07-13 14:13:59 +0000
commit	4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8 (patch)
tree	8e536a7e12bf12d433e6e993043c48f69963260b /net-firewall
parent	Cleanup; Version bump bug 472434 (diff)
download	historical-4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8.tar.gz historical-4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8.tar.bz2 historical-4c2cc5d693528c0e357a0cb2c867b5affd4e8ec8.zip