--- /usr/portage/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild	2010-08-24 15:48:01.000000000 +0200
+++ open-iscsi-2.0.872.ebuild	2011-05-31 01:47:50.535472526 +0200
@@ -7,14 +7,17 @@
 
 DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.org/"
-SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${P}.tar.gz"
+MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
+SRC_URI="mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="debug"
-DEPEND=""
+IUSE="debug slp"
+DEPEND="slp? ( net-libs/openslp )"
 RDEPEND="${DEPEND}
-		sys-apps/util-linux"
+	sys-apps/util-linux"
+
+S="${WORKDIR}/${MY_PV}"
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -38,9 +41,15 @@
 
 src_prepare() {
 	export EPATCH_OPTS="-d${S}"
-	epatch "${FILESDIR}"/CVE-2009-1297.patch
-	epatch "${FILESDIR}"/${PN}-2.0.871-makefile-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
 	epatch "${FILESDIR}"/${P}-glibc212.patch
+	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
+	cd utils/open-isns || die
+	econf $(use_with slp)
 }
 
 src_compile() {
@@ -48,36 +57,36 @@
 
 	einfo "Building userspace"
 	cd "${S}" && \
-	CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
+	KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \
 		|| die "emake failed"
 }
 
 src_install() {
 	einfo "Installing userspace"
-	dosbin usr/iscsid usr/iscsiadm usr/iscsistart
+	dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
 
 	einfo "Installing utilities"
-	dosbin utils/iscsi-iname utils/iscsi_discovery
+	dosbin utils/iscsi-iname utils/iscsi_discovery || die
 
 	einfo "Installing docs"
-	doman doc/*[1-8]
-	dodoc README THANKS
-	docinto test
-	dodoc test/*
+	doman doc/*[1-8] || die
+	dodoc README THANKS || die
+	docinto test || die
+	dodoc test/* || die
 
 	einfo "Installing configuration"
 	insinto /etc/iscsi
-	doins etc/iscsid.conf
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+	doins etc/iscsid.conf || die
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
 	insinto /etc/iscsi/ifaces
-	doins etc/iface.example
+	doins etc/iface.example || die
 
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-2.0.871-r1.init.d iscsid
+	newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
+	newinitd "${FILESDIR}"/${P}-init.d iscsid || die
 
 	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
+	fperms 700 /var/db/iscsi || die
+	fperms 600 /etc/iscsi/iscsid.conf || die
 }
 
 pkg_postinst() {