Version bump, bug 536662

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

3 files changed, 474 insertions, 6 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 53e89897c7e3..5de7158c7ebe 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.270 2015/01/13 15:53:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.271 2015/01/24 19:16:48 dilfridge Exp $
+
+*shorewall-4.6.6.1 (24 Jan 2015)
+
+  24 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +shorewall-4.6.6.1.ebuild:
+  Version bump, bug 536662
 
   13 Jan 2015; Jeroen Roovers <jer@gentoo.org> shorewall-4.5.21.10-r1.ebuild:
   Stable for HPPA (bug #535560).
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 0c66fb810672..e1d6d56b07d0 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -31,23 +31,43 @@ AUX 4.6/shorewallrc 1982 SHA256 fa61ac3b561aeed2bd220fea105a0f1e7b090dd52c9def61
 DIST shorewall-4.5.21.10.tar.bz2 489469 SHA256 961331ba61e5e6dccc106e43685e45f19bf1e155502067c88e18ecf94c2a794f SHA512 bdc673b999c99624c61caa1239ac3a58c4d85743179de05ed5fe947e755fc4b01425da34b67cb5e6db693c62bf25e316517f1473b450a1d76887e69e4e384682 WHIRLPOOL 04a7afd30d79d6360ec325e7df06ffd6e911d938382a4c0c331312ddf6951d6564f5a0452b244095309fe4ce00b1c72838b0ef76e198e137c153a617dc22e8e5
 DIST shorewall-4.5.21.9.tar.bz2 489618 SHA256 a1fc41abcba3181235e217a5da53bb25d11e6cdeef49dde82a0daeb2bb305fc6 SHA512 137eb33f63a25533f90150de5cd246f47e5072f838f8e42b044bd6a620bce767f8cb2b9da995fcfb61e37ab6774ea97819f6f7408f669539917b419262a68496 WHIRLPOOL be464ef64e06b35ff9fdf74e9b6a8c88b8de1aa766ec3bf2a7ccf9b69731ba23dc638047f5ad44f451ab93e093458f8f88d7b16201d61bbdfce40075f9ef25be
 DIST shorewall-4.6.5.3.tar.bz2 480922 SHA256 ed621d9c6a7a3ec58876cedc6f0a5f0ee425cb9107011af34f50b4490873705c SHA512 7d8bb202c205b6882517fb8d177387eb441a593bc5bae112b85823012e1c26a08a9ced0ae7c64a58c6dec93abfcbae0d043d76ddb86dd146fdf1ae74b4edc49b WHIRLPOOL 0436110b574b924d427186103bcac68d50106f1d9b4cdd5a28027b89cf62fa440c9a8de06666b9dd7464b6da9766efde6e6a42707c7ed0ba7c25b5ca18877418
+DIST shorewall-4.6.6.1.tar.bz2 485418 SHA256 ad199bba7397e19380eb44d46bc597c5d904af624ae2c5127d160f2f1ad7ffa8 SHA512 1c48f613e04d36b9a73c4a65c9ee1edff7eb99739a2e646868c5a1804e2b040bb05b2fd13abb021f8b7a6e3ca4bbe7990b10333a9357f1f2a467f568800d3795 WHIRLPOOL b81231c74e8f15de7cac2f5ac1a421426df6adfb518165a521eb382d125dd7e6fa79d8297a1b61067d2ebabc0002ad93cf1f10713d7f19fe9fd7a8aaa84820e7
 DIST shorewall-core-4.6.5.3.tar.bz2 51885 SHA256 820b8c5791f418312a2c62fbdacae0de86a3460358763b84ebccf142a68f9722 SHA512 cdef020e3e4ff1204854fd0f3e004f0d1d1cabab42644f5c7620dc8d4676f2ef5bd04c87bcdad120299640b63effd8e4a2b7ce116cd202907620f0806c2a8362 WHIRLPOOL 0b8c94588ae8a3c0c361d34ceab1af57fc68bf74515d2d260f17ae86c8f52075585eb897153d803a1f76fcff2d51e51afb42d02e83ff1e8d1cc79b3b0e52c98d
+DIST shorewall-core-4.6.6.1.tar.bz2 53900 SHA256 20ca8ee26d2d307e658a3a89b16d6eeb7d51a1ab6a4d30b2e4e880e7d96ed247 SHA512 e42f89af10f5323a95dd5acec2e4f21f01d215faa424b72c91a816c1efa1f852c5fb0b6457e0efde14e62a391b86d672f47a87ae80e47adb8dbae530bea3e56d WHIRLPOOL 930c7175f199934cb3a86023be541db6ab205f5d77e257e1827b365a864e463568c7dad905989c15a20a1be2937b49c068e6261511808fbfba0fa0cd91b2ec9d
 DIST shorewall-docs-html-4.5.21.10.tar.bz2 4146174 SHA256 cdbc5f3654f7cfb6f0c3b3750a7174df8fa0590dfe34df055300140b3eb13192 SHA512 94852cc094d6a485cacc4023a2819431f1bfd80b8cbcab29981c422fdff9dfee90697ae8a9bda7ded3a8be03db516bdd5f4bcc4b83e7d01bc433a8c88d23731a WHIRLPOOL 6f02d0e3255dd1e31a43193f67f9b957546a6ae574631e61364f81244bee887e7f21c38f412fa21cde77b3d89aaf0e14e43909683db0c9c32edeb455c20b998e
 DIST shorewall-docs-html-4.5.21.9.tar.bz2 4146065 SHA256 9056c22b8232d8276cc53a6eb74940bab42a250c670cb5baa42c75cfb89efdef SHA512 48b2c692ba59b7ec74307909e43a95104e212c9b8e21af7f0dd9f3438ac4f24a6fd2bcc6517966681517aef03beaa8faf03efd74406966d97b68cb416be8551b WHIRLPOOL f68cba7ecaf8c541e58d26c157914bff2d90cd9deae30af7323ca69c68d028217133f53e597bf383191aee83fab29203d233b3cd1e75e4cf08d9e17308dc25e4
 DIST shorewall-docs-html-4.6.5.3.tar.bz2 4177886 SHA256 10cca88239cba2a435975fed0e308f6238d0bde574b08aa88023cf50a4fc4370 SHA512 77c67b05815d590beb2e756984b6df4cebbb5da186cb6a25585080c35c1ceed3714e41eccfb0c0353298b674a86af18989ed5a2cf699de277b4a71ad4e80b9dd WHIRLPOOL 99574e66c4be0e9c51cd1fe036dc2866a3bed95e214a36298db934fe3d67275080d8c18942b47fef436fe249b28982ef95fed2312d412e654bcca1947261796a
+DIST shorewall-docs-html-4.6.6.1.tar.bz2 4179739 SHA256 170467b8b16ed34f5766ee171d4967f9bd7e69988399037dbcdb8ed2067a4608 SHA512 36f5f37aba785a4c1e281224f7befc9ceb8816014d204a98f4eb648d6d8f777f327694d8aa20f08eab0423c553e17b4ca6837c1a94028e3446313dda5caa98f8 WHIRLPOOL c0e3721a0b58425e155e9904d9ce66a87c727ec8c1fbca5ed5d98c9a7de61c0bb1aaae58c6bcd22b40e56e277f28f69bdfd9d5f4b2aa092ac41c0036c393ed64
 DIST shorewall-init-4.6.5.3.tar.bz2 32430 SHA256 d687430a93331605a9ea1b3277dc3ac80f12b298127b6ba130f5ecb0bcbb6fe4 SHA512 8464fc90eba4a9b8d1f617df93785b3f3575edf012d06f4588f81c1c98052add44ff2cd8a3a7d0fcac30c874f578c79d64e2afe67520f998c16e786e8188b47d WHIRLPOOL 8c712c58832642b8079ea1c4e0a00e062720b29771cf4bb786efd80d03f22e96aaba76829222247cda7339076ea457ef95f16aabd2b05779f9c39aba57a38978
+DIST shorewall-init-4.6.6.1.tar.bz2 34261 SHA256 c3e723bacaa9ca35d1c9d0507ab4434275251b6a0f2d99528d62b7972667a0b1 SHA512 6d775bcea8424084ae8975261229b2138a9d68723bb65c64169c5b1ffc34467335e46760e3272f59f2f195559f56c436ad8ddf1643f1b4d03dc3b7b5c94815b4 WHIRLPOOL 2d76346d08b63a29841c57ee2beea565bfdfa717e09b7a08d8abc3ec96d249337a143725b4afc2c3df54dc1532f5b70026b3fb1a924d4c2956a75bf6cb9b2f94
 DIST shorewall-lite-4.6.5.3.tar.bz2 46382 SHA256 88fa715cfca400cde5e54841b216f1b1866aaa8d7dbd5bfba46d2281c246a607 SHA512 934448de93da853a5c59cb62b691cd81937df6c8ac1d0ea002735743cf60bc05312f7bf18e25de2a82604b526d0e588b69172e2c8e7496a9ec2243cc365d0bd0 WHIRLPOOL 3a2a9898296ca5c785f1def48d00e2234d8b54b96e8bbafb890f84c118b45b5de151cb3d97f2c69a3fcca83144424c7706e3f2e6da6a16312cd7faa89904ff1b
+DIST shorewall-lite-4.6.6.1.tar.bz2 48299 SHA256 cbbc588d86c6b5414e04cc41db0ec5c5ecebaedf2c9d085d02d5c36cac830dc7 SHA512 928196edbf59e73ac699233e83fdd1ab8256458e2ba280366760bdca5b5602db4db2ae302700720ec5b28435d0ce22d0bdf8453c362e94a808c44d5a6492ba50 WHIRLPOOL e75574ef493220e3f37176fd9cc475900364b2231cc5836273829271784057a5c48f6daba03b4c04e66424b37efea011226ddad23b4ebd86643b9bd4cfa1e321
 DIST shorewall6-4.6.5.3.tar.bz2 222096 SHA256 273e1748e8ce3ac559d5f73d43f226f19fedf03895cf8f87b03ec63d17b42b6a SHA512 8c1d8b8559693d7cd764a63a1ec52fffa9ae7899bee915b4c25abff0647c2daf6887b0fa88c05291980feaba54e14268346629186e2176cd378b1116e8b7125f WHIRLPOOL d5fc4bcac9525b34a01105649d9c6ace306e621e0222531f457a809ffc896fb9b3988d89aebe2f5c77cbece32de69650f5a5968457db856e67816f988e5fa34c
+DIST shorewall6-4.6.6.1.tar.bz2 225573 SHA256 4313a1f33ea63d8c60c3707a75ea7b569338546699f8abcf8115922b86f47a02 SHA512 78d8b65763f2975cca9c6818bc2403334d7f744e5d7f28366183ea29047db12f343e5f33af80ef8f341c827438b46ef25720801a8c52a4a70cc304752c9fcb8e WHIRLPOOL 440f8ffdf93b8b3fb19b1645c963a50432b9b2bd83b767c36d5a182471f5855a582caea64f5b058b436d4cecdf321d604999b1549f8f8d900135139d1dd37f65
 DIST shorewall6-lite-4.6.5.3.tar.bz2 45799 SHA256 ef459aa87a8a844cb971dc947235cda84bda238dc8744de7429862991d9fcaaa SHA512 3d535546586234be2ed717eb936dbc86247705e342181820a14a4b8458e05c19972e07a1185a00bb1c5025ed36f77f64c6a31f83d88a7b6e2b6b847752501225 WHIRLPOOL be8432303d888f369b86efec41dc0891768acde7f3a2c919e19e4515cbcdfc82ffb7908d30a6c65956bcd29f8f6123439a8ac9b49c9d8027790ddeadb8195760
+DIST shorewall6-lite-4.6.6.1.tar.bz2 47753 SHA256 3fee19fe538c8d0bb631f9336d917d61bbccdd9399d4f0ebdab8c381e5e091db SHA512 14bf67a844cece87d73f4b0c6793f3d0c85aa6681443a7ef8779afa38f8b00e1bc6009378af13f9f5369a0e82377457149c529743c64b763b014f805951a5d04 WHIRLPOOL 93596a43aa7e97fd27fda503cb39fa5aa249b33fae297b5ab3068b9be433737e8d8f3418f244c4d89d1dd69dead1bf5e9b5a1fbdee95c45dffc7bcbfe49f75c9
 EBUILD shorewall-4.5.21.10-r1.ebuild 3372 SHA256 de0ffb2098c9fe21a7a37ed6f0653062518c86c9b7d6f9b01516d8eddfe6c451 SHA512 2405be21c36f0f55d446933e3b0d8aaceffafbaab36c7bb6f45020454032c00081b1ddd523880f9c1b501fd9577e5de2c8a1b9a7adb0b9bdc769513a7755ae6d WHIRLPOOL d13644db7f315b958271dc7f443377a5fbb7a56e0feae1bde98db670931c7fe9aa150d6e14c0b6c9136246febfd24e616864bd80470c46ab915c4a1ebc3540d5
 EBUILD shorewall-4.5.21.9.ebuild 3285 SHA256 9d6e1cc9a7a22de912d5c9146d3fc119c8978c04036a1e98cbbde31fd5f78b45 SHA512 df887615e704c0c181fa2bc10f01e07d9a3f12b68193643c0cb9facd6a8df73b3801e1db3cc9ad561a4e769b5f9656e7ac908f87c5ac4e0a00471b6048518abe WHIRLPOOL 2e100845a3a83d0476f381cba4173e7fbc5e771eb6c5c1d21a3357c4ca0d41ef980cba77cda0b5b5daf903a75679ee560e709aee776127262f7d22dcb5827d3d
 EBUILD shorewall-4.6.5.3.ebuild 16080 SHA256 66566cbdbb3baf3e4a0d927d487b5e5030068bfd8c06a41db02736bba702b306 SHA512 86a11bc51299e4deb65e1ff764e50df75bd98243481af38fea5ade66d1bfb7220a12a45fe8bf01a0635474057014c06b581a219413d7b27424ce642fb3a235b5 WHIRLPOOL 274b506aee970c43bdf3f4de257651e3416b5c48bb48ee8a38e597845bb7dd41fd6eed3ba2afc34e408fb714353dd0cc8469a71329a1c13990eb3a9aa41da1fc
-MISC ChangeLog 41589 SHA256 28f10e83534c4e09c1f5a4d70624f1d7dcf1e88b91b66b06b11248bc9dab6851 SHA512 d996337edfe208fb51d7ee1f338a96bbfb7a97d23e76cfe1279479aa5214a4ac6d17fc88b6ecb7f8c2370caf10bd1079ec0556518815dfb81fbbb1de0418104c WHIRLPOOL 2710317bd2bbc9d881f855ff447a40ae768ecfefeba73512f25039ecc944bc910b00456afc270eec23112c932a6a45b25864f43ab9756e9eeb5e9924fd2f460f
+EBUILD shorewall-4.6.6.1.ebuild 16264 SHA256 39d0492467d21e9708b7f6d17d4d9bc25805c5a453e64ac368342c263f3d2a31 SHA512 cfd07d73f21492e3f551f8f09e3c9ae6157cc07b1f5d939d2986862230a1381a4ceda62d705db7e9d2cf5e73a45ed41414b72741115d3ebdc2ded07e33a38741 WHIRLPOOL 5137ead453c7a0a45bcdba4d7de9b9f6d3cf65db5c0218c0221d329adfdce59de7eee3119efaedce2f3dc9717987e9cc7dff50d4e8db870fb9ccbf2d764ac257
+MISC ChangeLog 41743 SHA256 bad6c7bef3372bcea5fa836558ca5a74ecd6dd12daa559f49d67190862ca07c5 SHA512 12eb93a8bb5fcdde754a497993834950395707e825bd85e06e0f47c459d060f4f7f2acde8f5cbaad2a5103bf883f3de85e8f12f0065abc22a0326039c44c570b WHIRLPOOL b2a937d8a82fadb8a8c354d73194b8b7f54abe57ab8f1f8882a34cbb2a90986d8b1cd516d85cb02057354a0b1979eea358b5e5b220586b6bf97122877aa5f1e3
 MISC metadata.xml 977 SHA256 9d7f6c5409d58e7e897f591a207ae66d26ad601176aad0708a1a21b268e8946f SHA512 4d6cb7e6aa1c1f0b372dbe2eceff76eb44e8d702b780484d41e712c4a34d3cf88d40ddb0868faeb7c26be2ae3f14db7303b18a5a9882fb2254a2f79ba332c979 WHIRLPOOL ec45a44bf7b1f7de9f28bc273e7208ee9125c9d2642a95fc04e83132b097526756435b7d168f847936c1244cc9c246df56d526794d5f2ad1c60534d852ed77d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlS1P3UACgkQVWmRsqeSphO2swCfRBeq4LqpCrP9t1EFDqGvh/UV
-umwAnikwRgJO0Q/GBKo0b89HH3UWTPGM
-=Qasf
+iQJ8BAEBCABmBQJUw++mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcjD8P/0UP+gBdhgbKaUIrs5azemCx
+LQNYcsvzs7Frd38BH7uWUK3eqLp612us5DRhFajKLgLayVGjzqOeGDaxrbcPRYbV
+xDS51er52+5nfCGtb9qfYoe/4qsPxFuXNUVb+q0aeaJOGngTrNIX78fYXl0t93tX
+kiSQyip198hi4aaXfq0RRRdhdVlvxUgB3+mq5RiFaaWF00OzGctN9jAdb4SPb1w0
+V0KF9EhIucC8hbzz+04Dq1IpLlGEXoC/qNiUq64F3MnTdy7TMFGguWbvBMatL2v+
+qNJGsfpSgPkh/4SpT/VxE0AGpBJ7norwVKG1gY4OEGJa6E71yqWNhKLtpuMtIpq0
+H8fV1Ip9vFCXpU57QXavcY2k0Hu4Ehso89kaI0k/pq0rxs/mi+eYfUmgNsz54Ng1
+N5C9dXbcZwl2TjRYjIe7KNmFBwo3LvQ5NX57iuYJbtAEMupbOzau7GQpjZ2NBT8q
+JBREL2YlkuDJiyOPVtHZk4m5GVWuCCAZQfJ9Ond43uaaeo0QmrrLrjoUBVs71A1G
+gf2tuRYiMIrKP/EVNURGLTXJNYlvR4chnVbAaF6hXZPJ/wah7Iw805gKgsG3giAC
+cnLC9FP8C0rjFV3ZxMTftcmJMVh7N5ctXyj12PsPXEIXpOEhFvR3WrG8odkmEHXq
+51wqLtx7C3KdZufKYuR6
+=3ZkR
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/shorewall-4.6.6.1.ebuild b/net-firewall/shorewall/shorewall-4.6.6.1.ebuild
new file mode 100644
index 000000000000..f4d73fdda3da
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.6.6.1.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.6.1.ebuild,v 1.1 2015/01/24 19:16:48 dilfridge Exp $
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	KEYWORDS=""
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [ -n "${DIGEST}" ]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT}
+		epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality.patch
+		cd "${S}"
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [ -f "${D}etc/logrotate.d/shorewall-init" ]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [ -d "${D}etc/NetworkManager" ]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		dohtml -r "${S}"/${MY_PN_DOCS}
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then
+		# This is an upgrade
+
+		elog "You are upgrading from a previous major version. It is highly recommended that you read"
+		elog ""
+		elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+		elog "  - http://shorewall.net/upgrade_issues.htm#idp8704902640"
+
+		if use ipv4; then
+			elog ""
+			elog "You can auto-migrate your configuration using"
+			elog ""
+			elog "  # shorewall update -A"
+
+			if use ipv6; then
+				elog "  # shorewall6 update -A"
+			fi
+
+			elog ""
+			elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+			elog "please read the shorewall[6] man page first."
+		fi
+	fi
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+}