The --without-klcc option is broken so sed the klibc path out #220317 by Petr Pisar.

Package-Manager: portage-2.2_pre5

5 files changed, 19 insertions, 14 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/Manifest b/sys-block/nbd/Manifest
index 21a726a3bbd5..8153c99d07d2 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -8,15 +8,15 @@ DIST nbd-2.9.10.tar.bz2 184424 RMD160 91dc4acfac41bf908ddf60e12e58686e386c6eb6 S
 DIST nbd-2.9.11.tar.bz2 185481 RMD160 2ed6c6db6b71e70d0bef7cd7132559d8a2bcc2a3 SHA1 f0dab3628a464548907d5402f04ce51e4f2c8c64 SHA256 5844d7b36776d88afea5bc82f688f6d738ce233001c3dddfdd081d54dbe4384a
 DIST nbd-2.9.8.tar.bz2 182724 RMD160 60e363a8a758a75234fd00df07052d3052572d29 SHA1 a951e7e51f0bad65a5f226d78f4a6bb529a459b1 SHA256 926d8ff69eed223d63e16f14da5cf896464697757bba8e2cccdd59e8965b589f
 DIST nbd-linux-include.h.bz2 1248 RMD160 f20d1ccf6b26a8e8edcb2d7c30ad2766a1a1dc3f SHA1 fe57ad39cad5ecd1dba76a05546239abc165a11a SHA256 df30a55e6cb83ed1a9060db83fd8b908b609c1fc2ce867c4b63b506f065c89fc
-EBUILD nbd-2.9.10.ebuild 1038 RMD160 463dc999c2e775f66eecf8bdaa19fcbf5d73ce1e SHA1 4a3dba9790d80d0f6c8ed7406040eef3898fdb91 SHA256 0f97bd0a6c982cd47a3c07aea327f5294be47b058757cbea3f389764e53bef14
-EBUILD nbd-2.9.11.ebuild 1038 RMD160 921562e3f2a65c9913074755409940fb98112e85 SHA1 263ec2fda43acf833180511bb0e14b6621589d7d SHA256 b5e857ba0c40c4d178b9bdc81254dcb598a1f7fab3cd45be47c914f4401031fc
-EBUILD nbd-2.9.8.ebuild 1079 RMD160 0eb08d02382c18f848a2a669789e7b118e970102 SHA1 6e97749cc6b836d4941a381d682a38aabf632536 SHA256 711755a3705284221d0b26beb1007171c8ed180778bfdc45f5cf639d47b2bf64
-MISC ChangeLog 6541 RMD160 ffa7165487d83f0645a3eeda025ff288c9178318 SHA1 1b36eefa7f2399cfba4ac29c8beeac0735f3fb2a SHA256 a28c519477ac6139f7186121baea251395a68cec340384595055f11777dc4248
+EBUILD nbd-2.9.10.ebuild 1081 RMD160 60d63def4f049d09d278ef07350b17269a7f68f6 SHA1 a09dbdad7226d4d0d8f20bc047d4f213f21fa10a SHA256 050107aa70326dc8132ec5eab40358158fd49c79f8aac98e1f345499c3126bfe
+EBUILD nbd-2.9.11.ebuild 1081 RMD160 107ee67f3cc20869dcf097188645d2576d557355 SHA1 5751383c0a12f4db238949a3be07a6ae417bfce0 SHA256 200edcc80de5753ec1dcf9c111eaac75350f02b6b64146a093e723eff1de17ab
+EBUILD nbd-2.9.8.ebuild 1122 RMD160 9a503da1c3628bfdb7ef5ebffa1c16000d4db61d SHA1 9b5daadf35e9d62cdbcd34276412ed43136da178 SHA256 f95c1b8421e232205e0e6dffc78814b37379dd1d6e82ac9d754d690af51599f2
+MISC ChangeLog 6739 RMD160 2a11ca6dac108e6fa45e079c873f3f63ac20ff94 SHA1 6e6ee4ed9a9ac8aae492bc70dbd2a2757b0a6a48 SHA256 dffdb7e1aa4ebc596195aaf13815870479a8fb001c4f3084514e2cbde50a5ab7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIHn3mj9hvisErhMIRAls0AKDNHA+xcDf7lNG9eNnz1c4wq4dJTgCg0YHp
-HwF3rkZxtgLbgCt8mjv0oOo=
-=ye4w
+iD8DBQFIHwtfj9hvisErhMIRAq/BAKCNXEYSdhmSHlOEGqFQhkqUpbc5ogCdFehp
+9npqcB3Sj5gOPxZuZzjVNXg=
+=HQNJ
 -----END PGP SIGNATURE-----
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