gentoo resync : 20.03.2022

3 files changed, 11 insertions, 17 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index e5289fccb777..26d69c963fb5 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -9,6 +9,6 @@ AUX systemd/ip6tables-store.service 243 BLAKE2B 30a0d955998a2a664c6a95b8e559898a
 AUX systemd/iptables-restore.service 400 BLAKE2B cd7f700cf717a2efb6504770308f7dcb90a1968f64cca98ea5e7437cf3cf2a2e8f575e3743ac19eec8738c665f4243f537a101c00d5d1cc94648688d4e240a59 SHA512 8c005e321ad041068f243e4baa6588b24b0ffd69991f2129dfab0a34d0ebaf702ff2be8b7328126c84abdc3bbd300e1c387a690c5f6a002b50b2e9148feeb8ef
 AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055087fddde5927291b3fce6e0e978f0cb3b734bcacf02f78257eec99274056b69058436a847dcb366f5fb70032e410355 SHA512 a720e92b5571a2c3427101105e95e555f3b72541a53c5daa43e361c99ca28830e9e8dd27dbd7cfed40fbbe289ed180f9be7e0f3b6b0cd19bba022a531815fd5e
 DIST iptables-1.8.7.tar.bz2 717862 BLAKE2B fd4dcff142eaadde2a14ce3eb5e45d41c326752553b52900c77fd2e2a20c0685d0a04b95755995e914df47658834d52216d6465c2ae9cd6abc6eb122b95cc976 SHA512 c0a33fafbf1139157a9f52860938ebedc282a1394a68dcbd58981159379eb525919f999b25925f2cb4d6b18089bd99a94b00b3e73cff5cb0a0e47bdff174ed75
-EBUILD iptables-1.8.7-r1.ebuild 4777 BLAKE2B 8966c8181c23b7e48554ea34b22a84ce96de655eb3f1f6d40e33793f067415da67eb276cdc28dce0cb48d034c6fc5f72d59001d989eb82d4859e0ca378493b66 SHA512 429aa79710c3f9f73ad0e6d18d768664419ef144432f8acb0c020551a928eaeee75a750395c18b4890d15227f5f0c1abee7f560bcecebfcce624bbfba0d72ad0
-EBUILD iptables-1.8.7.ebuild 4682 BLAKE2B 6d5e8c0d3b9aa4ec0de723547b23dfde616732d4e525299a7a21738cf0f8bb688b8dc4303592790f2ba835f198bde5da71e9b83f0a8f037c8c6adb2aa9ddd78c SHA512 fca30ef62c65af232436f6cd34c12693e4de65886019f12c5cc2bf2165e52d0dae36370e160887616a4d1b4a05aeb6d9476df4a6083ccd553eb37e54cc8fe573
+EBUILD iptables-1.8.7-r1.ebuild 4592 BLAKE2B 6f44a01c470d7fc561fc5eb481550cfdbcf2462a201a2623807d185b5426570718bb5fbb212be7f9f04e94185440f5954e60c1d6fddd30bb7d624814a0050de3 SHA512 2487c58761d5ee362726009fb144657fd494ccdc11cd642dcf87a17539190b9a0d428dd707fc5ac1571f1298e756bbd935f509a4441aeafd6cbde2433fa2c877
+EBUILD iptables-1.8.7.ebuild 4681 BLAKE2B 22362cd7bde9dfb826ac9666c86014f153117b9773e3592fdaa1074c85d84db79e4d887e2a2d094e84ad4960db44ef0538805af782c60e568b6f83b55e50b577 SHA512 5b57b5be14dcb8ac5a71ca73ac60737e6b488f61e72a7c1414e0014ad25606f00e13d736c0acfeb294b35b9011b060f02bc3c04790b129f21b6b628a49c0bba8
 MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842
diff --git a/net-firewall/iptables/iptables-1.8.7-r1.ebuild b/net-firewall/iptables/iptables-1.8.7-r1.ebuild
index f748bdb9f289..886111459d9b 100644
--- a/net-firewall/iptables/iptables-1.8.7-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.8.7-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # the last time.
 SLOT="0/1.8.3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="conntrack ipv6 netlink nftables pcap static-libs"
+IUSE="conntrack netlink nftables pcap static-libs"
 
 BUILD_DEPEND="
 	>=app-eselect/eselect-iptables-20200508
@@ -78,12 +78,12 @@ src_configure() {
 		--sbindir="${EPREFIX}/sbin"
 		--libexecdir="${EPREFIX}/$(get_libdir)"
 		--enable-devel
+		--enable-ipv6
 		--enable-shared
 		$(use_enable nftables)
 		$(use_enable pcap bpf-compiler)
 		$(use_enable pcap nfsynproxy)
 		$(use_enable static-libs static)
-		$(use_enable ipv6)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -104,18 +104,15 @@ src_install() {
 	doman iptables/iptables-apply.8
 
 	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+	doins include/ip{,6}tables.h
 	insinto /usr/include/iptables
 	doins include/iptables/internal.h
 
-	keepdir /var/lib/iptables
+	keepdir /var/lib/ip{,6}tables
 	newinitd "${FILESDIR}"/${PN}-r2.init iptables
 	newconfd "${FILESDIR}"/${PN}-r1.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		dosym iptables /etc/init.d/ip6tables
-		newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables
-	fi
+	dosym iptables /etc/init.d/ip6tables
+	newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables
 
 	if use nftables; then
 		# Bug 647458
@@ -125,10 +122,7 @@ src_install() {
 		rm "${ED}"/sbin/{arptables,ebtables}{,-{save,restore}} || die
 	fi
 
-	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
-	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
-	fi
+	systemd_dounit "${FILESDIR}"/systemd/ip{,6}tables-{re,}store.service
 
 	# Move important libs to /lib #332175
 	gen_usr_ldscript -a ip{4,6}tc xtables
diff --git a/net-firewall/iptables/iptables-1.8.7.ebuild b/net-firewall/iptables/iptables-1.8.7.ebuild
index 2aa7363c4145..e81c56c6afe9 100644
--- a/net-firewall/iptables/iptables-1.8.7.ebuild
+++ b/net-firewall/iptables/iptables-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 # 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="