gentoo resync : 08.08.2018

6 files changed, 473 insertions, 98 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index dda68c7cc117..166451a7cb27 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 5120baed6020..8b89d1e0eb71 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,10 +1,8 @@
 AUX psad-2.2.4-var-run.patch 589 BLAKE2B 11c7095cc2eac066c44ae03d59787c92a7db095167f1e1b30c4e5f4931cdafbab6ddf092025e6cf885ce85d11763a429d02517ef8494eb9c9231c83d261aa687 SHA512 dfd46dc06ef1f5bacb1424dc3ef9df23c5dc28abe6c6b1ffcbf7720e1d134e983e581831e7ed04074592bd1865f3628c753b313b7df1f7fdf84d438e82c25464
 DIST psad-2.2.5.tar.bz2 1243987 BLAKE2B f6b3a86a841b2685a21c4f46cab8cbb720a7955644f28cd0931f0a620aed4a743213a9f276a98b637cd5b13f93565dee22876042e43a0233cb989021fff9b813 SHA512 195a06420cf821d182a5422705ba2d407fd35f23887430e61925cad0eada7d20e2416eaf6317857a5aec2f1264a280a7e0128cc301f17dcf20cf833a9f0efb6e
-DIST psad-2.4.3.tar.bz2 1395260 BLAKE2B ec48705c90fb9acf7f6f534c103ce83fb39933f6431539be50873b26dd51bf49eee709261c0c036136bf08c6820e7344315b6162664e54b455d380b1987efebf SHA512 8a25ef377e3f4f406c2179a42217110a670f1c0eb8e7991e32a99fd695ca1866218274e9aaeb48552e1bd9bd91b5fbf34b226d767c28f1db27f15b08fba2b0e8
-DIST psad-2.4.4.tar.bz2 1429113 BLAKE2B 3eed68eb1752051f4cab8320c168b9a66e3aebdbcef41a78990202e05ff4a317714f345baf3c5998975b6c8db2ca95d2b354ce4ebaea50feb9749701ae6af046 SHA512 0437a489fcb54458dbb33e0139385e577a89db0c07bd872e4e56780feb8033080d59c99aeff419f3c94b22be8fb41995674749123d15f7d578cc8b0a77d7783f
 DIST psad-2.4.5.tar.bz2 1631602 BLAKE2B 83d5a6811743e56e86984e79f0176db7982243cefcbdef7bdc30300de6a3e2c1d5033e75ec5b7e68e89784b04c98a0ed6b9475a93f4e633ad96380facaf08c21 SHA512 6466cf3191092672557fb6c044c6126290f1d89aea37a20aad1b3eb148b5b8be5bc2cf3700938b91263d7403f776613f304bd491c24a7e16b0975b81f24481a0
+DIST psad-2.4.6.tar.bz2 2548405 BLAKE2B 7479ce4496343ca988da4dbe82190053385f1a8fa2e190002545c63f2e36283bc84293d932ebe147c9078923fa9e0527b4265fffdb8e1fd99bfc5d9955f9f3cd SHA512 a5de29b9ca0108aa8c6a325b725145f408dc517aeee4654596c7a037762f495a78827c64fc2e9c4284bc8db65caf0321982ecaf02de6d73784c2038e1078f42d
 EBUILD psad-2.2.5.ebuild 1870 BLAKE2B cd57e4844e7cdd92b25d06a2778fc8a7c6ab717657c5552df532d363d1f259e6b2a25016542e522d57ba5dd22ffaa24da234737b40a9e72726212e55e6673d6e SHA512 c613774660bf0c54a3fd696b12b8df3230c6d3631ce257e165ad573142d447ce674e47c917eb250860ed88e53fae9398749cfcc3be5b599cc81bf4fcbee2b9b7
-EBUILD psad-2.4.3.ebuild 1900 BLAKE2B 1ec3f36278d3b2469cf97841381b410ec27cae3032b1fdc34c10c10019a4cbdd07053be05c3df3a4c965626ee45ac9a62b09fe6a25a09fc3bc8e990483bef474 SHA512 7635b9a1b51c1a396deecde8793e67147652a07a71325623b18e314c27bc771e9b30965884a1cc6e1609ba2065e3eaedd702fccd02435b0d54703479bdf642f4
-EBUILD psad-2.4.4.ebuild 1907 BLAKE2B 79975e662ee59236ae3de0c2cb42aa983d15b4723b716352ee1be399c31236f7d63be8d7cd18733842ad1e8ee84c80016a8dc0dae6858bc39c2c0c6722441480 SHA512 7767cd12142192ddc5549ffc8b7785699b47eba352096d4f548d1a1cef9cefd6bff846c49f2bf6117602b735293d79b944efa435cca88a32fcf0e51d0176ddbd
 EBUILD psad-2.4.5.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
+EBUILD psad-2.4.6.ebuild 1924 BLAKE2B 95af89c036864eb14580e0bd78767df519bc077817f231894625921bf69ae52cbca2d509f454b0714f2d10731fae1c45b8cb9e8ab50588a178cc96ac583497b2 SHA512 d8b0f17e7ad6d570e8a3aa54d10ae0d921eb324cc1168814c61d8c23b23c5924ae86183c0194914024b21b1db0dc34c0babf7a5ce333959422f99f59ee1c9df4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-firewall/psad/psad-2.4.3.ebuild b/net-firewall/psad/psad-2.4.3.ebuild
deleted file mode 100644
index 545abd2d37de..000000000000
--- a/net-firewall/psad/psad-2.4.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-#PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils perl-module toolchain-funcs
-
-DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="https://www.cipherdyne.org/psad/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="
-	dev-perl/Bit-Vector
-	dev-perl/Date-Calc
-	dev-perl/NetAddr-IP
-	dev-perl/Unix-Syslog
-	net-firewall/iptables
-	net-misc/whois
-	virtual/logger
-	virtual/mailx
-	virtual/perl-Storable
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.4-var-run.patch
-
-	sed -i \
-		-e 's|/usr/bin/gcc|$(CC)|g' \
-		-e 's|-O|$(CFLAGS) $(LDFLAGS)|g' \
-		Makefile || die
-	# Fix up default paths
-	sed -i \
-		-e "s:/usr/bin/whois_psad:/usr/bin/whois:g" \
-		psad.conf || die
-}
-
-src_configure() {
-	default
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		SRC_PREP="no" perl-module_src_configure
-	done
-}
-
-src_compile() {
-	tc-export CC
-	default
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		perl-module_src_compile
-	done
-}
-
-src_install() {
-	newbin pscan psad-pscan
-
-	insinto /usr
-	dosbin kmsgsd psad psadwatchd
-	newsbin fwcheck_psad.pl fwcheck_psad
-
-	insinto /etc/psad
-	doins \
-		*.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf \
-		protocols signatures
-
-	newinitd init-scripts/psad-init.gentoo psad
-
-	doman *.8
-
-	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES FW_HELP README \
-		README.SYSLOG SCAN_LOG
-
-	insinto /etc/psad/snort_rules
-	doins deps/snort_rules/*
-
-	local deps_subdir
-	for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
-		cd "${S}"/deps/${deps_subdir} || die
-		perl-module_src_install
-	done
-}
diff --git a/net-firewall/psad/psad-2.4.4.ebuild b/net-firewall/psad/psad-2.4.6.ebuild
index 2d76d8efc463..f4eea7be20fb 100644
--- a/net-firewall/psad/psad-2.4.4.ebuild
+++ b/net-firewall/psad/psad-2.4.6.ebuild
@@ -64,7 +64,7 @@ src_compile() {
 }
 
 src_install() {
-	newbin pscan psad-pscan
+	newbin misc/pscan psad-pscan
 
 	insinto /usr
 	dosbin kmsgsd psad psadwatchd
@@ -77,10 +77,10 @@ src_install() {
 
 	newinitd init-scripts/psad-init.gentoo psad
 
-	doman *.8
+	doman doc/*.8
 
-	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES FW_HELP README \
-		README.SYSLOG SCAN_LOG
+	dodoc doc/BENCHMARK CREDITS Change* doc/FW_EXAMPLE_RULES README \
+		doc/README.SYSLOG doc/SCAN_LOG
 
 	insinto /etc/psad/snort_rules
 	doins deps/snort_rules/*
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e4da1124cbde..5d0fbd49039e 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -13,11 +13,19 @@ AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
 DIST shorewall-5.2.0.4.tar.bz2 538938 BLAKE2B 1df68e166f5f443f120b9f45010da005b3d86a51d09c059d0886a2735c6d27c1568ae0422998f001deb48c512cb9fed23cbad423754682b06e9a4b5176b45cef SHA512 b44622972d4b4ffcde9d7da57d3994279f3962bb2d2e13892d7d77453da502527ab89cb59fb6692341b5d166cb7a3e31909df31dc21c758707eff29f3ab2c9a0
+DIST shorewall-5.2.0.5.tar.bz2 539666 BLAKE2B df4f8680ee29a773f584a1210b40a7047be1a590490a01617b26b71840e488f569ebcf268ba2f6199fb10671925356c4e187a5219ed7784672f6d14b2e90f580 SHA512 8299e0f40ad96c09eceb9460c6088e694e50b7a1b81a16395426466c666eb21dc23236c1ee6cc6047c05ad4a4ba43aac33fc7cb05f5784bf27ac81e5fa4e9059
 DIST shorewall-core-5.2.0.4.tar.bz2 76022 BLAKE2B 58602e01f7a7b6e6853c847fa38bfff2fbeb57ea68ffd124f9e556b0137bef65bfe25c8b7c70f0d6fc7b21dab7e82401985a08f0a1a8c4ca6159cbfd1862712c SHA512 bfd21f249fa3b7a952bf9aeead91eac0f7db6c2f3c386e9d2aca9645916b8a799ce58ac7b6edb93d0b934d224824f9cd94b8db63a0b35a260051209613561bf4
+DIST shorewall-core-5.2.0.5.tar.bz2 76567 BLAKE2B 078520ef3166d689d559f1c08ae417a2bf5c7fdc3618a26f72b244fa14679634752dffaeebafbd84609e33ec7f1856b701abb297077797abcb14d3264a3bfd25 SHA512 640c854a7484e886cd603742d16682456e02c0054c3d6d5f2188bf30e235ac975fc1ce50af500cf4fb99253a1d13c2408cc72aff54f14aa738e1e80b8d07066a
 DIST shorewall-docs-html-5.2.0.4.tar.bz2 4294681 BLAKE2B b6e975ddefae5dc7fd0a9be58c6fd231e828ed8e18e2405202766068b37796c075785c2cc05f25bc9decc50fbdfc01bad8d8f929b90592aa2e8cc040719e3cf1 SHA512 2685161f9d25cf745831f603129c4e9a33a264118698392f589e481a76bcb082dad14c9be6dc57c29441eb9807d842e5f08b3483e1e03099f0059f10ea907d91
+DIST shorewall-docs-html-5.2.0.5.tar.bz2 4295236 BLAKE2B 8cef99b3535551e1d4ecdf0d3d1c2b3434c0b91c793f0857bc3f22f0020d80cd49b038c7c4f5d15fe23af14869f1736a69b01978403fe94bc5dac261bd2f5e4d SHA512 5fa3ab52580e8f090ab0be9b1796bef65a41d1a9dc5c9501e3daeba22bad7b28b5306aba5b383c654eed5f7d727a7744812034eeb1ad051633a80b2892096c24
 DIST shorewall-init-5.2.0.4.tar.bz2 30526 BLAKE2B a8ac5bf7e650a58d87b608321e0ed40d8b73ed675d5b5b64ff5859149f04aca507d7a83ff6ca9c7801c84fb416d22fdc930199731a9134ef529b29cf1ec01a67 SHA512 c4e2bcf5a2f7b8fae30773a930ac7433cc8678f7bb52958ecd92a4ce5f0a78041e45578bd47e01ad72fe9fc1a3cbcda2995bd9379cc90917a31b3f676c12beb6
+DIST shorewall-init-5.2.0.5.tar.bz2 30881 BLAKE2B 92617f17553b6df514cbfc72e86597e9859baa641782848763923ff4c650915cd7fb97f0c71b41d525d6a9d5ebbf10e9918d6a8d682c9c4654de3ba40b54c0ce SHA512 0367ad7468d5a9c0c70d31fdd66c05e54cf747dd45dc1bf2e128935c65af8c2508f033ed2945185059214dd81f5a8fb3f122323fd2bb79d2d642997741167371
 DIST shorewall-lite-5.2.0.4.tar.bz2 36307 BLAKE2B ad95e4f640ae1f05936dd5dbc87e4acaf6dd576bd6704f650c8bfdc437284f0c121563427f89dbe5de4e19f543f3e182ff0d5a333da8c8416aae24994ac52ed0 SHA512 55bb514d9446c953de0453b8016105ed2471420d2ca6346cbd986f03cec5e713a1d27d5e08ddc6cf54cd6e5f936cf9a826eac622596480374929f41c062e8803
+DIST shorewall-lite-5.2.0.5.tar.bz2 36651 BLAKE2B 192ecda8b04d0330f0a7bced6136f2723d201cd7c30af80b59bfa81f49614d10c900cf5856296ad854287f3c925e5f78f144698674ec7b8d91065072db4ca53e SHA512 b95154f7614eeedde1fc087750372cadd0c0a9618986741e035a9d83c06d2534feb78edaf6a97e2a45788015e6706f8dac3714ca3b22bd068e792458a3f5af40
 DIST shorewall6-5.2.0.4.tar.bz2 186267 BLAKE2B 4076c94596e462d4f150d734700d400db90ca1d0bd788152e5421d581890cf28d7e6546d2ac0c604625cdf25771415229b2a3324153ec5439cddfcab73464ae5 SHA512 e8989b5c6fcc1162f42e884cdb0fff47baed61b69c39b8bbdaf78b246f95ee0bf6690fce3a6ae14eff2bf48d64b762b170d67462dc685f594dfd70a2e3720a01
+DIST shorewall6-5.2.0.5.tar.bz2 185740 BLAKE2B 846a3fc44a9c0a838cf75671ca34e78dd9758eeee0690d994a34615467b241f0c854e3bb9b818bcfd5e96664ab03e14a7c69affc946dffd1357ad744da41f8d5 SHA512 6875074ed8ee5bce40253a6e2633c422d7c2c1bf860a072236d6197cfe949e455b511a1792d822a8f2351254e99880236267ce70fc1150ca68e87f962b6cc265
 DIST shorewall6-lite-5.2.0.4.tar.bz2 36035 BLAKE2B edbdee2b979c0d2144e358b6e8b52808578923498c0da4f906ed6aa8460153879dd5f8b4cf98da4bcecc90a6a776d39ef17492881c093a018ccdc5b86e0c0bab SHA512 c212ba3f6bacab1b26bbc5c13a2bac2f1f796c7fa3d442f398c91ff367f242a9562ff2191b9b678e82d07a96c2dc39a0109d30417154e6cfd4f2c4c6e31b616f
+DIST shorewall6-lite-5.2.0.5.tar.bz2 36370 BLAKE2B 212cee0313c3bbf08c8d22893c5b62125d0362eb66218dc954bc05d0e082fdb4dab209a05948300394943dcd97f698c1e02310ec54cc88fb72bd24d4383776f7 SHA512 18bcbaf3bd56aaadb8d42610d4868278f42299e5a022ac5732f730b34ed7d97f7cd013f1c9374f0a6afc809250288490d94d2b4e02e4bf5edf2542bff99150e4
 EBUILD shorewall-5.2.0.4.ebuild 16269 BLAKE2B adc880388fa1d11dd869b31a7299f81081da532c610d5444f57c08446d49aa5b9381a3c623553c0a064db4885c1cdd8a816d69522bbfb1c4ebcc5582de4a35af SHA512 6c3d7998ea7f549847e52e7745355f53ed9590157fd49f1e454452215f3d0e108cd68a3980fff3aca5531ebf2e16696f50a73a26f395d4506136528e1916de66
+EBUILD shorewall-5.2.0.5.ebuild 16276 BLAKE2B 6b78da523533371e05294702605bc2cfeaaccb9b4ded2a88d4188585bc25894c55865e756108b9640f517aa69835fae55157a766ad05ab6401c4531a4f185807 SHA512 b4bf98d37de2983523d4b78a1b3de6297d38f696fb0d3125d121d8fc0fa56b53d954a4ea387ba44d96e1f7ebd432aefddbd50fb17e45c74467caa17cb9c153a4
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.0.5.ebuild b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
new file mode 100644
index 000000000000..a7f7766988aa
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.5.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+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
+	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
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!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}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+	sed -i \
+		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
+		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
+
+	# 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}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/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}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/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}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/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}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/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}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/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} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || die
+	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
+
+	eapply_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} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+		keepdir /var/lib/shorewall
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+		keepdir /var/lib/shorewall6
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+		keepdir /var/lib/shorewall-lite
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+		keepdir /var/lib/shorewall6-lite
+	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} ..."
+		docinto html && dodoc -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
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; 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/Shorewall-5.html#idm214"
+
+			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 "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	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
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}