--- ipsec-tools-0.4-r1.ebuild	2005-05-09 13:45:17 +0000
+++ ipsec-tools-0.4-r2.ebuild	2005-05-09 15:04:38 +0000
@@ -10,15 +10,16 @@
 LICENSE="BSD"
 KEYWORDS="x86 amd64 sparc"
 SLOT="0"
-IUSE="selinux"
-DEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}
+IUSE="ipv6 selinux"
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6
 	selinux? ( sec-policy/selinux-ipsec-tools )"
+DEPEND="${RDEPEND}
+	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )"
 
 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
 }
@@ -28,11 +29,18 @@
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc34.diff
 	epatch ${FILESDIR}/${PN}-0.5-isakmp-underrun.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/include/linux"
+	! use ipv6 && myconf="${myconf} $(use_enable ipv6)"
+	./configure ${myconf} || die "configure"
+
 	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