--- /usr/portage/net-firewall/xtables-addons/xtables-addons-1.39.ebuild	2012-03-12 13:49:29.000000000 +0000
+++ overlay/local/net-firewall/xtables-addons/xtables-addons-1.42.ebuild	2012-06-07 22:21:33.301016036 +0000
@@ -14,18 +14,16 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="modules"
 
-MODULES="quota2 psd pknock lscan length2 ipv4options ipset6 ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account"
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account"
 
 for mod in ${MODULES}; do
 	IUSE="${IUSE} xtables_addons_${mod}"
 done
 
-DEPEND=">=net-firewall/iptables-1.4.3"
+DEPEND=">=net-firewall/iptables-1.4.5
+!<net-firewall/ipset-6.10"
 
 RDEPEND="${DEPEND}
-	xtables_addons_ipset6? (
-		!net-firewall/ipset
-		net-libs/libmnl )
 	xtables_addons_geoip? ( virtual/perl-Getopt-Long
 		dev-perl/Text-CSV_XS )"
 
@@ -34,7 +32,7 @@
 
 SKIP_MODULES=""
 
-# XA_kernel_check tee "2 6 26"
+# XA_kernel_check tee "2 6 32"
 XA_check4internal_module() {
 	local mod=${1}
 	local version=${2}
@@ -61,12 +59,9 @@
 		linux-mod_pkg_setup
 
 		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost ipset6"
+			SKIP_IPV6_MODULES="ip6table_rawpost"
 			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
 		fi
-		if use xtables_addons_ipset6 && kernel_is -lt 2 6 35; then
-			die "${PN} with ipset requires kernel version >= 2.6.35"
-		fi
 		kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29"
 		XA_check4internal_module tee "2 6 35" NETFILTER_XT_TARGET_TEE
 		XA_check4internal_module checksum "2 6 36" NETFILTER_XT_TARGET_CHECKSUM