XTABLES_ADDONS=echo doesn't build on linux-4.0.0 and above. Bug #553630.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

6 files changed, 47 insertions, 362 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 117ced4e94f4..6c92dbda0923 100644
--- a/net-firewall/xtables-addons/ChangeLog
+++ b/net-firewall/xtables-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/xtables-addons
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.49 2015/07/06 12:03:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.50 2015/07/06 12:38:13 blueness Exp $
+
+  06 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  -xtables-addons-2.4.ebuild, -xtables-addons-2.5.ebuild,
+  xtables-addons-2.6.ebuild, xtables-addons-2.7.ebuild:
+  XTABLES_ADDONS=echo doesn't build on linux-4.0.0 and above.  Bug #553630.
 
 *xtables-addons-2.7 (06 Jul 2015)
 
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 2078a38cecc3..2efbfb4e63b7 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -5,34 +5,30 @@ DIST xtables-addons-1.37.tar.xz 423784 SHA256 2b60a3ae1c71a5b802625b595edceb14ea
 DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
 DIST xtables-addons-2.1.tar.xz 316412 SHA256 1d788bf647d96cfbcc2e61c3a32702cfdde40fea857407d2674731b41ac3ae79 SHA512 df8617f8dbc386e1264063fa1650a18021a199e8d301b7a2133c840f1cd54d348d5b6e46b823a778feb9682d65d898c8d31c0df35ee2b914865b126485973973 WHIRLPOOL d9146f96fb5c166e2944d45b69c929f56fb8104df9599fb9bdc4be83fc6540f26782dd8fd8866a06b7b0531207db7ce41f95439efdb07f0fa5d73a34e2028cd0
 DIST xtables-addons-2.3.tar.xz 316452 SHA256 7ab43981d594131ec8d72d4604c92c25dcf67dd4cae6aabb71113238a27cdff9 SHA512 08d529f0a2fa96ba715d2142934d6568a3c4f0ddb49f06c3c4d4ac200de0a4d2b59a4007302b557ca21014cbacda104e7781df0d5158e5313a673a928453abcc WHIRLPOOL d9929c3ede195ae87fd5b063814f2d27a0ccc772b8cc7eaee7c4d551af58e9f91e4fbbf420c058522563ea9f7ee082e280f124118bee4997763eb35738e3facc
-DIST xtables-addons-2.4.tar.xz 312564 SHA256 c765a37ea9e8324832d68fd67fdfc2189db1cb9240f2b048aca6064ba9c13cdb SHA512 650182a9078c2ce9b66a26cc0f6224e1a5fc09bb88a714b44c6d0be9fbb73f83a19ab98d085ac24f22ba564d8614d62507ff71d45c1f305f037734f23a842915 WHIRLPOOL 3dd9916cb433b38ea470280a692491b71fbaef9d515d2c32d8c52b2a7507e84e9f0c3769c80043f0f43e4ebbb676d9937a7b23a9d37ea3393e1ed0a649c4c7f1
-DIST xtables-addons-2.5.tar.xz 313732 SHA256 2aea0a6ff04d64abfe0cc80b4f23b97e058b4595ab2e29b50ef3fe30952e230d SHA512 c5053d726a1ef93806a32da87f06038c3e8239b5bb4ee226320a27696b282cc10deb44d68a02bd67a5d434a9609be89e442671a71303806df6d7c7cdefee8fd0 WHIRLPOOL e5d3f8d5bc894dc7e85a2bba051969d1ea83d5e7a60733c22723adf30cefb07d97faa88082d42589f129bb8722a8f3480ff4bae0aa5c3bfa1c69b7715f19e9cd
 DIST xtables-addons-2.6.tar.xz 313824 SHA256 6f2347df8fdcedfe871fe989e62bb79a729d12b600c057454b21fda8fe9d525b SHA512 e493c7a6e6512f8240d211b4ba5bb9ed705fcef604dca4b2ade717dd45046464087250b4057d9b66c94de92e090c0269e47e2cf665362bfe620b3a942d83d10d WHIRLPOOL f9f06cb1c5c2ca6cdf673ce0c2fabb6c971c3184e4197caf66e983ec5447261f574b10953bce8383f4a24a021bf58d32932a66b55d2e98ada5a15e1b8d3a60a5
 DIST xtables-addons-2.7.tar.xz 320804 SHA256 ce64b607967e576ac4d1f4fd522d0c4d34feada9fd45a54113967a6a2b56a519 SHA512 69c371b8bb5e464a4514dd432027be88a0ad5ab343bbe8c1f3cc2150f86e5a811de7a5d8fee2688499e5e49ac1dc275520eeae9afeeb51ec1cfaacc57892954a WHIRLPOOL 24c441e72764062adea16a32c3b2e9255645d17a7cfeddd1c0839761f003b78abaad2b25de4c1efce8fc62354b5023b91f8468f06ccec6c816ef1b2b02492ffc
 EBUILD xtables-addons-1.37.ebuild 5228 SHA256 15ef815012c58c8a068d0962b0b2699fdcd20aaac1906b3b0b649c967d45e382 SHA512 21190fb4c3d0212fb29f51f232dbe762ae0f43bf6c903c18aec8f8894bdb42de80819767e25d157c263592260dc9c3636a369045475c6a1d9e2685c41158947f WHIRLPOOL c2a13ee8cc9ec0fda756213bef2d56e5df6b982f15be97fce5a1638a722083d643b2361de0f5476b7c71872f79084772474bdb626810a6daa9ad0eb5f5fa49bc
 EBUILD xtables-addons-1.47.1.ebuild 5265 SHA256 d5295bd97c8df0909859cf5e5f462777986de609e177f3c3c754e10507c30a3d SHA512 a364882eb9dd8d8b07a70b573321bb55e8d0adb79ca2773cc74274f49b05ee7ac868d267f48e7ef9bb7fdf598655771ac2304cfa1a1859c0ad17c77d929bd102 WHIRLPOOL 18c41bb43ca3a729be86a0a99a8500c706df05f00cf39c49d090f5bd53047cc2d78ec593b40a6f3039b5899a924cad77b6d031daed69d68cac4f508db62b725a
 EBUILD xtables-addons-2.1.ebuild 5096 SHA256 70d60abd4a0c3adfd79e65d512cbd8eaf9752094751c7564a7615ba2f0ca0f31 SHA512 b5171c3db68277d4055db2096b8440fec64789d96e524c4da3c1d052aa52cc650a4db7591d733d18f5a8d8a7c8f3239f1831157ac00264203e54a6770b1b6bd0 WHIRLPOOL 2bc1f8168b4ba1ef32275af72babf58f83e3ff98bb098e689a834ad13eebf69b885712f7e786c7e56da2ef009a5a7b5d0b372b6bb2affe4f89eee8b63b763533
 EBUILD xtables-addons-2.3.ebuild 5093 SHA256 8e0e08df4d4d7a3c382969050f892e97dbb3a074037921e551a9695f368bad56 SHA512 0b3a62d3c3def3d45185cf5ba506a96f7393c2f35e60a37ee6b2e647d2b6967de43c51e295186c9102842d8da2fdb80e65d5220456496322d42eb8f61c02e51d WHIRLPOOL e46496dff1879f93b5b83f94c437208e8f1b0532a0476f9b7af085da7ba4d4d0e2503ed39d0cf8c35d4efda5dc7c5c3d216fe348ae3352efb4ec67ef5d110b4b
-EBUILD xtables-addons-2.4.ebuild 5086 SHA256 662d4ab7c027f68a8adf6e432c9a2f5270af293faf1057bf7ac02d829b44ce8b SHA512 908e08739204e40f2d2c9414456a48bc260bd356f26bbd4ec0ffa007089ceebf792e1df43cea086e20ce00ec470ddf6c31c60aeaf10e818d44052e011108487d WHIRLPOOL 977d256a5e3906e572570dff5f6ffa8015cf6e89a735ac6c1e49d8c1def96ec5c22bda64aa270413f34d530dac76de95311021c8e4d10b3c8215c6e5828ec448
-EBUILD xtables-addons-2.5.ebuild 5086 SHA256 b08925a71932ff7d6a727d499eb8d798ce3133d48bedefd6af30ef34afd28b08 SHA512 20545f57dd5afb59a1e03f00cb747f21c4b1008e6fef18fa2b870422dabf59ce5d113b5497dc8bea71b4ef34f125557dc287487294fcfa0e9dae834944d4c11c WHIRLPOOL beee17506e9cb1d5993d17968b56d7c88362322ef0a2d04574135583dcee98b2ba454548380efce733a2b74fc83f27e397c5a314d46efd099568e9d4bca1aa27
-EBUILD xtables-addons-2.6.ebuild 5085 SHA256 c36f9447f8f85f3bf753a9bb7372eb77e3df5456146e8fc0b71af60290f88a7b SHA512 ba7482c66b2ed248a9820dc1274f4db78ea8ef43a5681ae0492c2507dbd71eb3ae2a38e09a94a5dfe9baf78bbaca61ebb702cc43da5222af28cfb479f7ef8af3 WHIRLPOOL 544d69da7c261cbe7284590b66f50cb84f19435d6136f4daeeed69522f45a997b553ed3e80d8e46dd345013160a8680ae91f7d363d8ac169b25da3ac03e70e8e
-EBUILD xtables-addons-2.7.ebuild 5085 SHA256 f44af4115a0593772f8451718b7c81a8a208ca06659944d04ac4afb211983ea8 SHA512 f85a201f7c3c192b30a8c5bc332a8b0be297999a3e6bbed229fb32567f1d07096cb251af11456bce34d7f85ae331c5687339cd600c4b7504f66ad85ee6d4093d WHIRLPOOL aaaa4f7e2753d27e4d0f31810e9af1cbd28c32d35b18c5974d537b8a946bf894bffb590f3495aa5a060e76f5c31507986572ce0c511fa2acdd794d199fd548c2
-MISC ChangeLog 8084 SHA256 cafb40a8ac92f4f6e11ba16c1e05127391ac29ae45c86a6e0039695bb7535bca SHA512 67e10643c53fd3aa98d045e1d9c14145af76bf02d16a5786c9dc1f1829cfbd1737b9f24185be0c538b2dfd4e83f04e4df335dad13f652ad54170a55c45c226af WHIRLPOOL cd7530bafa99fd3f6b4695d6608eea2f5313482faeb4b02247365fc8fb46c7370060e981de8684587148e476f60fad628c378008aaef8f67e31b40b0dd7a3df9
+EBUILD xtables-addons-2.6.ebuild 5405 SHA256 feaf14390dbe6ea642a2cfd38b7711a5065e27397a3f1aef3951faad2d052270 SHA512 70a45b0f2d057f3143c43590afbbfa7011b76bbfafc531f0f07333e06aba90af734ffc3e076c3cd24b7b76ec5b45a6cf6202e088603b0fc1220af9d9b59920af WHIRLPOOL 8dc66fd152766621e11c6e68ca1b2546b67746836890a1db3d84b74dbcc71d98045b7f5264aa2fbb17b15fa09faece0d6a842cf70d4ab29398133336f8998179
+EBUILD xtables-addons-2.7.ebuild 5405 SHA256 21a83fb8ec26c6df51ac82416f6dc15eb03bcb9030c12144eb0c2cd80888cc18 SHA512 7d877ef76858f739e100ad3a8aa6a574aa443034d2130d0deabc2af682cb34955aa4972b207b0d9cbfb5a85a033c0b1518711786430418e0f60c3cc917033ede WHIRLPOOL d4270440020951fd6ed76585937b60fbc8570e3a5c29de63a05faf319b2c3ab1612c909f90bf02dbe5bb56718d253709bf72650e98c485104c0e4384aa9e9ad5
+MISC ChangeLog 8330 SHA256 2fbc9651dc180b10c5b9359f6b91a8ebfcd4449064de4bfc96ace21238c7c738 SHA512 e40d3a58cbed36903e9b92dd31f7c86e9a6685c1226ddcba4d0e115fd4249bdd3548d731e8c8b4ff2caecc280b26afffa6214f86aaba485c0d630e1f3c91d81b WHIRLPOOL 6817b37afc60a7577f8ef3563031bd2fe8c7b20ee26c8e284fd0f750aef6690feca9d7141cbb52df2c3368c2d3ec23ad55c1089037e1092410680fdb76d3570c
 MISC metadata.xml 974 SHA256 0becb811339695296e9cf179f86485bfc7bf35bba5adc26b867e2e71464d55e9 SHA512 737730dc3d3c34e7d1f188942d9de97bcc358feb246c89d9d1a606e0f6665bcea1c774770861b4477918bbaa410026c44d7b216a3b29826d8fdc134b4bd85996 WHIRLPOOL 673b228688936dec8aa674f7d59d9d949ed0bbc622eae883972002dab546133bd65bb088f1a82c9f971fd75a64e10bc3ddb636ad86dd1a2aca5ac0a591ef8d87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVmm8lAAoJEJOE+m71LUu6aPkP/j5Ao6bvn7qeDz+JiZSX1yOV
-s9usEVWfS9tinbVgdF7QOJHh78txcKYOMNhIueNHxa7l0EPmGADRZPvUr1ofsyQy
-g+Ti7zmGaEZtKiubB0xlI5fuIOo2si50QNwic02RGqcAqjhFCDuIyKSvsh+j7pvZ
-pcfCOUQEg2KYPVzeekcCcNEyorVp3cci5H4F+hQHx6sN/OIqSI3tDsbGVkc/rnoh
-54tccxtCGS60lDduRbEAZUPF6yi4FsJsifgN7g+y93ZXLHg43m1FBbjBNBOnmsT2
-q6oMAxkFgd5QFwyon8iC8GpjQmEd937weEXtg3m5TZdR9Ila068z7l+RBod5sQTe
-qjsVJ8KFzPk3Wgs65cBOS8R2J3KU0sPdm/iyiJBplbTtJhmut0DKe1oWZUEp8LxR
-/mU7j5akQLaeBYs25BEKXZVQxrjnIwvbme2KXeQucYbn2PwmeeWM8I5QQpo2nqcE
-at0Ez00rlybwDU9/iAwZaYi+MwIKyJaWq4iVNmOIN+ilxvLwAcUGW27dp7S5LwJ5
-mU1AvcEcRz4pRxNOYOxGD/Du0VsLVN7Teps8Sn8egKxULRJP9aSaI5pssS1fQPHa
-OQMoXZqdoas9j90nBEJmDl0ZhCX09j2wZAkTnATTl+NwVrSc64NlmN4i0h61buOz
-DhCs2XyG5D5V2AXAIGtj
-=qwB8
+iQIcBAEBCAAGBQJVmndYAAoJEJOE+m71LUu6ThsP/3ujqbOAY5s4JmNshVCt5uNo
+Rxp3Lc34MqvniqqrOp5GHIBVwqkyDUC4yw2vUVZgXPi7DHm2EAQu41jZJdT1oIX2
+EHNHDA5Cv+eG6o1qLi6m2RX59u5Te46du61JQjlp8zVHWDdDNi7KYxNoYTlcAt8l
+4kGAOV4ALSlVs8VFinmRa4rCmS8RWy9AcqZLm5tnEMtvkjp44w6a9CWRwvkI6xxJ
+YfDXdOgooMphdeHcO/s8HogRdcRjPcwsH90z+bDtyJ9iMFuS/jIG/lQVlcmdmfah
+aYyW1CzN7kg0ORxkeShFVR+s8GsjuKYuwjjr8J2W0sKU4KqxsP16DLS12CxN8hG7
+NHs9EPRNWHm6YwLcGjNvhNexOOZVjS2ZLX/u/t0dpO9Bl4B1Ja6kzpoZJHxsshCx
+ViPDjGOfvjqnGHYQEwpW2OvF7JSd3/vGmD+8vlBX0FQTdMXu0fts829UgJHR/5cG
+t3bh8BGHKcuq8IAcJ9focGdWxUMMXr6HVjtYqZ4RlXZeMvhgahJthkYSONkvftWc
+Vk6zUocDZg6optL4v36Mpwf7+LG/QOT25O4v1aYMIDJHMPT4Ju0vUc2+LdbwTpPY
+CYTbZLV5x9yCuu8qBssLLzV70ftPjBpQYKBqsc7SKt6YixdPQRAz8losFYJtCcYi
+ui9wt4E+ya4FbuHn57zi
+=xNdh
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/xtables-addons/xtables-addons-2.4.ebuild b/net-firewall/xtables-addons/xtables-addons-2.4.ebuild
deleted file mode 100644
index 0c0f4a6a3642..000000000000
--- a/net-firewall/xtables-addons/xtables-addons-2.4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.4.ebuild,v 1.1 2014/06/26 13:22:40 maksbotan Exp $
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="modules"
-
-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_kernel_check tee "2 6 32"
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${2}
-	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
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	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
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_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-2.5.ebuild b/net-firewall/xtables-addons/xtables-addons-2.5.ebuild
deleted file mode 100644
index c044248fc475..000000000000
--- a/net-firewall/xtables-addons/xtables-addons-2.5.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.5.ebuild,v 1.1 2014/06/26 13:44:44 maksbotan Exp $
-
-EAPI="5"
-
-inherit eutils linux-info linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="modules"
-
-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_kernel_check tee "2 6 32"
-XA_check4internal_module() {
-	local mod=${1}
-	local version=${2}
-	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
-}
-
-src_prepare() {
-	XA_qa_check
-	XA_has_something_to_build
-
-	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
-}
-
-src_configure() {
-	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_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-2.6.ebuild b/net-firewall/xtables-addons/xtables-addons-2.6.ebuild
index 1db40f8d55f0..9028d4ca7e88 100644
--- a/net-firewall/xtables-addons/xtables-addons-2.6.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.1 2014/09/30 21:35:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.2 2015/07/06 12:38:13 blueness Exp $
 
 EAPI="5"
 
@@ -139,6 +139,17 @@ src_prepare() {
 			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
 		fi
 	done
+
+	# Bug #553630.  echo fails to build on linux-4 kernels.
+	KV_max=4.0.0
+	if use xtables_addons_echo && kernel_is ge ${KV_max//./ }; then
+		eerror
+		eerror "XTABLES_ADDONS=echo fails to build on linux ${KV_max} or above."
+		eerror "Either XTABLES_ADDONS=echo or use an earlier version of the kernel."
+		eerror
+		die
+	fi
+
 	einfo "${MODULE_NAMES}" # for debugging
 
 	sed -e 's/depmod -a/true/' -i Makefile.in || die
diff --git a/net-firewall/xtables-addons/xtables-addons-2.7.ebuild b/net-firewall/xtables-addons/xtables-addons-2.7.ebuild
index 41d5b3db8aae..d77993c025d7 100644
--- a/net-firewall/xtables-addons/xtables-addons-2.7.ebuild
+++ b/net-firewall/xtables-addons/xtables-addons-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.1 2015/07/06 12:03:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.2 2015/07/06 12:38:13 blueness Exp $
 
 EAPI="5"
 
@@ -139,6 +139,17 @@ src_prepare() {
 			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
 		fi
 	done
+
+	# Bug #553630.  echo fails to build on linux-4 kernels.
+	KV_max=4.0.0
+	if use xtables_addons_echo && kernel_is ge ${KV_max//./ }; then
+		eerror
+		eerror "XTABLES_ADDONS=echo fails to build on linux ${KV_max} or above."
+		eerror "Either XTABLES_ADDONS=echo or use an earlier version of the kernel."
+		eerror
+		die
+	fi
+
 	einfo "${MODULE_NAMES}" # for debugging
 
 	sed -e 's/depmod -a/true/' -i Makefile.in || die