--- ipsec-tools-0.7.3-r1.ebuild	2010-01-10 07:10:27.000000000 +0200
+++ ipsec-tools-0.7.3-r2.ebuild	2011-02-06 17:30:00.000000000 +0200
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild,v 1.2 2010/01/10 05:10:27 mr_bones_ Exp $
+# $Header$
+
+EAPI=2
 
 inherit eutils flag-o-matic autotools linux-info
 
@@ -10,13 +12,13 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="idea ipv6 pam rc5 readline selinux ldap kerberos nat hybrid iconv selinux"
 
 DEPEND_COMMON="
 	selinux? ( sys-libs/libselinux )
 	readline? ( sys-libs/readline )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	ldap? ( net-nds/openldap )
 	kerberos? ( virtual/krb5 )
 	>=dev-libs/openssl-0.9.8
@@ -27,7 +29,7 @@
 	selinux? ( sec-policy/selinux-ipsec-tools )"
 
 DEPEND="${DEPEND_COMMON}
-	>=sys-kernel/linux-headers-2.6.30"
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.30 )"
 
 pkg_setup() {
 	get_version
@@ -74,9 +76,7 @@
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# fix for bug #76741
 	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c
 	# fix for bug #124813