--- /usr/portage/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild	2004-12-16 22:41:26.000000000 +0100
+++ /usr/portage/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild	2005-01-05 16:19:20.272028164 +0100
@@ -10,7 +10,7 @@ 
 LICENSE="BSD"
 KEYWORDS="~x86 ~amd64 ~sparc"
 SLOT="0"
-IUSE="selinux"
+IUSE="ipv6 selinux"
 DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
@@ -18,7 +18,7 @@ 
 
 pkg_setup() {
 	my_KV=`echo ${KV} | cut -f-2 -d "."`
-	if [ ${my_KV} != "2.6" ] ; then
+	if [ "${my_KV}" != "2.6" ] ; then
 		echo; eerror "You need a 2.6.x kernel to use the ipsec tools!"; die "You need a 2.6 kernel to use ipsec-tools!"
 	fi
 }
@@ -27,11 +27,17 @@ 
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc34.diff
+	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c || die "sed"
+	epunt_cxx
 }
 
 src_compile() {
 	unset CC
-	./configure --prefix=/usr --sysconfdir=/etc --with-kernel-headers=/usr/src/linux/include || die
+	myconf="--prefix=/usr 
+	--sysconfdir=/etc
+	--with-kernel-headers=/usr/src/linux/include"
+	! use ipv6 && myconf="${myconf} $(use_enable ipv6)"
+	./configure ${myconf} || die
 	sed -e 's:AM_CFLAGS = :AM_CFLAGS = -include /usr/src/linux/include/linux/compiler.h :' -i src/setkey/Makefile || die
 	sed -e 's:CPPFLAGS=:CPPFLAGS = -include /usr/src/linux/include/linux/compiler.h :' -i src/racoon/Makefile || die
 	sed -e 's:va_copy:__va_copy:g' -i src/racoon/plog.c || die # GCC 2 Fix