gentoo resync : 22.06.2019

11 files changed, 12 insertions, 786 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index c2c453ec4e1c..c601853e98c6 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index c29d9b209e80..e4d5f859abbf 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,4 +1,4 @@
 AUX fwbuilder-5.3.7-qtbindir.patch 1833 BLAKE2B 715f3e218f2e1dd48a58b969da0035bc0caf228d928fc17b3035a57b2170f50efc29d9199193530894ccaae096a285a655093d63548d4a0450fb611833d642cc SHA512 926ea0ebd8fbb58e37c225d84b1e6674ee4e8838ebad35303045e982b689d9b511057d3bdbc93039ad9aa0cd58d875ddcf1717d83c77208bfd1aa125b7b7c2de
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
 EBUILD fwbuilder-5.3.7.ebuild 1419 BLAKE2B 554981de2730a50840309e822c73ca362abfd22c58fce313cfaefc179a5a85d80d46b1ab0d8db628a4dcc1437dd60fa8206046ddef688343dabadc69b7bab509 SHA512 778f843817d904b2348a9565e2eefa4587b654300696633a485de2bd3c9bded0cd98c0a571dfccf2881ca32dd3464c846ebf9e89c805272c9cb46674f9c578cc
-MISC metadata.xml 520 BLAKE2B 396078caf521038a991589d7aaca8c6c35cec058a3e163f15372512138bfef9c523b7759005c86884ee17522275877ecdef32bdec0085d6d46d7adceb6f962ef SHA512 deda312a012b6b7e342fa3b37d53a6c6fc2b5de129121314856ea659dad92cf3e7b17923f2942bc606deab719907a26e9908c35d087596291b05c0f2e1645e62
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-firewall/fwbuilder/metadata.xml b/net-firewall/fwbuilder/metadata.xml
index 797459b851a1..6f49eba8f496 100644
--- a/net-firewall/fwbuilder/metadata.xml
+++ b/net-firewall/fwbuilder/metadata.xml
@@ -1,16 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kevin.bauman80@gmail.com</email>
-		<name>Kevin Bauman</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">UNINETT/fwbuilder</remote-id>
-		<remote-id type="sourceforge">fwbuilder</remote-id>
-	</upstream>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 6d8e22047c24..34a99c9bb8f3 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,5 +1,8 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
+AUX ipt_netflow-2.3-flags.patch 1743 BLAKE2B 5c2cf2b603aae5017e685fbfcb76bf0a5be29b0e3f1299d2e72a516d80cd5479b92c463d4bb4ab192b9cd7b59ef59eeef673c12696a79d6517ec7346dbbe3b5c SHA512 b8a74b0f9daf0e532a8015b576b59e13948684bee8d22a2a62cd8d2a11e4d8d5a2d4b257842dab4df379c3549bdb39d9814bebe24573714e3bff2d2d765021ad
 DIST ipt_netflow-2.3.tar.gz 90987 BLAKE2B fbe46583e58e75e3cfe5cc5ad4e8b40d5040d6642f850c560c3e8aa831effa43cba8f25907d32b3b66721f4d5d5bb8579bafa82e4b8d1c9a2225a5c748d08dd9 SHA512 e5ba66da9cae6fb9652e5532383233d433dd30dd16634734860f7e6910e46080e562e2d72c74584a86ead31156cffd4c5c44b438f617a9e5b3e5fdc1470045fc
+DIST ipt_netflow-2.3_p20190619.tar.gz 92615 BLAKE2B f6fb8e33d847a050e81edd33cc11b2088e59a838924f6f371489e219d7207afefa6211ac7d55aa54d8d1579fe95d9ec5302bb533a7cf11bdb3df8e2e7a2e5633 SHA512 0ac101d660bc37eab05bf079321edd9578f2fd3b09627f329fab4940c8e2d554a449673d557603dc33897fdd3f8a7b054ff2ceb7cc338b86176b3630f2b50cba
 EBUILD ipt_netflow-2.3.ebuild 2434 BLAKE2B 8b179099f7f4aec0468d98beb3dfb8493bf28d51f54341aa513acaf1f8e56c290ae408e1f58f8a28014ee0e7de24855c1398ce083bc38e12c07c0b714ea9cd51 SHA512 f7a9e554e6c31391714ebef1e71c76314992f37d1a8a4a590e4a3e755735a1dc5cc65df6da4c9749d283cdb1aa9ec4dd357eb98ba4133df5ac9da5933674993f
-EBUILD ipt_netflow-9999.ebuild 2348 BLAKE2B fd64885b7311febbf232b7c3abe90571d62a92bef9cc40e6547fb90a3550d388e2f15421aef48821055be33efe23a83080b2a0562c714ee3fdeea061093d5bb2 SHA512 5d7db5bdab7c432f39eb1819b9c4aea68ceb1e27a765988dfb491929a2b4d66202517d2a88536e4fbe56fd9809cddc984d8e0d6fd54fbfec50970a5db9b5eafc
+EBUILD ipt_netflow-2.3_p20190619.ebuild 2364 BLAKE2B 75dfc59071e42c3cf41d143ac0f39f5d46ff2e1038277be8c18e86ccdf7e98b5c3d7fddab3937584f649e15720aea85c655ba72f5d44fb714b6fb8e4a47571bb SHA512 1ebeac39f3d452ce228b0a7dcf00ae44d688235cd860c5a93226df8139713cbed40279411ae0358038efaff8df318de54c38dfaa039f4f510ef722e72f1e515d
+EBUILD ipt_netflow-9999.ebuild 2213 BLAKE2B 86d31675a1eaaf8784877c9ab79fa145ecd8b0b642538c6c55f948bbc363e80b40f9246e83f9c72ccb2714f2d54204fdfe0678191ebbe7dbe6950574f1ea5c10 SHA512 b32559221c6fb4daa34785bec8993aebf376ae071c071279d95e507835d3cc5b31e515fcfc5ec047f49f93b247531a8c87f8409c688df0b8898d306a9b6b4e10
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
index 6d8feeb6e0a2..71ba1b74afbf 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
@@ -25,36 +25,29 @@ DEPEND="${RDEPEND}
 	virtual/linux-sources
 	virtual/pkgconfig
 "
-
-# set S before MODULE_NAMES
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
+	"${FILESDIR}/${PN}-2.3-flags.patch"
 )
 
 pkg_setup() {
 	BUILD_TARGETS="all"
 	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
 	IPT_LIB="/usr/$(get_libdir)/xtables"
-	local CONFIG_CHECK="~IP_NF_IPTABLES"
+	local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
 	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
 	use natevents && CONFIG_CHECK+=" NF_CONNTRACK_EVENTS NF_NAT_NEEDED"
 	linux-mod_pkg_setup
 }
 
 src_prepare() {
-	sed -i \
-		-e 's:make -C:$(MAKE) -C:g' \
-		-e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		-e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' \
-		Makefile.in || die
+	default
 
 	# Fix incorrect module version in sources
 	sed -i -e "/IPT_NETFLOW_VERSION/s/2.2/${PV}/" ipt_NETFLOW.c || die
 
 	# Checking for directory is enough
 	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-
-	default
 }
 
 do_conf() {
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 4a04175e8e83..1cf0f9f494b8 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,13 +1,5 @@
 DIST xtables-addons-2.13.tar.xz 322116 BLAKE2B 31d12adcfdf2043b44b5789f3ba3215197ff48d378b20fd6406f6afd22739e04069f08f32214a2230ec797469b236788dbebef079855539994db69be358ec421 SHA512 51cfa963d6f2f931b0361746e0b48f5ecf43a14e9e8d5297ef55faf0e9f8d1deb4641e88e3fea2afdbb3e39dd06d414de6057fb4a21e5184d4ea3d21b8028497
-DIST xtables-addons-2.14.tar.xz 322296 BLAKE2B f739951ff535f73be8c96b271f929821fd708cb4615a3e6c2528d9bd2574c8d801c6ac6b59f23f5054b29c31a94f90c7d3f7628b09fb78dc2e7f7da87e5af0a1 SHA512 f3d49c53aa01fadc334906e580f16605849fe7be83637fa73d51b48ded0e77c368c544ad69fa97b53a6688eaa3ba63bab489c150a9e02205e8044cdd521f4752
-DIST xtables-addons-3.0.tar.xz 321960 BLAKE2B ce6e034ab42fda319217b464a2c3c639787a696d58739cc7ba8e1c699894c46590c34490c8ccc41c29b8dbfb4ad01859050bdeccbac08d09f297a49cdc920c6e SHA512 164b43ff23f33187b5f557bedf765fbad21721b236ac5f5e982c5fdf88cdcbf8ca106810d2df31d9ab79e9c518f7fec3d7dae297540d0b00326a0dfffd04cfec
-DIST xtables-addons-3.1.tar.xz 323684 BLAKE2B eb75bf41c7ca2f1b1dc41bb7c602de8856e86db244a4e247e3089037e176d5f84e472719e7fc31836e898b615f8b6630ddeacf0754807e6684a22aa593550b1a SHA512 d9cbd3278ac156b3edb024bad98dab2bb1f83546aacf038b85b9203064e301de17c638dae4e05ea907b00b4038377e9aefebb65367ffc335b149f7e17596d931
-DIST xtables-addons-3.2.tar.xz 323608 BLAKE2B a23ae7d779d7cb2f77f2c0cceae54c1b73fa9dcb9dab22a83c2af22562d2c1b1d0a6df7eef7809961d1cb0484793a65a57259af4934b3e7fe624c20c397ce215 SHA512 57b02aec83765ad407a813cc8bb5ba471739da09ee8177094592833d1eaa54300ce06b326e9897cb80f563bdaec24b33d42c2cdb72f8a0ec8f86b085fcc6494d
 DIST xtables-addons-3.3.tar.xz 322676 BLAKE2B caea009b76e813d72a0490ac961be8e97340b6afda078062104ad8a320d7e6e673450232a0f670829b616e07596397e72c51c8d21f905c664749de6301dec12e SHA512 76e76f8cb385d1f471b01c60be1561910123a4a083374a3976fae98943197c3e77fad62363addba8d14d0aaf23713df9a10a22b1906bbdbb702a61c297d3cb3c
 EBUILD xtables-addons-2.13.ebuild 5499 BLAKE2B 165def630f60562886928e7cc45a58c2446dc345745fcb0bc8245681042d88eef72001c3d8c2c86d085bb7dd9596567f64366319bf4e403146459355fef30c62 SHA512 fce73d0812ae0923585fd5d02878677a8364cb5c256e411ff579bd60ac446188981c72bf534dcc0168098d727c404d567e42855aa24474c874ca562ec1e017ac
-EBUILD xtables-addons-2.14.ebuild 5501 BLAKE2B b0f5d1b577cee3effc7d24d342c36b3f49678860d2a498f496722b5e43d96d0a03f446c07753c0bd02ce908476f1076fb27421e23cb95739ec8d04091d95f56f SHA512 f9b1c681220f335fc4a258f487ea637780f2d8723429df78879b648c1da692d9695493c9de85d4e5b20cda4a399bdaef0b1ca5e2826ec4fa585180de9acc8f50
-EBUILD xtables-addons-3.0.ebuild 5503 BLAKE2B 62a2b6f18a5b8f42b2f593e913340476abd2c32cc6a66d68647d8618fef85a1068181b2d5c099a71c2cd599641c3e743392302c883e05c9f1209a7026e9fdbac SHA512 d3168387cac66c155c2bc7e3db3d46efdb684049f6c73833d5e83b097f2261578be89b20b1c58e80d923dcf34afe13b3fd4518a8ac7ef4c97a4185d9ce0b9d9f
-EBUILD xtables-addons-3.1.ebuild 5446 BLAKE2B 639870cffe55f38a98967830b1a12ea422090319a8a1afc991b36ef960d2fd4541e2678bdfa188707fcc756a4110b25e986f5055932b2024b111f78e7b8d2164 SHA512 0f6fa016b58d4739d9b0770925ef1cd26ec7b658e1f5bb211ba578b352c7612e270a2c4fe8bcef59d5f7c4792cc966e7367e671ad9eb7a79d0c3d365453a3984
-EBUILD xtables-addons-3.2.ebuild 5446 BLAKE2B 639870cffe55f38a98967830b1a12ea422090319a8a1afc991b36ef960d2fd4541e2678bdfa188707fcc756a4110b25e986f5055932b2024b111f78e7b8d2164 SHA512 0f6fa016b58d4739d9b0770925ef1cd26ec7b658e1f5bb211ba578b352c7612e270a2c4fe8bcef59d5f7c4792cc966e7367e671ad9eb7a79d0c3d365453a3984
-EBUILD xtables-addons-3.3.ebuild 5446 BLAKE2B 048a3518605916ce4d7a0a74f51cbdb641f87737970fb1e07a7edfa651aa923bd1bd3eb99271814d582204a3ff6daf520a251a4c29c96fe9dd194d06fb879c0f SHA512 c7fff35bb77561d752efeddeddf45384a1cc9bba24a8f13d9158708dcef1faaf9a99c1124cf69b9597f42cdf7e84691d34c9710f73e8c5ebd1149ced8114e4ba
+EBUILD xtables-addons-3.3.ebuild 5471 BLAKE2B d0d15134eaa4adf16cbfeb289dd3bfbbf3fce8635e0448a23298e3e275016a735fcbe08fb1427de7203344a5c24eb839d6eedae360ab4bb238378a03abac7057 SHA512 f885f314f54bf2b26218f7daf06c763e004f19d2e36f3f658cff75f428a2ce5891ebd555f7b5464db129d6d419a4aca9339dbb2e5b861a30077e13f678a4ee8e
 MISC metadata.xml 775 BLAKE2B 3462baf963682f15042f1fe9a985fdce50d46abb5fbe1080f6ce5285314a3e24581d780d84112a5bed0a4a132ce17f29678983711a38745d0fd7969091e76182 SHA512 85474ba552703d77bc7cc18ccef424f5eeb68e23eb41e14a8c360afcdcb2632a99420fda2dca57ea15dbda3f850d939c16b18cbdc96dbfcf31a6af3f40743f0c
diff --git a/net-firewall/xtables-addons/xtables-addons-2.14.ebuild b/net-firewall/xtables-addons/xtables-addons-2.14.ebuild
deleted file mode 100644
index 5fc031f3e9ca..000000000000
--- a/net-firewall/xtables-addons/xtables-addons-2.14.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MODULES_OPTIONAL_USE=modules
-MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="iptables extensions not yet accepted in the main kernel"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.4.5"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${3}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-# Die on modules known to fail on certain kernel version.
-XA_known_failure() {
-	local module_name=$1
-	local KV_max=$2
-
-	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
-		eerror
-		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
-		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
-		eerror
-		die
-	fi
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	# Bug #553630#c2.  echo fails on linux-4 and above.
-	# This appears to be fixed, at least as of linux-4.2
-	# XA_known_failure "echo" 4
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-
-	eapply_user
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild b/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
deleted file mode 100644
index 80ab8675e8f4..000000000000
--- a/net-firewall/xtables-addons/xtables-addons-3.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MODULES_OPTIONAL_USE=modules
-MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="iptables extensions not yet accepted in the main kernel"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.6.0"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${3}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 4 15 && die "${P} requires kernel version >= 4.15, if you have older kernel please use 2.x version instead"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-# Die on modules known to fail on certain kernel version.
-XA_known_failure() {
-	local module_name=$1
-	local KV_max=$2
-
-	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
-		eerror
-		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
-		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
-		eerror
-		die
-	fi
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	# Bug #553630#c2.  echo fails on linux-4 and above.
-	# This appears to be fixed, at least as of linux-4.2
-	# XA_known_failure "echo" 4
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-
-	eapply_user
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-3.1.ebuild b/net-firewall/xtables-addons/xtables-addons-3.1.ebuild
deleted file mode 100644
index bbc32dee9f88..000000000000
--- a/net-firewall/xtables-addons/xtables-addons-3.1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MODULES_OPTIONAL_USE=modules
-MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="iptables extensions not yet accepted in the main kernel"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.6.0"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${3}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 4 18 && die "${P} requires kernel version >= 4.18"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-# Die on modules known to fail on certain kernel version.
-XA_known_failure() {
-	local module_name=$1
-	local KV_max=$2
-
-	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
-		eerror
-		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
-		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
-		eerror
-		die
-	fi
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	# Bug #553630#c2.  echo fails on linux-4 and above.
-	# This appears to be fixed, at least as of linux-4.2
-	# XA_known_failure "echo" 4
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-
-	eapply_user
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-3.2.ebuild b/net-firewall/xtables-addons/xtables-addons-3.2.ebuild
deleted file mode 100644
index bbc32dee9f88..000000000000
--- a/net-firewall/xtables-addons/xtables-addons-3.2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MODULES_OPTIONAL_USE=modules
-MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="iptables extensions not yet accepted in the main kernel"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq logmark ipmark echo dnetmap dhcpmac delude chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND=">=net-firewall/iptables-1.6.0"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? (
-		app-arch/unzip
-		dev-perl/Text-CSV_XS
-		virtual/perl-Getopt-Long
-	)
-"
-
-DEPEND="${DEPEND}
-	virtual/linux-sources"
-
-SKIP_MODULES=""
-
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${3}
-	local kconfigname=${3}
-
-	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
-		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
-		if ! linux_chkconfig_present ${kconfigname}; then
-			ewarn "Please enable ${kconfigname} target in your kernel
-			configuration or disable checksum module in ${PN}."
-		fi
-		# SKIP_MODULES in case we need to disable building of everything
-		# like having this USE disabled
-		SKIP_MODULES+=" ${mod}"
-	fi
-}
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
-		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
-		fi
-		kernel_is -lt 4 18 && die "${P} requires kernel version >= 4.18"
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	# Take modules name from mconfig
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	# strip .o, = and everything before = and print
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-# Die on modules known to fail on certain kernel version.
-XA_known_failure() {
-	local module_name=$1
-	local KV_max=$2
-
-	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
-		eerror
-		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
-		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
-		eerror
-		die
-	fi
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	# Bug #553630#c2.  echo fails on linux-4 and above.
-	# This appears to be fixed, at least as of linux-4.2
-	# XA_known_failure "echo" 4
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-	einfo "${MODULE_NAMES}" # for debugging
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-
-	eapply_user
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_OUT_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
-	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use modules && linux-mod_src_install
-	dodoc -r README doc/*
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}
diff --git a/net-firewall/xtables-addons/xtables-addons-3.3.ebuild b/net-firewall/xtables-addons/xtables-addons-3.3.ebuild
index f5b31b42fdca..a19790d7af14 100644
--- a/net-firewall/xtables-addons/xtables-addons-3.3.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-3.3.ebuild
@@ -26,6 +26,7 @@ DEPEND=">=net-firewall/iptables-1.6.0"
 RDEPEND="${DEPEND}
 	xtables_addons_geoip? (
 		app-arch/unzip
+		dev-perl/Net-CIDR-Lite
 		dev-perl/Text-CSV_XS
 		virtual/perl-Getopt-Long
 	)