Preparation for files/ restructuring: Cleanup old versions

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB80F419010E3EC3

20 files changed, 55 insertions, 585 deletions

diff --git a/net-firewall/shorewall-core/ChangeLog b/net-firewall/shorewall-core/ChangeLog
index fb77a94fb8bc..0645e7f12668 100644
--- a/net-firewall/shorewall-core/ChangeLog
+++ b/net-firewall/shorewall-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/shorewall-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/ChangeLog,v 1.40 2013/08/17 16:18:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/ChangeLog,v 1.41 2013/08/28 15:21:47 constanze Exp $
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-core-4.5.15.ebuild, -shorewall-core-4.5.17.ebuild:
+  Preparation for files/ restructuring: Cleanup old versions
 
   17 Aug 2013; Jeroen Roovers <jer@gentoo.org> shorewall-core-4.5.18.ebuild:
   Stable for HPPA (bug #480072).
diff --git a/net-firewall/shorewall-core/Manifest b/net-firewall/shorewall-core/Manifest
index 8ad93c5995d4..1e2ea3f9e76f 100644
--- a/net-firewall/shorewall-core/Manifest
+++ b/net-firewall/shorewall-core/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA256
 
 AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
-DIST shorewall-core-4.5.15.tar.bz2 74626 SHA256 060f43b07e4ce7c5ab64d1167ea60cc1e30e16ea8d8c92fd0f694f7220f2a9e0 SHA512 0c754e2a24ca982f1e82b94344ee5dbad5c578ab0140d2345148b2bcc872ffceec4fefb5ae3dc980de9d9597b60c79212f0b1f316819457a7855d6a806a15ab1 WHIRLPOOL 03538f52e84efc56d3d967e50db3cacac2eafbcb158ede77e07e6ed9dd61d7cc0a3864932c7eca0136ed1ccb525743a0198fbb7176ff27a5b519cf15f15804cc
-DIST shorewall-core-4.5.17.tar.bz2 78981 SHA256 13939fd3b3034f9e5b556bdf4dcaab8b8430e895a1ee85ef8b4f6de1cf8208ce SHA512 510ea914eb3e48ddae250c90e164efd16ba33d38a8266ba95cb0d453752ad70a5ebd6e0cf6c449b9c3fdfc834c33e5cd0cc116fdf779018497bb0cbba0dd8fc0 WHIRLPOOL eca27c3a603be2f41004862baea331c4316c0c150d435b307c7af213a050a09886a7c19d20d3a5d7b4d6b7014009024af98e8825117fb1f5a1cea44398273fce
 DIST shorewall-core-4.5.18.tar.bz2 79521 SHA256 41b1e9e2d09c6344d546f814531996eaf52b3a30ae6c8db7ff009a8a17bde3cd SHA512 8b2dd691b84c5ca3beac705b4aecb7ac3c09e794c5e255915bf5a55cebef23ca4cd8fac2b3118d6e6cbbf7e432699cc447d5811de80e1d3bae0516ede27398d1 WHIRLPOOL 4c2416dab6f4fa73dbc010c3ab3a884d65f2ab814da6301b7d8a46545347b6c94b0444ea8e3357c9a80d03a08064c67fdd0c80d8167bca8fa1a2c54d4fd7b6b8
-EBUILD shorewall-core-4.5.15.ebuild 1168 SHA256 f8111587692db8fe7acd06e101b923d97ee89511380e4e68f14c19ac92a9a17f SHA512 5b24779543506234336bdf4c3081013ca95117400bd1a319f5d8cf4b4a0ddbb2b9cba6f0e7b3019d57b949f50d8569ea2a5cb4df4e9917e2decdfee140ed0aeb WHIRLPOOL a0aa17ff7902b017e6c916a045efb0e760e51680cdeba1b3428c209ab24a0f7fb81cf9c558cd63b0eadc5265c8ead5e8f625700213b0b148a0e7dee6e647ed17
-EBUILD shorewall-core-4.5.17.ebuild 1181 SHA256 70e4a3749f2c47d964939f342fc093cfaaa2a9155bc974946aaf5b404d205e78 SHA512 4f3ae7898a152abc2e50f80f77679a5e1fff32623ff71f59769a47bbccfad7cf4b2b7465b8fafb5904d9d1c7f733391c83b6bb01cf1f84919e079a3b7a353192 WHIRLPOOL 8f3802da86bd331ab9635241e2070c3e0b9739bacaadb9e5570154c2d34a28886fe8d9176b660df5c2c406ed85b8a0fee8367c43960c08be4d3f66440aa3e9a9
 EBUILD shorewall-core-4.5.18.ebuild 1168 SHA256 efdcda19b2fbc3a597f387cd48fea93fe50bb39b4ea78ad55efcacd4580f937f SHA512 f37cf1ffe539eacdf7d195078bbe08dc8e0ada6a8c20b29c5891ec293a9a5e3ce6f17f3dd6184f27b6a7506dcba7d3a85d4ffe1f0ff48492e5e3cd4cdf84cb77 WHIRLPOOL 9484ed7f322c25f19dbcdc9f5ba7b521d0055423d1bde4e103437da790f4ad337e6029046cfb504a81f95d95431a088ee12e74928cc17b5859ded131c2d1bedd
-MISC ChangeLog 6065 SHA256 9a33e6a9af81afe6c0b3cad5ed88d492bec1dce635ca81d950ccbfa2918862ba SHA512 0e37cf2f9cf3bd12d96c734ce9ac3a4935db4745a04c0844f9b6116437429cb5a2242e99a5918aeeb3624ec804643fa622c712330cb996e21d0d4d46e4d11980 WHIRLPOOL b005315f7da117e6c1aca4896bb3e77c8aeaa55a6d31382cdb0f8e2d631949bfb5e46761364d8461538810f2decd994aac17d449a21cff7eea1e0981870afad6
+MISC ChangeLog 6253 SHA256 12b60c85b45f36af1420a9837afebccc21db27c4065520cafbeeedd98021b39c SHA512 6bad351e4b168df251e084422f793e12e8d86692107dbcce663439ea8461f13ae099bb4900241488f86b0a0ccf55008f19a28f6601f88f719b6957c477b8fd39 WHIRLPOOL 168c7cc8eaf633f183f86efd52d7d36ed43ccd5d3a3118ffac22790f72030a56814dabf07d4384f29b8ead56de710737cb970fe151c547b957aa73198e683d37
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIPoj8ACgkQVWmRsqeSphNP0wCfRt4zA+D4bp/3kZOh36UiYPkc
-qHQAn3MjsBa0S+H1yoG0tv7+UK1BOQvg
-=p24F
+iL4EAREIAGYFAlIeFYxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsPJmQD/SOszB9dkec8roRsmpMF4/7bj
+KJ2Viibhyh/Qdn16cmQBAIgl6uWrcxBE9pUhHqBc1+Ddlsd3o+FsuSLYDtgMxRqR
+=2KXp
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.15.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.15.ebuild
deleted file mode 100644
index c4383caaa06a..000000000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.15.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.15.ebuild,v 1.8 2013/06/30 20:29:39 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="shorewall-${MY_PV_BASE}"
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="selinux"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	!<net-firewall/shorewall-4.5.0.1
-	selinux? ( sec-policy/selinux-shorewall )"
-RDEPEND="${DEPEND}"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	default
-}
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.17.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.17.ebuild
deleted file mode 100644
index d0c18081db18..000000000000
--- a/net-firewall/shorewall-core/shorewall-core-4.5.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.17.ebuild,v 1.1 2013/06/02 10:45:09 constanze Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="shorewall-${MY_PV_BASE}"
-
-DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	!<net-firewall/shorewall-4.5.0.1
-	selinux? ( sec-policy/selinux-shorewall )"
-RDEPEND="${DEPEND}"
-
-DOCS=( changelog.txt releasenotes.txt )
-
-src_configure() {
-	:;
-}
-
-src_install() {
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	default
-}
diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 09dd3c866dcb..9e077e334ad5 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,10 @@
 # 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.134 2013/08/17 16:18:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.135 2013/08/28 15:17:25 constanze Exp $
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-lite-4.5.15.ebuild, -shorewall-lite-4.5.17.ebuild:
+  Preparation for files/ restructuring: Cleanup old versions
 
   17 Aug 2013; Jeroen Roovers <jer@gentoo.org> shorewall-lite-4.5.18.ebuild:
   Stable for HPPA (bug #480072).
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index b64a9387cbef..2fb38ca165b5 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -4,21 +4,17 @@ Hash: SHA256
 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.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.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.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.18.ebuild 1499 SHA256 132580bd50bb8c41b4cf78a7918a4fe2efe4c9d51560c00de4806aedb828af75 SHA512 9e5b470129fdce4a6b060456b711e8d60f54a2cf2531deb7b0df9c566194075db6e4a4254c6484cb799a2dc4115d6f3d5374e6f01763bb3bc8936e2ddcfe608d WHIRLPOOL 3be3ab13d1d30c414559a9e83ed99efcce89f9d839eb6a95e66266186a270b1adf0e4ee7c7571c1da8719d0b442ab7947890be69f982e9f908d96d11bf45f1e3
-MISC ChangeLog 20949 SHA256 7c1200daf1de3201417b5eec79257f7880c484f5d05de6563f38ed35c84710d6 SHA512 a94dea0d4717650bc4a0b78d12acfbffc1d7915a14aff20bb5f739d363be975dce522e223fd8fb6deed49fc1dd3e757d68bd7b71537f3655738a9419f220dc10 WHIRLPOOL 8a170a84da1e7c65501097a5bfff7d96bdeca39cb81f9c626fd3f9d210b73c78eb545d8ce9502d825ed938c1e176d9c6d5c852ef9016bc10b91d0e4981f435d1
+MISC ChangeLog 21137 SHA256 c709fb1c19e4df599cef849692b48c517c7f23e302b968433ad277462ea00096 SHA512 6c83dc8cf6901652f6f3d9f6b33908b6b3694e14810d0c0a979af692698c139764e3eb4270d6c737de1f420d646f137db7bf7a6ee82913c0c99f0d5532bd6731 WHIRLPOOL 02368f76fd578ee0d1a2223a65c141c8143e2aa54b897a5bc0a4334b0f4e4a3486bd687f1cefc4320c0f914731558e2e1f204895e84137594c18b1d3e684bd67
 MISC metadata.xml 249 SHA256 cdf32b905fad83550eb790e99cc420f9d31e5f084687dafef696caa74270f544 SHA512 0f1cd0c406c41d29198618f897793943d21cf001fb9751bceaab6e839b9bf632435498a7552f10420ac01ffb6e3c1c37bdb709d416458c5b2ce80078f88f142a WHIRLPOOL 7c41b0e1fc6e004743781d062b73653c41add99d31604fece37d10f00b91549ad28c1c49689723c3f6668607f8b85847f9b6c671f64961ec9938d8d359ec575b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIPomMACgkQVWmRsqeSphMPPwCdGt2LCujwXB67Qdhk1vWv9+y7
-lqQAn2imAcsrvbJKpFWG654SbX6jcs0W
-=54P2
+iL4EAREIAGYFAlIeFIZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsOqdQD/eRqALkRksHBrkzJ4EOkYWfKU
+NTvNTRfyUppty03vP58A/1zllOn1z+4EzJ+iGoz9OobVkaAucNTkLgbXmz5lqRe5
+=3q/T
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.15.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.15.ebuild
deleted file mode 100644
index 54c85a82b948..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.15.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.15.ebuild,v 1.8 2013/06/30 20:29:47 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-lite/shorewall-lite-4.5.17.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild
deleted file mode 100644
index c5952182ecc1..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.17.ebuild,v 1.1 2013/06/02 10:48:06 constanze Exp $
-
-EAPI="4"
-
-inherit systemd versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	=net-firewall/shorewall-core-${PV}"
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-	systemd_newunit "${FILESDIR}"/shorewall-lite.systemd 'shorewall-lite.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 9581f98ea186..8e45c5fc241b 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,10 @@
 # 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.242 2013/08/17 16:18:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.243 2013/08/28 15:20:19 constanze Exp $
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  -shorewall-4.5.15.ebuild, -shorewall-4.5.17.ebuild:
+  Preparation for files/ restructuring: Cleanup old versions
 
   17 Aug 2013; Jeroen Roovers <jer@gentoo.org> shorewall-4.5.18.ebuild:
   Stable for HPPA (bug #480072).
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index b3bc166124f0..28fcc672763d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -4,21 +4,17 @@ Hash: SHA256
 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.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.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.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.18.ebuild 1506 SHA256 ea8ec1f2f64ba52b3e356bd55442de01b0e45045bc653ae48151cc4c6a645ba2 SHA512 03920b6d37d6a243d6d39bfe5a5108aeae4c7a691138ce6b73d67de35dd444da6a221c268daa65a9f761dbc2cefb1189784a901a44e54aa77b9cd7260c4f40d7 WHIRLPOOL b1a30462e723dcbbeb2d4232066d5dd0739ea8499a3a8bc672cf8171804f025475ecbde8ed793ee6338602aa50711dbf34f3f26f609fc25a269be1f1009416e5
-MISC ChangeLog 34186 SHA256 36851cf6767666c5a343f72d2fbfa0be23c25d81370e21e8a8b80dcc41ea202d SHA512 d704a0a8101597a7fcade6d1d51d3f5736b9190c2815d6bfbf22f5757e6083a964f1a51785dcb73941c2b29036b8cbda299a78cc19d0982895aa03d5b0b4879b WHIRLPOOL 784907a89bbd9578337e0bcdd7e37578e63b626fdd16bd0f6a3be78d7c6da46f894251f1f620e5c087d85d098ea1d1e1ca6a845760effb407e5b040c6b839cac
+MISC ChangeLog 34364 SHA256 8335b3407abeecc61d7af756fd6af8bd97de6b48a792ff330cbbabea2891b122 SHA512 6423dbe1dbeb72473f24002e56d71dc99d566c5a40f1387a52a3e39bc16345bbe907c78501044e677979026fe713719462ea801b1ae2337d3d55ac9f16ee4914 WHIRLPOOL 2ec231786028875f191fa29114020bd6c3627dc6d2bdfd494fd4ce634e6369d34af07de7574d4c67c009615d901c7a93a02ab6f645e5702bfc76f40ff12a3125
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIPolYACgkQVWmRsqeSphPs7gCfSQWUufkkuTyTJYyNEQA+R7Ex
-/hAAn1kf17YVjwn2FEHFdpZIuuZoqQll
-=Ww3f
+iL4EAREIAGYFAlIeFTRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsNuVgD/SfOBYx0rV2Ku/7Yc8C0NLMEn
+8in2WHoz8LfAuCNE8/8BAKdq3wzB6xrD+X4yXKpsUXu8tmAl2fv9t76cvGMixrx3
+=0Avq
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/shorewall-4.5.15.ebuild b/net-firewall/shorewall/shorewall-4.5.15.ebuild
deleted file mode 100644
index 63f3b9decf5e..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.15.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.15.ebuild,v 1.8 2013/06/30 20:29:24 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
-}
diff --git a/net-firewall/shorewall/shorewall-4.5.17.ebuild b/net-firewall/shorewall/shorewall-4.5.17.ebuild
deleted file mode 100644
index e54542841cea..000000000000
--- a/net-firewall/shorewall/shorewall-4.5.17.ebuild
+++ /dev/null
@@ -1,55 +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.17.ebuild,v 1.1 2013/06/02 10:47:00 constanze Exp $
-
-EAPI="4"
-
-inherit eutils systemd versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}"
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	=net-firewall/shorewall-core-${PV}"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-	systemd_newunit "${FILESDIR}"/shorewall.systemd 'shorewall.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 7d51b6a93968..3a2d7e3615c6 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,10 @@
 # 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.61 2013/08/17 16:19:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.62 2013/08/28 15:15:11 constanze Exp $
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-lite-4.5.15.ebuild, -shorewall6-lite-4.5.17.ebuild:
+  Preparation for files/ restructuring: Cleanup old versions
 
   17 Aug 2013; Jeroen Roovers <jer@gentoo.org> shorewall6-lite-4.5.18.ebuild:
   Stable for HPPA (bug #480072).
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index 41f9f1aa3385..17fd12745167 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -4,21 +4,17 @@ Hash: SHA256
 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.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.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.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.18.ebuild 1594 SHA256 16b1e974275ce30be5e1310e73d24e135a0117960574d8a886c46c27fed2be03 SHA512 67190d8004b43680bc478262685ff089d97d081906aace42828921a7ea1dd2ecde9a1660b79aca758c0155beae77baa93d6eb7b5d8625bdc5eadb350f9f9c081 WHIRLPOOL 2f15e9a17b6271c0d6c0bbd737c8b4e70a5d11b84ae1089cf9bb1cca45ba9ec29d0dc9432dd56dc2897dfa68aec46b1bba6d08a966af7b0cbd2cfc48e4138ec4
-MISC ChangeLog 10617 SHA256 47289958fad2d2a5209d41cef815cbd89b255ae28c3c9b53ad20a89c5b8f2c30 SHA512 6f84e4cce8c694ce8ce2ed99775f6c8069a1ae73650dffd65a76c4c6a4171a46251df231c7f645ba59bedc4285214d9547901281fb8f69f0decb9194bec40cea WHIRLPOOL 733e5882bee641b51fa98d23401fe083258570fdc0becb39a2c8d73194965481d3aef561ac58577aa7d81f480e091fbf4ed036076d58b4f6ccd4b614b968cabc
+MISC ChangeLog 10807 SHA256 2d769c93d6e69915b6945b7b025ef256d7368cef05541824a66cf4dcfd0dbdf0 SHA512 1359b11a083160476280c6801abec4a6eabba03fa93a14dd4d9ced1cacb8e4ec812ceeff99bf9b510de45892f99070802d72d45fed7475162ea4b4408aae1524 WHIRLPOOL 409d69714cfb3258313cf53b1cd07bbc8cc3883a45764f8ea40b453eadfc427d93f98d9e44144b666ab548c0293610b6792e13a1d1e67472de1686ed14ac75e0
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIPonsACgkQVWmRsqeSphMV6gCeJkeYmRluc6zIv1wTA5nsleqX
-LLYAn2mcdWYDKYKi1KDbrOMPHLY84Swu
-=O00K
+iL4EAREIAGYFAlIeFBRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsO5rAD8C4qdhF57ju0Cuti+P1L35ZTH
+MvxSFUDDF3wuDKB2vpsA/iGvnHoUhlDQdPcnJJjCWYzLzcn5uPZ1Q6YL42MazLva
+=/7rm
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.15.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.15.ebuild
deleted file mode 100644
index 32cfe52d7768..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.15.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.15.ebuild,v 1.6 2013/06/30 20:27:57 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-lite/shorewall6-lite-4.5.17.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild
deleted file mode 100644
index 6a215e6a4f07..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.17.ebuild,v 1.1 2013/06/02 10:50:14 constanze Exp $
-
-EAPI="4"
-
-inherit linux-info systemd versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	=net-firewall/shorewall-core-${PV}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/shorewall6-lite.systemd 'shorewall6-lite.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 0fc3ebd47fe2..0f9ca612b462 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,10 @@
 # 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.82 2013/08/17 16:18:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.83 2013/08/28 15:18:49 constanze Exp $
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  -shorewall6-4.5.15.ebuild, -shorewall6-4.5.17.ebuild:
+  Preparation for files/ restructuring: Cleanup old versions
 
   17 Aug 2013; Jeroen Roovers <jer@gentoo.org> shorewall6-4.5.18.ebuild:
   Stable for HPPA (bug #480072).
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 90bd6a572787..277fbbe5a1b7 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -4,21 +4,17 @@ Hash: SHA256
 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.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.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.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.18.ebuild 1631 SHA256 4ad78a59af8c9ea6f657033c1aa332b865bd8888a069ef2c5db088df92e9abb2 SHA512 278f7c3824d266b24db67c71709955287fef59c1a5467a5e8be935b0117fc0d3171ae09d231f5379ba3a21e4be941a82c38bb7cb9205c6e3925701cd06b753bb WHIRLPOOL e7cb6faa7cbc1ec6545b0237c8be6a861a8b6ce702461c52f202b97df795cc3cc8669fd01772646f251caeadecb9f3ce29a83fea79f69ae69ddc3ae3f2b814e1
-MISC ChangeLog 12844 SHA256 c3a6d760aa43d42f56cd38d2a6fcb6711a8555531151f778cf38096824ce912e SHA512 07a13c31ee58c072c67304bc3a050a65aeda2e8282ec1687b002a73bfa90b8eaef01f3e8102b7e3574e492653c333e924cfecb5a4443394c40691703d2d62af5 WHIRLPOOL d0ad92a017ea8c5128f878cb2162526b8bd633c866b75c0abefbf83a338ba633c123a4426a1faf15a720043fe88843bca9456873e5d0756e3155497879f51e00
+MISC ChangeLog 13024 SHA256 6b876effa5a3a8566864717a7ba22cf60ec5bc64dfa98e1b89331e3fca9691ff SHA512 75e0d96b51c614d8cebdcbc26450d5d95582232716227bd47dcd868cc9e4a6b60fb8e6fa31e2735e7971078db04b2fc4e738ec4d6e17ed20bc4dfe8cae2c178e WHIRLPOOL 6bc8769bfb965e7f3fdf6e14952a8d4be2b66fdf9dcc106baa732ad9438527777442a259216ae0a107cda8cdc1cd77ae50f7f0416ac02ee601503a60d6ea6317
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIPonIACgkQVWmRsqeSphMotACfVjoMqXAzOnTkPsfHYbGye4w0
-eugAn0U7xxrE9Zo/jH65oDKOyRoQp3b0
-=nsi8
+iL4EAREIAGYFAlIeFNpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsNpqAD9EuHrTpN0Szo2f9HG/+D9Wke+
+zwKtuxdZHaTRLZRujsAA/RUOoLd0v+1MeEs9Mkj/D6dkHJRMIMyUymeeVpdP+QlM
+=TULC
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/shorewall6-4.5.15.ebuild b/net-firewall/shorewall6/shorewall6-4.5.15.ebuild
deleted file mode 100644
index 764146a61664..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.15.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.15.ebuild,v 1.8 2013/06/30 20:29:32 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
-	dodir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.5.17.ebuild b/net-firewall/shorewall6/shorewall6-4.5.17.ebuild
deleted file mode 100644
index e15f5864c41f..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.5.17.ebuild
+++ /dev/null
@@ -1,62 +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.17.ebuild,v 1.1 2013/06/02 10:49:07 constanze Exp $
-
-EAPI="4"
-
-inherit linux-info systemd versionator
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_newunit "${FILESDIR}"/shorewall6.systemd 'shorewall6.service' || die
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}