Generalize module + kernel version checking since XTABLES_ADDONS=tarpit doesn't build on linux-4.1 and above. Bug #553630.

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

4 files changed, 62 insertions, 41 deletions

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 6c92dbda0923..55cba2cc97fb 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.50 2015/07/06 12:38:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.51 2015/07/06 13:13:45 blueness Exp $
+
+  06 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  xtables-addons-2.6.ebuild, xtables-addons-2.7.ebuild:
+  Generalize module + kernel version checking since XTABLES_ADDONS=tarpit
+  doesn't build on linux-4.1 and above.  Bug #553630.
 
   06 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
   -xtables-addons-2.4.ebuild, -xtables-addons-2.5.ebuild,
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 2efbfb4e63b7..d4360a583003 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -11,24 +11,24 @@ EBUILD xtables-addons-1.37.ebuild 5228 SHA256 15ef815012c58c8a068d0962b0b2699fdc
 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.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
+EBUILD xtables-addons-2.6.ebuild 5661 SHA256 19e23813f874b03c8bebc3abd9079323519a22cf352a8e2eda39875e2c6f377a SHA512 33d3006cc71fbb5f085b91ee609bf0ea4f7665d94228e22e245a0e3ba83efb78e8d64efc72ca8a4d6db3ad1c1af6e53a8da54da0222bfa7ae7a84228bbe96651 WHIRLPOOL 4a3252080340e5361c17d76b068c50e03d83b2f3d49650fd2755d0e5edc16f3d3d1f235df1235190ec043e69b7c788782ab6ecabbb1fea82689a1cee0a47851f
+EBUILD xtables-addons-2.7.ebuild 5661 SHA256 7d64de0c769fa913d54297af65285167be421b9ec6934c614e91d36629eeecc8 SHA512 10fdf6082aab8b29d229cf989e417cad6d708cfed8be06d1a7d93372dec48c5fa12020ba6139b8f37ad0973c1f2c1966040b5a079379ab6937448bf76fd42658 WHIRLPOOL eac912482432e98ac8d2d8228219713f6389b7ffcc5bbce3c55e3b5142011d86b78f1b33f8a6876040c132c26e011657a5f6f90b76e045c7a1660f6895da363d
+MISC ChangeLog 8570 SHA256 911a752ef519c5f71cca08da6878f0adf6f5c6d72eac65b8731b06d68fcad421 SHA512 97707b7a9d6f2e8b0a99d838d094dcee1aa95cc747e525ac21feeda39eaf477be34122551e4c7bfe9ffdf9d9c6e6163fea3d1e1f8d700f9b845df8e7addfe9ba WHIRLPOOL 327fb756f9df49b61a022a3d361454249bafd8769d139853f3b1d18bb49477ed9570d6f1be9f233cd0dc532aa11b6cf03834797719020b61be37edb29793f159
 MISC metadata.xml 974 SHA256 0becb811339695296e9cf179f86485bfc7bf35bba5adc26b867e2e71464d55e9 SHA512 737730dc3d3c34e7d1f188942d9de97bcc358feb246c89d9d1a606e0f6665bcea1c774770861b4477918bbaa410026c44d7b216a3b29826d8fdc134b4bd85996 WHIRLPOOL 673b228688936dec8aa674f7d59d9d949ed0bbc622eae883972002dab546133bd65bb088f1a82c9f971fd75a64e10bc3ddb636ad86dd1a2aca5ac0a591ef8d87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJVmn+rAAoJEJOE+m71LUu6PJIP/jmi1osuWyNdn9meafXi1k6g
+7UyO/h4mdzEiGqJYzb22PqljLTV6imF760bIVm4UyoeLYXsjcdWS0JhKGNnMy9/F
+nY7F+RfgUZo/RBAB0m6YTSow8b3OFSJhrBdFXm93AhyV9GdGVWuRpreP9wedKbo9
+sVVwN9Ln7ieuhUnllYpt+I04wyDH3pVZL4smsddN0quuFlu5JgnqrIE4fXpVu6M+
+W1faC4RBSGsVEaXzS6tuI5ze5HZcVz7gSwpkq5t4en7dEA/2DcRU0ROMeWc3/kI6
+twhaGIT/39W0seFVS+da40QjpqOI3Z2C8A4iKmRRy7GN+4FdLw5ZP9x7iGq8E6aT
+SUJHIyvi9yDSsXzTf5yHhaq/3TZL5bxbKqhArSPz3HMNeR8oqoHNSYH/2QaHRIGE
+bSruERolUFUedCXYEtS5y283kq9ZnIX8mgDdVBxIf2uO9xyOChaF674tqXW57oGe
+8C5dQ6Omoma6bvh/sOtTjoSphx+tUyaNxjfcxmjgrTCe1UfqoTY9tXeIlPI1fkue
+GNwpqZboFuLs4c4XFW5dxZj6YlsYDwzIrrQuNgOad2dSaxlqy1geeRnWlwBihgod
+I5N5iJbCBor4OOpryf7JO9yNSIjTGW4gPl7dTmSKmgtwK2nPPrO/lhQ6ZnJ80wEu
+EKbK/NcZlYogPyMOAZa6
+=dIBB
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/xtables-addons/xtables-addons-2.6.ebuild b/net-firewall/xtables-addons/xtables-addons-2.6.ebuild
index 9028d4ca7e88..59570730c351 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-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.2 2015/07/06 12:38:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.3 2015/07/06 13:13:45 blueness Exp $
 
 EAPI="5"
 
@@ -119,10 +119,29 @@ XA_get_module_name() {
 	done
 }
 
+# Die on modules known to fial 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#c0.  tarpit fails on linux-4.1 and above.
+	# Bug #553630#c2.  echo fails on linux-4 and above.
+	XA_known_failure "tarpit" 4.1
+	XA_known_failure "echo" 4
+
 	local mod module_name
 	if use modules; then
 		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
@@ -139,17 +158,6 @@ 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 d77993c025d7..cb672f6ce91e 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.2 2015/07/06 12:38:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.3 2015/07/06 13:13:45 blueness Exp $
 
 EAPI="5"
 
@@ -119,10 +119,29 @@ XA_get_module_name() {
 	done
 }
 
+# Die on modules known to fial 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#c0.  tarpit fails on linux-4.1 and above.
+	# Bug #553630#c2.  echo fails on linux-4 and above.
+	XA_known_failure "tarpit" 4.1
+	XA_known_failure "echo" 4
+
 	local mod module_name
 	if use modules; then
 		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
@@ -139,17 +158,6 @@ 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