net-firewall/shorewall: drop old
authorThomas Deutschmann <whissi@gentoo.org>
Sat, 9 May 2020 21:41:27 +0000 (23:41 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Sat, 9 May 2020 21:41:39 +0000 (23:41 +0200)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
net-firewall/shorewall/Manifest
net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch [deleted file]
net-firewall/shorewall/shorewall-5.2.3.7.ebuild [deleted file]
net-firewall/shorewall/shorewall-5.2.4.ebuild [deleted file]

index 9ea8ede1bb1d90b3f63534829b7777dd7ec67de2..a9a781cc953482344fa6090c5beacd1308851434 100644 (file)
@@ -1,21 +1,7 @@
-DIST shorewall-5.2.3.7.tar.bz2 579234 BLAKE2B 968d9f23f9d66d1326dfd9c0b989959a1a8449f6dd3230d9191cb3f3be805065fe4d1ab5e7bd679b5da7ebbf625654dc0a878a4ebc6346e51a9d2588102e52b5 SHA512 c0f90d5cbbc6a9cad443b3ecfedda79bee71f79685049c421d8bba3826e5c874c7c31f09f243d3728514684983a27c8d4ac6854b55766fbcf34f6937f8ab28bd
 DIST shorewall-5.2.4.4.tar.bz2 581085 BLAKE2B 6830f1ce9350534a51b0d79efad07b338c511ab3cc1bf151ac958052c5feb1794d994a71e80ebf1546a76fae1718ebc74abab37fbb4d9362d8b3108133b30354 SHA512 c050af24969c2f18c4c020dfb611edaf9c6a5aa09d1dace502ae99b9aa82d7f217695e8099d6615a9a3c9f6de951f6d8b24621021c48ee2f2095edf9815a8d57
-DIST shorewall-5.2.4.tar.bz2 579480 BLAKE2B 5bbca22cfa11dc482859c2703d54f35f55f1c8db46286c3480879eb47d562358a73412f0ba3ba4af9d3763c838608269a70668daf30accb07314245308f46022 SHA512 2eee8b8e86aef29f646f324dcbd156eae7a687db179361e03172ef4792f2665fd3623830028a748ea3506ffbb2f59afa9f7deba7862643aff7628857aa2ac63c
-DIST shorewall-core-5.2.3.7.tar.bz2 71454 BLAKE2B 3df2b99dfbde169a817f4a5f45876c07dbdcda432763c1227fd86d9f2e2556c639595db9c57f195a404535c72f33ae1211aee080e5df37c342f6ebd4be2a5994 SHA512 e708ee48bc087cef24959b22430c8d8814d5c2f9315988c410e6fa59b4dca9c8b48501fea9515115e760d902d9e9719f33c1310d91a83550030a8768efd18751
 DIST shorewall-core-5.2.4.4.tar.bz2 73257 BLAKE2B 16b8d3a1d08c9db6a939f946324295063cee71b373bd67dd85d0acb4332502df4b5d9bb932695228ad6d33395c6596e86fd3e77ca59abc99d88bab7e883777c9 SHA512 1868dcd6bad6b0cb5be2c1b0724f076605e7990d0b9dfd19fee06c758b19f2ebcbe18bccaa7a4ea861ceb26038ed07837eecdacdd2a02d0c2a927c732d6bdc30
-DIST shorewall-core-5.2.4.tar.bz2 71532 BLAKE2B edd3762b39db162775e05d30e3ddeac244ca4375ee74bc1581af85879ddcfda22e6cae7b1357ddf5b0df615a4f5072457b1e34918bde5cb43273b21dd60f76ba SHA512 40add35f175abd62ede0b0b8f84151d7a81d56bcc3d622ed9ac676e382bd33cfee648da205f23ead462b5e6e577784c79ffdcdde5f45c731c6d93c11788d982d
-DIST shorewall-docs-html-5.2.3.7.tar.bz2 4293387 BLAKE2B 6a0ffe8eac171c13961fcf448932b7287cdca3e1da895020d5551d135fe542ca8dba3e0cba7f505ec9a204649dd5fd9849613bbb30d2970a45f321b46aa74ba5 SHA512 19c5bb80f40c9df8262e6ee00908f64d3e2d489c734bdecf6faec5f8d23bf3b6201ed21673900a2906053bc7d59872b7974262caf9883207126a082bbb2cb281
 DIST shorewall-docs-html-5.2.4.4.tar.bz2 4294159 BLAKE2B 81bb4a9d086f48bf8551be3bc8aff0ed8a0a99d215338f12b711c96115507ea5a7eb567d084db0a93628c4036623a72231f33dd15671e84739d59608268b98c7 SHA512 086096604f5a580906f05b460e1e19df24620b610675a8ec6038c0061199fd6f09cd8aff08f1e8daa8d2898bfaec9db95cf7f4f1397ca9df784d420907b16fac
-DIST shorewall-docs-html-5.2.4.tar.bz2 4293639 BLAKE2B c024da5a3fab5f98c0913f294dafd85eced4c259762f5f06d9e98a74ea2e1ac5c0565e027609da472bd911e08027a6524e7cf97e2ec06c70965e5088fa3c331e SHA512 cb3ce47a892e92a032d4f49d693b23ad47ad3a0effb44cb24c0ff86f9b9b75eaa231210369a0ae10789bddedbbfd4c2a8a11bef9695591ef22351570c5abe481
-DIST shorewall-init-5.2.3.7.tar.bz2 35860 BLAKE2B b6046004c246113105206f2a034e0d8930a8283c3431675a2cb5c29b1509619b5d79a03bdf8c1daea085a330344ffe519a0b9d7ec860fdcd3603efd739613d2e SHA512 f3f231923a5d352cb8288d051568d4dbf24ef38122a1d8ae0c158b317c09146d938389597a5f57e9099c7c1b283780357b74f8605ea1e14393a0e3b1fa6b1118
 DIST shorewall-init-5.2.4.4.tar.bz2 38048 BLAKE2B 01b4664396933ca303d4013d50f290be850dad51142257a7b1f3081cee3baac219feadc96636c732072c6918f83d847eca2107aa094804691500972a90f222fd SHA512 fdab4aa68429144cbffdf41aad78744feb3e9736df0e8d6ed87ed7ac80aebf7078c6ec28646069a71cacc8d9a6738605d59c6b6fb35d8c4d9a1ed8353a71775c
-DIST shorewall-init-5.2.4.tar.bz2 36672 BLAKE2B 9b1d8e4670f2fadca9c3ffb4aade2734ab2714ae86d9b66728595b9e6c222b151be064634ea374767adea4424d578b7f7369acab855a5716e6f8def2f35d7b6f SHA512 7a68eb0c8e40e778123c0ecc60c2210888c1e6c68fd282e0d4f2fb2fdac3f1f00dde521c157520a1edd31ef77fe40e5d15834c5ce7d3d5500ae5fb8d66a6a324
-DIST shorewall-lite-5.2.3.7.tar.bz2 40674 BLAKE2B cf7ed3c81ab3a49556e61f48bdabf828dbb79a4c0a6c431f9ce77a4f15ec33ccbfc6bc5b1e6a942d695795679670bdb3ff22c37c54bcc4cd3552f6117bb4834b SHA512 c83f349f2626fe98a2f968a76fb48de2e7412f95ed0e72c48724cd93fe6e3b480d6cc185b5445434432bbf40ffaef7dbb875c4b5494f7875ce1f96f345314ea6
 DIST shorewall-lite-5.2.4.4.tar.bz2 42806 BLAKE2B d6dd5d9268d40fb88ee99be36b359423a6d7785417752f6e9d7245806bf9677963851327dcfd0d5fe81ea54ab11d59a5e64ee4115d41d3a6c8f4ced1e7cda732 SHA512 b81aa04f124435d3bf63d1796cca4db987f56c3e31953386ab7f3aae290058e5f3240b43864753121ed48b3744f8d6ee2dcd5210105dc1ccf5a4f790b3e22092
-DIST shorewall-lite-5.2.4.tar.bz2 41491 BLAKE2B 1cdef18c368d44bf7aae756c2519b3cf8aaa648be0044b6aab22aa6dda989a8a7e51ab77d963f450ab0338ea490ca2629680e1c251e4dbf43594a952a17ded9a SHA512 a222d06e60f889167160cea5107fb534e8c5bec00b42e7027615447875e3ee2513ba1eefd1e14e17ea7c91d08f2e9cfebb1b3fe2bd384f6288961c1258cbb359
-DIST shorewall6-5.2.3.7.tar.bz2 197912 BLAKE2B 20193edb20a6e165cc83391ff36e5601104dbc95f8300d1880253edc451fb086b0b619496cec84f3a6e1ea52c33ebea9de436babeb6517b41688e95eaaa10641 SHA512 45ac97f27569006715156579ca86e9dc580d30f64dabb1557ef25dbb171e76a67251a64e4ff77c8e88017dc2a9e364503c1f565f376312335ca2ac0d961a6043
 DIST shorewall6-5.2.4.4.tar.bz2 199722 BLAKE2B c5c741ea7108e6edbb35190bccea06d04c6a0d1cf5dbae23481e38d3c05155df6bcaf4deb6397d07a1f51ba0b13b18b4ed22349fbe1f6e605d0303486002d876 SHA512 cf212d1c7c8703319a5c6f34ba8629f115b2f03a0713c1b40cf370adad66b671bfd9536a28bc650aba04bf6a6fd7c396788d40c2eb650a006e8f2eb27baf76f8
-DIST shorewall6-5.2.4.tar.bz2 198630 BLAKE2B 4aa511ba5b998835b9aadad3a733b7ea7e4c0940135ae8959895ea499fd5f83e8cad3831560215c41c855f0d02f845ee97b8318af409fa088a98bbd5f3ec7a87 SHA512 b4dce7043b44fc1b84c5f8b07c524b0c9b5a83e06f694646115c448ad1e0407a77613ace99b5866cfa8b7078a98c1aba79a94c094e40453745d6cccc453d8934
-DIST shorewall6-lite-5.2.3.7.tar.bz2 40641 BLAKE2B d1c3720e7fefe6a20a29ab90e65fe9c0a113894c008377734e274177f6759245c056fb2a7e7abf42c7bddd35bd159f8c2ed2e4135edd1dda9d63ad1b596cec8c SHA512 0727a0e709bb206e4905ae8b5b4b39b2d2eb950b8aa03d8593de71a12464422681b5528a8e06a05e91e9bd1bae6a78962da1810ecbc8707e670073c28daccaaa
 DIST shorewall6-lite-5.2.4.4.tar.bz2 42739 BLAKE2B 3f1caa78b12f779bd73716dad78a26544bf99204b96da2fa950c709bbb5d68ac1ee062714d5040d961a2df35b4d22e0b6c8747b36a84bb9a5b6805cb6d0158cd SHA512 4a0c6e939bd8ca239734de64ea0b2a94885f8f14d00e37dce291b2f5aa00384227c16cc0595ef1b038f05d3d42212ace3e9482937c8c072d7e194099ab867646
-DIST shorewall6-lite-5.2.4.tar.bz2 41474 BLAKE2B 123b73281cc4e84f74eef56111af24243eca9706ad03a38cb8bf3763b8645fffdb1847098d33c109b8b481eb66baa9d71a907285cc20ae6094eac9304cf7fd52 SHA512 a2a5f8054e59815e3dc2f3a51f59f29b3880226d5074b78e189e68e6c6f66de44a86791417f088bb4f1d0eead78d2841269cd222450d33b7b5cef1c00b08cfc8
diff --git a/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch b/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch
deleted file mode 100644 (file)
index 8b7925d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rupN old/shorewall-init-5.1.7/shorewall-init new/shorewall-init-5.1.7/shorewall-init
---- old/shorewall-init-5.1.7/shorewall-init    2017-09-18 18:28:43.000000000 +0200
-+++ new/shorewall-init-5.1.7/shorewall-init    2017-09-23 15:46:03.489914459 +0200
-@@ -80,10 +80,6 @@ shorewall_start () {
-       fi
-     done
--    if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
--      ipset -R < "$SAVE_IPSETS"
--    fi
--
-     return 0
- }
-@@ -101,15 +97,6 @@ shorewall_stop () {
-       fi
-     done
--    if [ -n "$SAVE_IPSETS" ]; then
--      mkdir -p $(dirname "$SAVE_IPSETS")
--      if ipset -S > "${SAVE_IPSETS}.tmp"; then
--          grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" || rm -f "${SAVE_IPSETS}.tmp"
--      else
--          rm -f "${SAVE_IPSETS}.tmp"
--      fi
--    fi
--
-     return 0
- }
diff --git a/net-firewall/shorewall/shorewall-5.2.3.7.ebuild b/net-firewall/shorewall/shorewall-5.2.3.7.ebuild
deleted file mode 100644 (file)
index ab98fa1..0000000
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info prefix systemd
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="https://shorewall.org/"
-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=$(ver_cut 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(ver_cut 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/'
-
-       if [[ ${MY_PV} = *-Beta* ]] ; then
-               MY_URL_SUFFIX="-Beta${MY_PV##*-Beta}"
-       elif [[ ${MY_PV} = *-RC* ]] ; then
-               MY_URL_SUFFIX="-RC${MY_PV##*-RC}"
-       fi
-
-       # Cleaning up temporary variables
-       unset _tmp_last_index
-       unset _tmp_suffix
-else
-       KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-       https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-       ipv4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-       ipv6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-       lite4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-       lite6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-       init? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-       doc? ( https://shorewall.org/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 https://shorewall.org/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."
-
-       # kernel >=4.19 has unified NF_CONNTRACK module, bug 671176
-       if kernel_is -lt 4 19; then
-               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
-       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
-
-       pushd "${S}"/${MY_PN_CORE} &>/dev/null || die
-       eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch
-       popd &>/dev/null || die
-
-       # 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
-
-               pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_INIT} &>/dev/null || die
-               eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-               popd &>/dev/null || 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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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 "${ED}/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 \"${ED}/etc/logrotate.d/shorewall-init\" ..."
-                       rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed"
-               fi
-
-               if [[ -d "${ED}/etc/NetworkManager" ]]; then
-                       # On Gentoo, we don't support NetworkManager
-                       # so we don't need this folder at all
-                       einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
-                       rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
-               fi
-
-               if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
-                       # This script isn't supported on Gentoo
-                       rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/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 "  https://shorewall.org/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 "  - https://shorewall.org/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 "  https://shorewall.org/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.4.ebuild b/net-firewall/shorewall/shorewall-5.2.4.ebuild
deleted file mode 100644 (file)
index 9f77b34..0000000
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info prefix systemd
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="https://shorewall.org/"
-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=$(ver_cut 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(ver_cut 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/'
-
-       if [[ ${MY_PV} = *-Beta* ]] ; then
-               MY_URL_SUFFIX="-Beta${MY_PV##*-Beta}"
-       elif [[ ${MY_PV} = *-RC* ]] ; then
-               MY_URL_SUFFIX="-RC${MY_PV##*-RC}"
-       fi
-
-       # Cleaning up temporary variables
-       unset _tmp_last_index
-       unset _tmp_suffix
-else
-       KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-       https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-       ipv4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-       ipv6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-       lite4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-       lite6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-       init? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-       doc? ( https://shorewall.org/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 https://shorewall.org/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."
-
-       # kernel >=4.19 has unified NF_CONNTRACK module, bug 671176
-       if kernel_is -lt 4 19; then
-               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
-       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
-
-       pushd "${S}"/${MY_PN_CORE} &>/dev/null || die
-       eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch
-       popd &>/dev/null || die
-
-       # 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
-
-               pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die
-               eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-               popd &>/dev/null || die
-       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
-
-               pushd "${S}"/${MY_PN_INIT} &>/dev/null || die
-               eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-               popd &>/dev/null || 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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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 "${ED}/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 \"${ED}/etc/logrotate.d/shorewall-init\" ..."
-                       rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed"
-               fi
-
-               if [[ -d "${ED}/etc/NetworkManager" ]]; then
-                       # On Gentoo, we don't support NetworkManager
-                       # so we don't need this folder at all
-                       einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
-                       rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
-               fi
-
-               if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
-                       # This script isn't supported on Gentoo
-                       rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/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 "  https://shorewall.org/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 "  - https://shorewall.org/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 "  https://shorewall.org/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
-}