gentoo auto-resync : 08:09:2023 - 10:30:27

4 files changed, 2 insertions, 114 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 6992c682117a..55a67b94515b 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index c84f2b868ac3..bcf8328d36da 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -4,7 +4,6 @@ AUX ipt_netflow-2.6-gentoo.patch 1998 BLAKE2B b4da947e83bc7c80f91a489858a9a7fdf4
 AUX ipt_netflow-2.6-ref_module_fix.patch 1908 BLAKE2B 2f59dbf1e5986549a67319c478ba831eb4c835d52aa16cdc216d4cb893f99560ea3a15936489cdf809b9e886aab888095fb66dca9acb467a44da6bbb5acec6ae SHA512 5e76e4f2982fe3f4ca961f93bdb4b20865d5e2fbd600001798457eafb561057a6beb3da75fffa91265429ed145220b9f25a1facb4447405ba9990c90289f4ae4
 AUX ipt_netflow-9999-gentoo.patch 1840 BLAKE2B f5f7481e812f40596a089c168eba13bbba1c3b94b8efa292dd9835e2e4221f9d8b05c5482d998139f02a564a18bd6cc70f3a7b24cd10ca1ad41b00a4ce761b67 SHA512 fc11824637ee471f5ede8a4cecf667596bd3ad6b458da119c7028701c236bf634381b275fce0d4abd0fe8a13bf5392d32dc8fdc23fcb7e1ab50bcc61d71a82d5
 DIST ipt_netflow-2.6.tar.gz 95752 BLAKE2B 088c7030addd34d9d889cfa705aa060d0793e33be957deb3b703daea4229afc24f7268285ce336e425a024dc9d8139633a5206ff9d769c95cf71c156acbd4f25 SHA512 0ccea556e25dc6bc2d8c7648ed1b4ab366097baf5b06f167ccd19d2adb0a195ad652635181573785f9e9fa208d163f22b6527310eb939455d7ee3bc141cbeed5
-EBUILD ipt_netflow-2.6-r1.ebuild 2421 BLAKE2B 5c3581f13ff1799910f73b09d8b7a52b5d02d270f1a8b4ff3b3391e0566d7bd0f65b2530001fc48765dfc4a956f3c67e56d69d363f21103bc3d39ad2479efbcf SHA512 7d04fd0cb237420257161f574255bf7c502624e7924a171b6d784c1af43688429c9000b73d5a1c71288f453acd655f561c4b084680fc752a7ed642ddf9090ca6
-EBUILD ipt_netflow-2.6.ebuild 2445 BLAKE2B 4ee244f7901e566aa7e322aa48221d8320be810b38ffc5a3942170fa176a125dd62dcbdbe7e9a3a6e00845a7310ca13d43458f63ba2d6b69a9d43b62d85155f4 SHA512 68f3fed5a7719f59e8b76ea90b78f2ab902eee6e6e9aa87fcd087790bdd7e7df7497297ae2900434572ad617a565b29f7684774cb6e108f99b597a066ed27919
+EBUILD ipt_netflow-2.6-r1.ebuild 2419 BLAKE2B 2760633b8f3ef0a060fb3d02f9acd3b19a345b3ee5e24206cb3014feb8169733a6b1b1d5f459345787a2c0736807a7a78db3b47bba60ba476a2b8c8628c27cb1 SHA512 7a27a79add050b2b83b81128a1521b98c8e92dbb6cc897214faf867b143fc895c12b0daa2627837e434cb9e8697a7a10e4c52bd85b80da2ddbebcf6226bfdc05
 EBUILD ipt_netflow-9999.ebuild 2303 BLAKE2B c6f6f15eae8f8e7837b2e0d14658c4c7cccec3441f55fe96edc25440cc78526b4a7cb737de06be9842ac904047ba96af40d447d91f6b29f461b278c5e0d469ff SHA512 e5da85534c11907e415896afa39658c9f4fdc2d6c7699244d4a10f736b4cc51de3c85167c486ddcc2af1cf48854277dfc215a1e1f16112cc82a96fed2d86a480
 MISC metadata.xml 618 BLAKE2B e2a825f374a432c7d1abe90ab4ac3af148428db80fb28117dd2865bc7b80cc05af5dff3343b95ce0a60ab92fd4ccbc1061d61442f3f03249d8bff2e85b471408 SHA512 0aae1d806aee7b372d9faa2788c51726e44fd0b1784a8118a3a36fdbbbc2cdc85abd9a5f71be78abc13483b0a5d6f6a067f72f9f8c89b1dd97f63f6921f92263
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
index 63f30e67a15b..5cbcfb78c715 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="natevents snmp"
 
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
deleted file mode 100644
index a26ec1f4b629..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="
-	https://sourceforge.net/projects/ipt-netflow
-	https://github.com/aabc/ipt-netflow
-"
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.6-gentoo.patch"
-	"${FILESDIR}/${P}-ref_module_fix.patch" # bug #781014
-	"${FILESDIR}/${P}-fix-linux-headers-5.14.patch" # bug #813993
-
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK="BRIDGE_NETFILTER ~IP_NF_IPTABLES VLAN_8021Q"
-	if use natevents; then
-		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
-		if kernel_is lt 5 2; then
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow)"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-}
-
-do_conf() {
-	tc-export CC
-	echo ./configure $*
-	./configure $* ${EXTRA_ECONF} || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# this configure script is not based on autotools
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--disable-dkms \
-		--enable-aggregation \
-		--enable-direction \
-		--enable-macaddress \
-		--enable-vlan \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-
-	exeinto "${IPT_LIB}"
-	doexe libip{,6}t_NETFLOW.so
-
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}