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

7 files changed, 42 insertions, 152 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
-}