--- iptables-1.8.5.ebuild.old	2020-09-07 12:09:38.000000000 +0300
+++ iptables-1.8.5.ebuild.old	2020-09-17 11:29:15.442468440 +0300
@@ -13,7 +13,7 @@ 
 # Subslot reflects PV when libxtables and/or libip*tc was changed
 # the last time.
 SLOT="0/1.8.3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 BUILD_DEPEND="
@@ -123,9 +123,11 @@ 
 		rm "${ED}"/sbin/{arptables,ebtables}{,-{save,restore}} || die
 	fi
 
-	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
+	systemd_newunit "${FILESDIR}"/systemd/iptables-r2.service iptables.service
+	systemd_install_serviced "${FILESDIR}"/systemd/iptables-r1.service.conf iptables.service
 	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
+		systemd_newunit "${FILESDIR}"/systemd/ip6tables-r2.service ip6tables.service
+		systemd_install_serviced "${FILESDIR}"/systemd/ip6tables-r1.service.conf ip6tables.service
 	fi
 
 	# Move important libs to /lib #332175