4 files changed, 12 insertions, 7 deletions
diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index c0c8319cb1e8..2edbf43e4825 100644
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/nbd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.38 2008/05/05 03:24:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.39 2008/05/05 13:27:52 vapier Exp $
+
+  05 May 2008; Mike Frysinger <vapier@gentoo.org> nbd-2.9.8.ebuild,
+  nbd-2.9.10.ebuild, nbd-2.9.11.ebuild:
+  The --without-klcc option is broken so sed the klibc path out #220317 by
+  Petr Pisar.
 
 *nbd-2.9.11 (05 May 2008)
 
diff --git a/sys-block/nbd/nbd-2.9.10.ebuild b/sys-block/nbd/nbd-2.9.10.ebuild
index 4607cf4bc82c..c60b2d454004 100644
--- a/sys-block/nbd/nbd-2.9.10.ebuild
+++ b/sys-block/nbd/nbd-2.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.10.ebuild,v 1.2 2008/05/05 03:23:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.10.ebuild,v 1.3 2008/05/05 13:27:52 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.9.1-headers.patch
+	sed -i 's:/usr/bin/klcc:/suck/it/k/l/c/c:g' configure || die
 
 	mkdir -p "${S}"/inc-after/linux
 	mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h
@@ -32,7 +33,6 @@ src_compile() {
 	econf \
 		--enable-lfs \
 		--enable-syslog \
-		--without-klcc \
 		|| die
 	emake || die
 	emake -C gznbd || die
diff --git a/sys-block/nbd/nbd-2.9.11.ebuild b/sys-block/nbd/nbd-2.9.11.ebuild
index e4c4b630256d..2a82d61db61e 100644
--- a/sys-block/nbd/nbd-2.9.11.ebuild
+++ b/sys-block/nbd/nbd-2.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.11.ebuild,v 1.1 2008/05/05 03:24:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.11.ebuild,v 1.2 2008/05/05 13:27:52 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.9.1-headers.patch
+	sed -i 's:/usr/bin/klcc:/suck/it/k/l/c/c:g' configure || die
 
 	mkdir -p "${S}"/inc-after/linux
 	mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h
@@ -32,7 +33,6 @@ src_compile() {
 	econf \
 		--enable-lfs \
 		--enable-syslog \
-		--without-klcc \
 		|| die
 	emake || die
 	emake -C gznbd || die
diff --git a/sys-block/nbd/nbd-2.9.8.ebuild b/sys-block/nbd/nbd-2.9.8.ebuild
index f0f46807db83..c95da708fda9 100644
--- a/sys-block/nbd/nbd-2.9.8.ebuild
+++ b/sys-block/nbd/nbd-2.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.8.ebuild,v 1.5 2008/05/05 03:23:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.8.ebuild,v 1.6 2008/05/05 13:27:52 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.9.2-gznbd.patch
 	epatch "${FILESDIR}"/${PN}-2.9.1-headers.patch
+	sed -i 's:/usr/bin/klcc:/suck/it/k/l/c/c:g' configure || die
 
 	mkdir -p "${S}"/inc-after/linux
 	mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h
@@ -33,7 +34,6 @@ src_compile() {
 	econf \
 		--enable-lfs \
 		--enable-syslog \
-		--without-klcc \
 		|| die
 	emake || die
 	emake -C gznbd || die