From 4645b6f17f0da81e9fe84081fb126a37102ba153 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 8 May 2018 14:01:34 +0100
Subject: gentoo resync : 08.05.2018

---
 net-firewall/Manifest.gz                           | Bin 5558 -> 5559 bytes
 net-firewall/conntrack-tools/Manifest              |   7 +-
 .../conntrack-tools/conntrack-tools-1.4.5.ebuild   | 101 +++++
 .../files/conntrack-tools-1.4.4-rpc.patch          |  10 +-
 .../files/conntrack-tools-1.4.5-rpc.patch          |  41 ++
 net-firewall/conntrack-tools/metadata.xml          |  28 +-
 net-firewall/nfacct/Manifest                       |   4 +-
 net-firewall/nfacct/nfacct-1.0.1.ebuild            |   6 +-
 net-firewall/nfacct/nfacct-1.0.2.ebuild            |   6 +-
 net-firewall/psad/Manifest                         |   8 +-
 net-firewall/psad/psad-2.2.5.ebuild                |   6 +-
 net-firewall/psad/psad-2.4.3.ebuild                |   6 +-
 net-firewall/psad/psad-2.4.4.ebuild                |   6 +-
 net-firewall/psad/psad-2.4.5.ebuild                |   6 +-
 net-firewall/shorewall/Manifest                    |  18 +-
 .../files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch    |  47 ---
 .../shorewall/files/shorewall-5.2.0.1-YESNO.patch  |  46 --
 net-firewall/shorewall/shorewall-5.2.0.1.ebuild    | 462 ---------------------
 net-firewall/shorewall/shorewall-5.2.0.2.ebuild    | 459 ++++++++++++++++++++
 19 files changed, 658 insertions(+), 609 deletions(-)
 create mode 100644 net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
 create mode 100644 net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch
 delete mode 100644 net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
 delete mode 100644 net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch
 delete mode 100644 net-firewall/shorewall/shorewall-5.2.0.1.ebuild
 create mode 100644 net-firewall/shorewall/shorewall-5.2.0.2.ebuild

(limited to 'net-firewall')

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 7534020e9089..23c01eacc499 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 3cb87adaacb5..a03d2e5504b6 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,11 +1,14 @@
-AUX conntrack-tools-1.4.4-rpc.patch 2175 BLAKE2B 709569268911aa4cea3ae391a7c6d94e573fc6c9c2435f7342677e243e03f2537c5827d9bdc9e17ddb85200d46da50460a74f1fd435da8a3bd2f6b63800b1215 SHA512 ab7708533cc889d5bf5d360a9ff4b6aef668196d9b6b123a2898cf86b61eb41c69a0610cf27d00b625946695c8de2857b61e568b7b923cd917ba8b2d8ff05416
+AUX conntrack-tools-1.4.4-rpc.patch 1749 BLAKE2B 25b23da8f1aa491de037621977ca40e118307bc3593e21b9047632d050ed97ea57b0e63452092f5565138a2c5ff1d2fec5075e40568573f71ea8f0692f6cde65 SHA512 a31e0e7d756055689cf009a9f7efaf6d50131b7d02780632dbce1e3e7b5c854ea2f00d1f2744a8905a6e1001e7f157b90a482ad49f1cfaa5220a1c9f228904d7
+AUX conntrack-tools-1.4.5-rpc.patch 1555 BLAKE2B d92009c2bc4de820956ad2d7459a19cde970356aff4e960e3c17808a28a76483a104df7beaf437dfa30b124d5a2b90bd41db27b4b3b76ab57c3dd2e8bf6bad5f SHA512 55cf7451c3e36e414c8bdc43c46b235259f259b0f7c0b5a11d6543438308ed74621b363ae157160634d00bf45d6115e06badc06848951157facec6b8d496026c
 AUX conntrackd.confd-r2 441 BLAKE2B 5898c470f1d99beb47d01c9215c8e3da2e624455f65c3c41e77dbf26db3ebfa4624ac6556098f303c4f4588e093b7f94ae29921b1a6cdc4a881060eaf0dc425c SHA512 3d72d56d44094593f6ff1eac421fe6a4f0d20450ce698c175adf1b18a859b1a24c7120fa60431b2a00da62ae3749c4619106c8e93fb8fc763ceefc26a82d2ed2
 AUX conntrackd.initd-r3 2238 BLAKE2B 711bf4ab403f61d5d528e0dc504d272a7e410be70c529d8f7a624f742ca66f4692b683f3283b79f000589bdab7f83598130e4ca1a0ae2bed9afce80ec78d00c8 SHA512 445c19ad42e92136e9dfd6b7885334075e72971b73ff7178c6bf16a31e0c037f17d9d039394fa8002f0ad5182a353f7c803d3f900e8873b671eecca94ced78fe
 DIST conntrack-tools-1.4.2.tar.bz2 472074 BLAKE2B 9e3a90b80ea5d47737d5d5bbecd922110f2abc50e922fa2236a61f02e72c8cd4626d51fa31801f6f8b1be26b4ff71f216bd89d3599eebfc12b0f7a69bff3ec4e SHA512 1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56
 DIST conntrack-tools-1.4.3.tar.bz2 487111 BLAKE2B 9b8f43129898bdc0c2475a4081333864fb4145a89ced96f7c88d8c8b52bbc9ceb55254b7f9c9776cccc3b89ba6b2aacfb91790ca052defe1a0290a10e85bbb3a SHA512 be76a0ddb7470249c58ceab72cb94ffc05f5cc6d740a0755c9c782e948b4234eb1da4f7c7df1f14e4125cca9f12f3b4d2dcd444fe011941952aa3eeb13cb72c3
 DIST conntrack-tools-1.4.4.tar.bz2 1010504 BLAKE2B 4190672f017f434b6b4a1841022d64256eac1953c6f62aecb087e2ef0f5c83ad57809c9170de816eb7e0f934c41de0a541328bab7e064243e48e9f18ade3f5fb SHA512 f53bd620bfd4e854e792416527a3090d883c5f00d1d8365e52ce3ba204218dc431490703985d3fdae44decbcddb24ed610bf81a6a99bd7ea01482f95f71df0f5
+DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 EBUILD conntrack-tools-1.4.2.ebuild 1938 BLAKE2B 8d5f16ddce1d4e49e61f0715d0948869878b424838fb6039cd37729d9cf51cbec51ee743a3d81fa71c4711234a563b83f46a3bae83f87cece59033c0cbee8a3f SHA512 b7bc4438561d199cba668ebc1ef691ea0a7d737cee8beeeed1c703d479d9161da68f6b2125b9555decda6dd9271955f4c146ff002a3c53a5263db9f7a5a95695
 EBUILD conntrack-tools-1.4.3.ebuild 1935 BLAKE2B fa4fd76d7c3ba12748c215971c146c36eaae42e564f2185b99f67181f9cef7da3f5c604a694105987c7ff6e613dced5c26a185c41855e378e93dc670077301f5 SHA512 80fa97972a0dce17a5c08bae77123ac0931115cc3d36414c3cb959fbe9edba6ee33a659fdf5c83a6f4c8dfeef94584059adce56955040c56ae958c00a31ef448
 EBUILD conntrack-tools-1.4.4-r1.ebuild 2084 BLAKE2B 9088f44f74059394e8358e01f2551437317a8b5b22d859bd373cebb3d125d6c0ae724c3dd320779409cca3c5b3fa24313ecfba534e527afcb7cdce424d1db533 SHA512 e08319a89e625b04872d32144db7d6ad4c157200df5b905d7d9cc8b193688b044d3cd968c24b58d06a4a5aaf4061d063289a3fddfda869b64b514f64b7bacf78
 EBUILD conntrack-tools-1.4.4.ebuild 1900 BLAKE2B dac0ee63aa964380b8c7866509a8f456abf92593ebe8742fb449199f91a1c02a927a3b027604a7bc1d0ab2977556d57f7184337ad444c451159cb102f7a2751b SHA512 1b009478cd4a93a1aedaab452c947c6c76e0d18cbdbdccef72e995bc7217066883c98c7232fe76a9946b87f8dbb595eef33aba5e21230d22a1c9268171896d83
-MISC metadata.xml 586 BLAKE2B 54e1d86e3131b5ef717f16cf8532a17821f9255d8b081f1a79ad3357ad13c792ff422461cb9c6cb55c0049ac9f139925954c71798555574bf861eaea97a07315 SHA512 84bb40112cdc8fac909d4315bd5ef80f365f30919edb394524123272ad3c3cbf74da6a5957a7c06d42c2c802f9fe1af2d4d791bcb36258336b86b91abea92af9
+EBUILD conntrack-tools-1.4.5.ebuild 2188 BLAKE2B dc49b0649746dc99e4228031e520335d59bea7bbe0c7a54514f52dec53d701f8cbb517afa50a92329a2d916d82cc91feded82a1757dc9718c943f29a93c02b0e SHA512 026fa39a1dce19b428ed7cac3a15a0a56e01828c288a03291a882e2e2f640ec22abdb91463704c226e37dc42a9f8bdc83a56b2001e1a065d98506c11baf6678e
+MISC metadata.xml 958 BLAKE2B 61cf89e7c192b663fd573ba7be767cd359786ba0fff20e72212fbc24e07c0c69e3bc2ee2226d39ac1744620cb1f5c63a480fc073860af665064853f5b780332d SHA512 19c68ca3bc373de0b9d533c7a36cdbe1da52871fb985641fa725c6208ffc09536696b02cce37e836300a2809bab117be2f0046ef329d2a739de5827cf0ee189a
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
new file mode 100644
index 000000000000..2ba9b596f3b5
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info
+
+DESCRIPTION="Connection tracking userspace tools"
+HOMEPAGE="http://conntrack-tools.netfilter.org"
+SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc +cthelper +cttimeout +libtirpc"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.3
+	>=net-libs/libnetfilter_conntrack-1.0.7
+	cthelper? (
+		>=net-libs/libnetfilter_cthelper-1.0.0
+	)
+	cttimeout? (
+		>=net-libs/libnetfilter_cttimeout-1.0.0
+	)
+	>=net-libs/libnetfilter_queue-1.0.2
+	>=net-libs/libnfnetlink-1.0.1
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.5-rpc.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 18 ; then
+		die "${PN} requires at least 2.6.18 kernel version"
+	fi
+
+	#netfilter core team has changed some option names with kernel 2.6.20
+	if kernel_is lt 2 6 20 ; then
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+	else
+		CONFIG_CHECK="~NF_CT_NETLINK"
+	fi
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
+
+	check_extra_config
+
+	linux_config_exists || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
+		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
+			"are not set when one at least should be."
+}
+
+src_prepare() {
+	default
+
+	# bug #474858
+	sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cthelper) \
+		$(use_enable cttimeout) \
+		$(use_with libtirpc)
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc/manual
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd
+	newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd
+
+	insinto /etc/conntrackd
+	doins doc/stats/conntrackd.conf
+
+	dodoc -r doc/sync doc/stats AUTHORS TODO
+	use doc && dodoc doc/manual/${PN}.html
+}
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
index 739857790c3d..01ef537a7352 100644
--- a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
@@ -1,6 +1,5 @@
-diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configure.ac
---- conntrack-tools-1.4.4.orig/configure.ac	2016-08-22 10:43:02.954671362 -0000
-+++ conntrack-tools-1.4.4/configure.ac	2017-09-24 19:50:37.225517482 -0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -50,6 +50,25 @@
          AS_HELP_STRING([--enable-systemd], [Build systemd support]),
          [enable_systemd="$enableval"], [enable_systemd="no"])
@@ -27,9 +26,8 @@ diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configur
  PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
  PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
  PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.6])
-diff -ruN conntrack-tools-1.4.4.orig/src/helpers/Makefile.am conntrack-tools-1.4.4/src/helpers/Makefile.am
---- conntrack-tools-1.4.4.orig/src/helpers/Makefile.am	2015-02-11 15:36:00.650610125 -0000
-+++ conntrack-tools-1.4.4/src/helpers/Makefile.am	2017-09-24 19:52:11.644990587 -0000
+--- a/src/helpers/Makefile.am
++++ b/src/helpers/Makefile.am
 @@ -22,8 +22,8 @@
  ct_helper_ftp_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
  
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch
new file mode 100644
index 000000000000..1f7fc44f44ad
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch
@@ -0,0 +1,41 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,6 +50,25 @@
+         AS_HELP_STRING([--enable-systemd], [Build systemd support]),
+         [enable_systemd="$enableval"], [enable_systemd="no"])
+ 
++AC_ARG_WITH([libtirpc],
++           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++           [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno],
++      [PKG_CHECK_MODULES([TIRPC],
++                         [libtirpc],
++                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++                       )],
++      [AC_CHECK_HEADER(rpc/rpc.h,
++                      [RPC_CFLAGS=""; RPC_LIBS="";],
++                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++                     )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
+ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
+ PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.7])
+--- a/src/helpers/Makefile.am
++++ b/src/helpers/Makefile.am
+@@ -30,8 +30,8 @@
+ ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
+ 
+ ct_helper_rpc_la_SOURCES = rpc.c
+-ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
+-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS)
++ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) $(RPC_LIBS)
++ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(RPC_CFLAGS)
+ 
+ ct_helper_tftp_la_SOURCES = tftp.c
+ ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index cd2eeff6fa91..b30175c95056 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<longdescription lang="en">
-		A set of tools targeted at system administrators. They are conntrack,
-		the userspace command line interface, and conntrackd, the userspace
-		daemon.
-	</longdescription>
-	<use>
-		<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
-	</use>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription lang="en">
+The conntrack-tools are a set of free software userspace tools for Linux that
+allow system administrators interact with the Connection Tracking System, which
+is the module that provides stateful packet inspection for iptables. The
+conntrack-tools are the userspace daemon conntrackd and the command line
+interface conntrack.
+</longdescription>
+<use>
+<flag name="libtirpc">Use <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
+<flag name="cthelper">Use <pkg>net-libs/libnetfilter_cthelper</pkg> for userspace conntrack helper support</flag>
+<flag name="cttimeout">Use <pkg>net-libs/libnetfilter_cttimeout</pkg> for conntrack timeout support</flag>
+</use>
 </pkgmetadata>
diff --git a/net-firewall/nfacct/Manifest b/net-firewall/nfacct/Manifest
index ec4593b1d0f0..32d53eb90229 100644
--- a/net-firewall/nfacct/Manifest
+++ b/net-firewall/nfacct/Manifest
@@ -1,5 +1,5 @@
 DIST nfacct-1.0.1.tar.bz2 257013 BLAKE2B 06f1cada4b7491770f8671604cbb72599d31149e488bf6847117e58e207c3ce1e31dd06dcbea971aed4959f679c610572037fe441ad83702d797713f00a8ef26 SHA512 4d428f51ce3b12382974de3cb7d502f6a18d9c0fd4446071fc2b5e932c44e4b33072202f8b9bd4bdf892a08a64533776bb8e9a0a7c4acc876cfec154f76227a1
 DIST nfacct-1.0.2.tar.bz2 265449 BLAKE2B 08da45f90a2982746633001265c93ff6d055bc0ec9bcfb731b60e3666a2ee2520ed499ea57815e524b6c49369415aa4215d0c8e6ea02c1ce76dbc22de2fc79ea SHA512 2d7a76a51ffb10601e67ceda2ce055e63a8da802a682aab3c96cfa38e1d9d0d7ae7fa204d17d555303216e2ceeb0965d6b25387634725cf35e0a7109d84b47b3
-EBUILD nfacct-1.0.1.ebuild 537 BLAKE2B 6e3bd300655f462edd5e56b9a6079cfbaf53b1d22f1909b4f26b3c018156597b0e124fd250127e7d606782d7f8d7215e3b8aa9f0d8ea8433c693a1eec56b23f9 SHA512 0cf95c17506d5d8362ea879cf668773a93f48486fc72fdd02fe805b1b51449ebf24fc51b1226cadaef97723ba982f64d9a39554f96ceb665068ac1861b75bd8d
-EBUILD nfacct-1.0.2.ebuild 520 BLAKE2B 85265c4e8ca2ff6ade134f54b6e62a6335c0033a0f73c58727b69fece820449a0ed424bccde415953e914ecd67cb3ed2748e5186b77e759801524b6b20b6aa95 SHA512 dc77221c25764c913908b3b7693d1b74a075627c2c43ddbd900198c2db99e0579782534444f86a91709e5b6393d0ab0425373e66ad310fb9177afb7c3ebb3f27
+EBUILD nfacct-1.0.1.ebuild 544 BLAKE2B 6bfab61620aea8034986b00e8a01a3ae256ce388ced2d0e5b86bc03cc3d83998ab161a35253d3374d68bd131f84b5d2a47ef62e0e4599254848af1180263e685 SHA512 5b7a45ce5d2aa148e2188069c5abe267230e73ba40cd05c37751abe41d61c4f05089a17230ed8d17d367659b873fa0382edcb05952ecbd53461bcba0c0a1c84e
+EBUILD nfacct-1.0.2.ebuild 551 BLAKE2B ff6558b4452275e08820dfd8ab007212da0d2163f509afaf14928952680f5506d70872a2c38e9b72a99e151351ba3c953d9f2745abc9a27a9f90376ef301d58b SHA512 0bdf459c61ee748ad161fd46184e3e87851d670b45927c6d7a361f479786cdb23b4230f9d42ba3bf982a1e7f5377f7661672dfc59f69a1791d67ad1d30b1a107
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-firewall/nfacct/nfacct-1.0.1.ebuild b/net-firewall/nfacct/nfacct-1.0.1.ebuild
index 32b690bfce00..6f3bdaaad4a8 100644
--- a/net-firewall/nfacct/nfacct-1.0.1.ebuild
+++ b/net-firewall/nfacct/nfacct-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit linux-info
 
 DESCRIPTION="Command line tool to create/retrieve/delete accounting objects in NetFilter"
-HOMEPAGE="http://netfilter.org/projects/nfacct"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+HOMEPAGE="https://www.netfilter.org/projects/nfacct/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-firewall/nfacct/nfacct-1.0.2.ebuild b/net-firewall/nfacct/nfacct-1.0.2.ebuild
index 3aeca55ee035..2cbf8860d4ea 100644
--- a/net-firewall/nfacct/nfacct-1.0.2.ebuild
+++ b/net-firewall/nfacct/nfacct-1.0.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit linux-info
 
 DESCRIPTION="Command line tool to create/retrieve/delete accounting objects in NetFilter"
-HOMEPAGE="http://www.netfilter.org/projects/nfacct"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+HOMEPAGE="https://www.netfilter.org/projects/nfacct/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 8f994a758044..5120baed6020 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -3,8 +3,8 @@ DIST psad-2.2.5.tar.bz2 1243987 BLAKE2B f6b3a86a841b2685a21c4f46cab8cbb720a79556
 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
-EBUILD psad-2.2.5.ebuild 1867 BLAKE2B 48c56f06e6dc944bbd2c8cfeeb160c60e408fa739469d9039e565583b7bc8fd0b0ab4f055873338864fae30bf4db77bc74c23caa9c8b5c9ae9fe959d62595fc6 SHA512 3eed54b311474cd74352f93e8ca8061f9e5149041251c3e4034c6d81ecf28233f29f2a9597863e4a0eb7bc04b9812d589d3e0f1214241103678116761b2b8ba2
-EBUILD psad-2.4.3.ebuild 1897 BLAKE2B 1d0b45961dec769f45745ec9e449a074be888bf01e69af5a7ec2d485c5e8d82dbdc52df328b3b1b9389dd4d3873ad19762e9862db147518c5169ea5e9cc6fade SHA512 5d12f26624e1315f15656ef70a57588bffd5cd492452008109ccda58aa76fe771ecd3c110e081d66f3cb4c0c700ec64377f765f5c20a35fce13fa3ff82a78077
-EBUILD psad-2.4.4.ebuild 1904 BLAKE2B a1adb1547de834b5a6ec11f272750e575ac0c4bcef97a1b8ad290027c788969fe252e7c58be24f7c7b8fd96ed7997325df0cc4fcb595db62d8109b4d7fd856c4 SHA512 d14a9739f329c2692cde9d26d54d6742b27d4269ac0ce93091d9b96a153afac2ea242ea5297afd86e33ce8d47615d3c462b60c1525b6f1c3c50692ec8a525092
-EBUILD psad-2.4.5.ebuild 1921 BLAKE2B 6018170d98d39514966ccc62052445a6bb4ebd41c5043cdca52c818c5dca39e14a00c6ef48ffe4263108da37f1e765eef862c21a6786a3c50d43522506f716a8 SHA512 bb1cb04edec855a03db0c8f233893378580490c53e4c7527e8b6b7ca2d298100fa2510b2b68ddfdf183cba446cfb4df2a6a1fe31b48cde90d7513de42b3631dc
+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
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-firewall/psad/psad-2.2.5.ebuild b/net-firewall/psad/psad-2.2.5.ebuild
index f45bb3101a38..e032dfdfdeb1 100644
--- a/net-firewall/psad/psad-2.2.5.ebuild
+++ b/net-firewall/psad/psad-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils perl-module toolchain-funcs
 
 DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="http://www.cipherdyne.org/psad"
+SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
+HOMEPAGE="https://www.cipherdyne.org/psad/"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-firewall/psad/psad-2.4.3.ebuild b/net-firewall/psad/psad-2.4.3.ebuild
index 79b1d6323a88..545abd2d37de 100644
--- a/net-firewall/psad/psad-2.4.3.ebuild
+++ b/net-firewall/psad/psad-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils perl-module toolchain-funcs
 
 DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="http://www.cipherdyne.org/psad"
+SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
+HOMEPAGE="https://www.cipherdyne.org/psad/"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-firewall/psad/psad-2.4.4.ebuild b/net-firewall/psad/psad-2.4.4.ebuild
index 7470cc6b3cdc..2d76d8efc463 100644
--- a/net-firewall/psad/psad-2.4.4.ebuild
+++ b/net-firewall/psad/psad-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit perl-module toolchain-funcs
 
 DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="http://www.cipherdyne.org/psad"
+SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
+HOMEPAGE="https://www.cipherdyne.org/psad/"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-firewall/psad/psad-2.4.5.ebuild b/net-firewall/psad/psad-2.4.5.ebuild
index fa26cc018d83..f4eea7be20fb 100644
--- a/net-firewall/psad/psad-2.4.5.ebuild
+++ b/net-firewall/psad/psad-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit perl-module toolchain-funcs
 
 DESCRIPTION="Port Scanning Attack Detection daemon"
-SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
-HOMEPAGE="http://www.cipherdyne.org/psad"
+SRC_URI="https://www.cipherdyne.org/psad/download/${P}.tar.bz2"
+HOMEPAGE="https://www.cipherdyne.org/psad/"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 8746dac0bd3b..11b61b748e0a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,5 +1,3 @@
-AUX shorewall-5.2.0.1-AUTOMAKE-SAVE.patch 1418 BLAKE2B a86b0a81757b0d55f82b62acffdf40888aea4ca4b5e6339f454d8c26170d5e4807dd38a12d63954c387dfc9b24c5255e7ede789484d4289298bd316a3b957452 SHA512 7f3893eb0b797c8253774af6adc5594fd950ea4f04db3f73fc33413dd3e522ff4b31f25c74f0458644cda150569b6b624f6eca04632b4faa04671469ff65782b
-AUX shorewall-5.2.0.1-YESNO.patch 971 BLAKE2B 1428fcafb60e937fba19583c3980be7e37b540d27e1e0101910099366b287161bd644eb09ccb48e6b435090a41a8387a10e0c8d3a3a67d920a9356a8abbe1e05 SHA512 8d9e58a6f10523c51f796c2c5e944ce9e6b0322c4520b52f8e41ae48134a44a17e2b151bd474bd7b17793fd7eed659b0cb533e9bc4e673b4d2a0f432a8ce0c60
 AUX shorewall-init-01_remove-ipset-functionality-r1.patch 799 BLAKE2B 5cbf0835d291464eca10356fcfe1de13bc90cf0e3b9869d0daf8e3ad3864a44939774179047cbf5e192f0e294d8e8765c6d7b60a02178c9c149cbda4d3342b83 SHA512 c8686cb9345abd1036a8fdc6cbdaacc21a69df9dc536393a65675a2ae19c9cfb71d71cc66a9776135ad923414bde783f01dfa69600d1cfaafd618fcea65c8dcf
 AUX shorewall-init.confd 152 BLAKE2B b670db8a1da8e37c9d0f856c27ceb9644ec7baebf82e8d053c02a6f133df15a04087340ac430c8dddc57295332834c3e8e1c6fcb994e96e7224452a5a039d1c4 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b
 AUX shorewall-init.initd 4357 BLAKE2B 192e36a9e488c510783454852e65e2963e400fcabc96a07201c9cc72e09bcb63171cd56665f4cc9e4b4631202f8bed3d618866bccdaf194dee25814241381739 SHA512 5cb410e0fe0391fd467f212b3e1cf3ec4c7fa3289de2341edbf301ce9087e7cba05a36999a8203d7bce28ac35a429c10bc017a96b750aec1bf257987aec23245
@@ -18,19 +16,19 @@ AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b1
 AUX shorewallrc-r2 2035 BLAKE2B e130d1d45427f5d5fba36e75e88ce9cafd3d3a207e63e006ed869c4b9cabc37e0ee1573f89ba8a1c4879a701baccba1a8c6c45c051b4ddd1043a0afac534aa03 SHA512 0a446beabc540bead854c141cc0e19ded5da548f7cbb83f99cbcce58227311579c7f03f3b94f51851ed689b8c904085a2fd32478f18729f34c1aabfc1ea9b577
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
 DIST shorewall-5.1.12.4.tar.bz2 555854 BLAKE2B 697fb7dbe4217b3a8d7230b3d79cec94f33ff69975b9f52477def8424e2ed9c79614e5aff4a40e31c2c0c69bc32f88c40810b7b1e5381037df1cf225b8bf97ec SHA512 25038865df0b3a4d1bcdb14b58108cd0f42e8738c3415ef2ce6fcbf3b15fc651fa90ce6adcfc3c67d6e0dd18709c4862a3ca18f1976e6c96567db6cdae86e000
-DIST shorewall-5.2.0.1.tar.bz2 535180 BLAKE2B 4e7e1d1f43b1bd5a9e683d6ab4e0dde5201dce0616c66c38b518838210bcc69c31a5bb586933ac3d83f8852704166cb7376dd07d8ee4d74e777c483a5178db34 SHA512 9896836e709f728a2320c805cae588dbea37621587bbb0f11937be911c80d0302f63a230642089cdb9839cc55f16b67341392c5d76a71406e0cfadb7b99b4cc5
+DIST shorewall-5.2.0.2.tar.bz2 537374 BLAKE2B 650b3f23307be51b3a4ce75dcdfb3024ab476b5b5a2119b92181a8fc304ea6c4d1bdad342163eff4ea797d6dd18de0c0f1cf26d4de1e48f5fb0b384c25c85edf SHA512 e80525599956316fbd1421fce95e2e6adc0a2992ef1791b3d4d5a339100859c34396e19ee4f00f430f5808fc160c09e6f7a7f4f619bbbe21422524f1daaa1849
 DIST shorewall-core-5.1.12.4.tar.bz2 86548 BLAKE2B 8384c2f8ec673db3f0fed04af702e1967d41133f3a066ba09cbd58199654878d4d6c73730a933525304d68f7834c80d5c2a2452a4dd6faa71e2580deadf3189e SHA512 f77ae4080fa81a3259ab620ba7615c4188e6bec0244e898702dc641aacd8ac54160331e270b3708d818bfa9452cf96014868199a48c28f15c50d128365cb62e6
-DIST shorewall-core-5.2.0.1.tar.bz2 74523 BLAKE2B b4b204a9802a3fd0a69498acd7bb52a0fe0010a38df6feca5c98f15150e3924346911862745950269af60dd4ee2102a8e935a5c8d9f26edc8e726203bb8c3df2 SHA512 ebb184b33ade8111b961679c3aa90907ddc23410c17dd1fe49848425c465725a5f4c24f6bfbd158e759df6f651046db30120310a3edd7e594399721770cc9471
+DIST shorewall-core-5.2.0.2.tar.bz2 75108 BLAKE2B 2523d3fbdb0755c9c14195dedd0a4db2329b96a1ac5bde1eed1f0bb5623f89e18fab641d84074999b3058f73da75c9d306d372e02fac0bd735b0247256dad123 SHA512 1a6b94d25a09eeb464e4e35dee6e10a505d9fe271f034bc92763bed5c7bae44f88de68321f4b21bef4ef6e199d746d24fb4be077c676f96d9c84d8dfd453f370
 DIST shorewall-docs-html-5.1.12.4.tar.bz2 4281202 BLAKE2B 51624bf6a36766fa8f1aad9600885dc2b92f656ef3a7bc6cf3704a33d2e014af590bbe1621793bd77d291baa3441a0f493c27f838159ccbb15b0684ab26f4bef SHA512 e1592137013b463a7cbd28c7354f51b36460c054d55e1819198b72c600ccbdc8b3fee4bab33d7a71466397338bd38e0aa6312f1c182e79052f249c51d1017dc1
-DIST shorewall-docs-html-5.2.0.1.tar.bz2 4294859 BLAKE2B 317d1e014f94e040154617a355619317efed4c318e14a6c2a6cfabeb1ee2c5fb0bf49a7e9a80ca8ffbd5828798d33617fdcf18af0bc6ec8333a2a1b8231136c1 SHA512 52c5af9c682bbb233be3e779a45f7d09ca874849e6a118271bf90d6791cceaa31740dee8cdfd08a50807565fb9f8d6191ca1096ab31d1419b7088668c349c71c
+DIST shorewall-docs-html-5.2.0.2.tar.bz2 4294083 BLAKE2B 3ce667e656359f7d2f27bd03a47f2eae9f407a04f7b2921ad7099729164c40b3a88b2651052c3b28a3ab404953bef811da499f6acd4eb432648bf6d727124a20 SHA512 751f2c426e8abe9a5af396df39d4b67ccf674113b4b595916c6d44c14ace67f82ae2ffc84500b25d2876f0356b02c96383068d54fa97804afe464d2d5eccba31
 DIST shorewall-init-5.1.12.4.tar.bz2 41541 BLAKE2B 149b31b2ffd37c64cfc69de7d2d3a39824ce427a98a84f4e96af02aad9e04f0973f862ea0b158245a1d806504dc0dac9a5a554776d9533a7c88dbf6c096d4d07 SHA512 971f0a7a25f49c289e9c9d6d564e05b7f2675d271ef95c15b06a4a4e878a74c5b13a1ea80411014a5130f53267df6691042b313c423db193b9cd6cde172ed359
-DIST shorewall-init-5.2.0.1.tar.bz2 29381 BLAKE2B 6c0c937a8fd7499ce07f9ef0f1ef07c892e3d0585e2d29506377ca311ffa5939160aa62bd4e9602d346bfec2698865228ba69cdfbf6229520288485ced1e7f39 SHA512 ce9ba1a8bec5823650022f80db70b60930fa4b5c65462e4e8317f71ee467f75ff3af2b658c1d3bbe0cb7cb41acd4226cb2cfb657afde1375740c737f4528256f
+DIST shorewall-init-5.2.0.2.tar.bz2 29749 BLAKE2B c70067951d458bc54434214dc2b4764c0c52aca457a21c4c77d3ae6cc0586fc5ce325549f7a5df9c18c255113e7d71a4f687a6a72fc81528b7611a3edacab864 SHA512 1fef0feea7e36d2f12373e64d898129e2e49c66f3f182fad950f5aced6615ff2b59cea66c1d2c475e9a781c0faf50541642c71e69dda68fa41ab86509134b511
 DIST shorewall-lite-5.1.12.4.tar.bz2 47209 BLAKE2B ca39daa7a864b86cd9075f8604d053984ef8c451285520c568b83171163513bdbe7f910b21638f4f69e716d4bdbb4f148856b02dbe83392789d8b962669374e1 SHA512 1bcdb90fccc634103ff190be9a058abf1b5158d562702c8c1ad51e8edebc2939271f3279bcb0fd8ff7389ea175387ce5a090a0d9e5655524a11203b5c0d55604
-DIST shorewall-lite-5.2.0.1.tar.bz2 35244 BLAKE2B b4983c21bb46c684adecb4d771839bc4a31a6737827e68944e75752fc4296aa458f24f9cdba46f19d09308634b00368e7fe5ec7a6417c1348cc083f7d8d437c0 SHA512 5562c41993a6047b5a334ab26d296df836976749da24796f005e12afc1e987b4f784ec25ffe176c81b8e9f129930c91a5869335d15eca649bb7a03c214b700ad
+DIST shorewall-lite-5.2.0.2.tar.bz2 35577 BLAKE2B 462480b73a4cb70e2c09f7b1c4607cc748d1ff5d6ca511b2076edd7872865442ede343e3b26be2c46665a1c6beed5290584ccf0da6f93bc62ea1da1faf90abb3 SHA512 eb68b4b2b92a87c80f80b950bb5c2fc4f035f7650d786e4999d262bb21e2a5ee439e804aee4b3b0fb187b086ba4d899725a031f38d4138bec151969f9a874663
 DIST shorewall6-5.1.12.4.tar.bz2 197179 BLAKE2B 1c120388d0b8eafdbf6ec2fb64a8cc3e1e301dd109bb03f5dcfce60c534489210f669327eaa07bac5fbc7497e39c9167586f02017318ce9a2b054b4a39e4ae50 SHA512 9ff09b093f641452d3c5d615163336c903c74d4133cd620982760df6b8ee3acc704c460adb5db52b109f768d623152e47617c7d05742c2e6f19527c34eec9a61
-DIST shorewall6-5.2.0.1.tar.bz2 184727 BLAKE2B ff9502e2ff84af146ba42cbfe4a7e383e6e2c56f43cd53c21085908660c672d8e579fd8615f841a202bb6bd796d434f7a462d684e45496880599902a3a3a0acb SHA512 dd34968d2e074e0460aeb562a2c4ab857e6c9a680d4d9f41cf006bfddfffc647d472693401c6a8f03da25af2f1117ae61c640fa7db099af3e5b5cd27be74ecef
+DIST shorewall6-5.2.0.2.tar.bz2 186161 BLAKE2B 97414d6c8d3c6cf9100330ff6d9be9808f9aa354ab4c535429b8593dba0d5f328469bd42e928f33f66ba40a0e91dfcc45d47d2b405a6ccdc814fb1e2c9a977dc SHA512 ec551998f04cd9b1ac0c791cbdc45068b402d5be89e2fd0e1a6eb95b288b339ed49c23bac73e81f324e8c277b66772d2ef5b11aed7a4b085a5ed0047fb96b1da
 DIST shorewall6-lite-5.1.12.4.tar.bz2 46902 BLAKE2B 6e9bad615833beacbb0d4b779dc8479cad73c1964bc2220541419b99a7fc8dd1b57ca42d61d6ef708460beffa65106166dbd5c60a90ce7f4cdf60ce3a879defb SHA512 95b5b96b3744bd1a499d00b4f98d71b264369752e6fd9ede21717657785833d1124b97434fe33457bc6f80026b204eb9306d73af9eb8abf23840291ecc1caf32
-DIST shorewall6-lite-5.2.0.1.tar.bz2 34931 BLAKE2B 94155a21be8d8aba07d9742b2d92428285588dbf33f1b522644dd7be4a05dd25b93ad4d3bbc3fd147f544a7d9ce8bf01dbadaee642bcb014f43aef6ba61f1596 SHA512 dc2f1c61efd8673335b117771baf8cec2145b5afc4a6b74b80834daa321f22475e2ec9baa23358c5e2d4787b5ec1cc092b17617cdfe9a921bd0075328eb0cdd5
+DIST shorewall6-lite-5.2.0.2.tar.bz2 35311 BLAKE2B bb25abc719c776571273219df6a3ba89ffe2553efbb4e93755b3deabce9f34851024f72d5ab328ee9caa55ab3744e35f08013ae8fda19c480e6d907e7257f8fe SHA512 2c39805d17cd8d9710d175d583958cc25ac0f78351a36c36ff57e7a9c8db87bd64ddf5c27352c916d42db2a26864cb9e96f83e5b1677e24964e67315dc2fb086
 EBUILD shorewall-5.1.12.4.ebuild 16274 BLAKE2B ec3a48d6ca7da8e553c0771bff4ffad54ff2ddaf61dda8a5d781d59f53075f637303eead6ffdcdba940a7db38e6099a3a070dcfcfd3bec0167af369e082b6cf7 SHA512 7ac1aa7e32c815499a49c0a97427359db8fed3fc135026593ff724d53e42a566a5ec023bdd760ad9959768a84ad453df1a88973c018b7f45b543efa6bfa0e969
-EBUILD shorewall-5.2.0.1.ebuild 16391 BLAKE2B 5478af9a3d7ed636e4768c1335c019ceef42e072042ff8e4b4e609f1e62d22916c0a0ee845188d01ed96435dce02cbd56f7faad10451bee2b13114cf6c4f0426 SHA512 36f12bb143a763931650de55ce0a9ed06ba6440401cd28813ba012f04a1ecb880426bfd7f38173d3f9fbf5c808e8f301ee87854e384b2e95efd8853973f10c77
+EBUILD shorewall-5.2.0.2.ebuild 16276 BLAKE2B 6b78da523533371e05294702605bc2cfeaaccb9b4ded2a88d4188585bc25894c55865e756108b9640f517aa69835fae55157a766ad05ab6401c4531a4f185807 SHA512 b4bf98d37de2983523d4b78a1b3de6297d38f696fb0d3125d121d8fc0fa56b53d954a4ea387ba44d96e1f7ebd432aefddbd50fb17e45c74467caa17cb9c153a4
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch b/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
deleted file mode 100644
index 2927d4c17ab9..000000000000
--- a/net-firewall/shorewall/files/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
-index 0e2de1525..60499180d 100644
---- a/Shorewall-core/lib.cli
-+++ b/Shorewall-core/lib.cli
-@@ -1201,11 +1201,17 @@ show_saves_command() {
-     echo
- 
-     for f in ${VARDIR}/*-iptables; do
--	fn=$(basename $f)
--	fn=${fn%-iptables}
--	mtime=$(ls -lt $f | tail -n 1 | cut -d ' ' -f '6 7 8' )
--	[ $fn = "$RESTOREFILE" ] && fn="$fn (default)"
--	echo "   $mtime ${fn%-iptables}"
-+	case $f in
-+	    *\**)
-+	        ;;
-+	    *)
-+		fn=$(basename $f)
-+		fn=${fn%-iptables}
-+		mtime=$(ls -lt $f | tail -n 1 | cut -d ' ' -f '6 7 8' )
-+		[ $fn = "$RESTOREFILE" ] && fn="$fn (default)"
-+		echo "   $mtime ${fn%-iptables}"
-+		;;
-+	esac
-     done
- 
-     echo
-diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
-index 2d8c7df67..46c932335 100644
---- a/Shorewall/lib.cli-std
-+++ b/Shorewall/lib.cli-std
-@@ -412,10 +412,14 @@ uptodate() {
- 	    elif  [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print)" ]; then
- 		return 1;
- 	    fi
--	elif [ $AUTOMAKE = recursive ]; then
-+	elif [ "$AUTOMAKE" = recursive ]; then
- 	    if [ -n "$(${find} ${dir} -newer $1 -print -quit)" ]; then
- 		return 1;
- 	    fi
-+	elif [ -z "$AUTOMAKE" ]; then
-+	    if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then
-+		return 1;
-+	    fi
- 	elif [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print -quit)" ]; then
- 	    return 1;
- 	fi
diff --git a/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch b/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch
deleted file mode 100644
index 91791e01c4d4..000000000000
--- a/net-firewall/shorewall/files/shorewall-5.2.0.1-YESNO.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
-index 9896e18d4..2d8c7df67 100644
---- a/Shorewall/lib.cli-std
-+++ b/Shorewall/lib.cli-std
-@@ -1063,6 +1063,41 @@ restart_command() {
-     return $rc
- }
- 
-+read_yesno_with_timeout() {
-+    local timeout
-+    timeout=${1:-60}
-+
-+    case $timeout in
-+	*s)
-+	    ;;
-+	*m)
-+	    timeout=$((${timeout%m} * 60))
-+	    ;;
-+	*h)
-+	    timeout=$((${timeout%h} * 3600))
-+	    ;;
-+    esac
-+
-+    read -t $timeout yn 2> /dev/null
-+    if [ $? -eq 2 ]
-+    then
-+	# read doesn't support timeout
-+	test -x /bin/bash || return 2 # bash is not installed so the feature is not available
-+	/bin/bash -c "read -t $timeout yn ; if [ \"\$yn\" == \"y\" ] ; then exit 0 ; else exit 1 ; fi" # invoke bash and use its version of read
-+	return $?
-+    else
-+	# read supports timeout
-+	case "$yn" in
-+	    y|Y)
-+		return 0
-+		;;
-+	    *)
-+		return 1
-+		;;
-+	esac
-+    fi
-+}
-+
- #
- # Safe-start/safe-reload/safe-restart Command Executor
- #
diff --git a/net-firewall/shorewall/shorewall-5.2.0.1.ebuild b/net-firewall/shorewall/shorewall-5.2.0.1.ebuild
deleted file mode 100644
index ef57ddf2042b..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.0.1.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# 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
-
-		eapply "${FILESDIR}"/shorewall-5.2.0.1-YESNO.patch
-		eapply "${FILESDIR}"/shorewall-5.2.0.1-AUTOMAKE-SAVE.patch
-	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
-}
diff --git a/net-firewall/shorewall/shorewall-5.2.0.2.ebuild b/net-firewall/shorewall/shorewall-5.2.0.2.ebuild
new file mode 100644
index 000000000000..a7f7766988aa
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.0.2.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
+}
-- 
cgit v1.2.3