Remove klibc-1.1.16 (its slacking, no distfiles either upstream nor on Gentoo mirrors), fixing compilation of 1.4.13 against 2.6.19 (#157618 - thanks to Mike Benson <mike at kambe.com.au> and all the others), putting dev-libs/klibc with the kernel herd.

Package-Manager: portage-2.1.2-r1

9 files changed, 59 insertions, 222 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 2b0954bd42a8..da6d1d34309a 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/klibc
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.34 2006/09/03 09:01:01 hansmi Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.35 2007/01/20 10:58:43 phreak Exp $
+
+  20 Jan 2007; Christian Heim <phreak@gentoo.org>
+  -files/klibc-1.1.16-mips-ldpaths.patch, -files/klibc-1.1.16-mips32.patch,
+  +files/klibc-1.4.13-resumelib.patch, metadata.xml,
+  -klibc-1.1.16-r1.ebuild, klibc-1.4.13.ebuild:
+  Remove klibc-1.1.16 (its slacking, no distfiles either upstream nor on
+  Gentoo mirrors), fixing compilation of 1.4.13 against 2.6.19 (#157618 -
+  thanks to Mike Benson <mike at kambe.com.au> and all the others), putting
+  dev-libs/klibc with the kernel herd.
 
   03 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> klibc-1.2.1-r2.ebuild:
   Stable on ppc.
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 84578832450d..549452c44ac4 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,15 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX klibc-1.1-mips32.patch 670 RMD160 ecab014d68b65837eb6088c21d95be0c23170cfc SHA1 68b24422a59e4479c636dfd4fcd56be06dc01db3 SHA256 42d127d2d5348b7856d33b7ffce986d49c7adbef82cf2bb34aa06a022fabad4c
 MD5 d771e07746a2d5b2bdac366cd992c885 files/klibc-1.1-mips32.patch 670
 RMD160 ecab014d68b65837eb6088c21d95be0c23170cfc files/klibc-1.1-mips32.patch 670
 SHA256 42d127d2d5348b7856d33b7ffce986d49c7adbef82cf2bb34aa06a022fabad4c files/klibc-1.1-mips32.patch 670
-AUX klibc-1.1.16-mips-ldpaths.patch 441 RMD160 002d2ca889741e004d842cc6e155503d66568f18 SHA1 1612dbcc7ffe50637b4033d8dd12af5078dd4f35 SHA256 25c65f443351fbdb59584a5867f6610c2f7fd722d2186089917568b23229d65c
-MD5 25555d8cb9cd5bca679f411b73a0d6f8 files/klibc-1.1.16-mips-ldpaths.patch 441
-RMD160 002d2ca889741e004d842cc6e155503d66568f18 files/klibc-1.1.16-mips-ldpaths.patch 441
-SHA256 25c65f443351fbdb59584a5867f6610c2f7fd722d2186089917568b23229d65c files/klibc-1.1.16-mips-ldpaths.patch 441
-AUX klibc-1.1.16-mips32.patch 711 RMD160 334e971cb4f31e89862b6bfdbbe54ae7c59b1478 SHA1 c5873c1f1548338f4b39233b92a91c6a3385c252 SHA256 b46340b0e1abb7284f2ef84724cdbffd52c760c71d2fe00f05d35065c372ae91
-MD5 bc6971ccb91f090d38a5490d630d8973 files/klibc-1.1.16-mips32.patch 711
-RMD160 334e971cb4f31e89862b6bfdbbe54ae7c59b1478 files/klibc-1.1.16-mips32.patch 711
-SHA256 b46340b0e1abb7284f2ef84724cdbffd52c760c71d2fe00f05d35065c372ae91 files/klibc-1.1.16-mips32.patch 711
 AUX klibc-1.2.1-nostdinc-flags.patch 1107 RMD160 ed4892fef55eba29608a4173be64272e053432a8 SHA1 13ae214d80dd6d28254605f9e803264313a9d17f SHA256 cff748eebde1405c76832b9f6f363101286ebbb741f6fb21423965539d660cfe
 MD5 61fb70164eba62770ed5c9d094c4528d files/klibc-1.2.1-nostdinc-flags.patch 1107
 RMD160 ed4892fef55eba29608a4173be64272e053432a8 files/klibc-1.2.1-nostdinc-flags.patch 1107
@@ -22,6 +17,10 @@ AUX klibc-1.4.11-interp-flags.patch 494 RMD160 71081dc5eae8fff2adc43873f6b447f9b
 MD5 82dedd1a4103f65349252a1b755d40ed files/klibc-1.4.11-interp-flags.patch 494
 RMD160 71081dc5eae8fff2adc43873f6b447f9b37a2432 files/klibc-1.4.11-interp-flags.patch 494
 SHA256 ef8c05d059bc0185b8b68ea42e660fa13ddb55e9653b10fbfdabd77dea7abe2a files/klibc-1.4.11-interp-flags.patch 494
+AUX klibc-1.4.13-resumelib.patch 474 RMD160 c0c04428a71e9d98d08a93d843b0ae30c1230848 SHA1 ed8431c78e854a6f7c61cf33fb5654ca0a5f67a4 SHA256 3cbe36c033f7dd39875aca2e0f1881a3b993768c84f296c10078476ff4080982
+MD5 617d52efc5e4f29c4758b511daf633a6 files/klibc-1.4.13-resumelib.patch 474
+RMD160 c0c04428a71e9d98d08a93d843b0ae30c1230848 files/klibc-1.4.13-resumelib.patch 474
+SHA256 3cbe36c033f7dd39875aca2e0f1881a3b993768c84f296c10078476ff4080982 files/klibc-1.4.13-resumelib.patch 474
 AUX klibc-1.4.7-nostdinc-flags.patch 1163 RMD160 bf741c5a26ac478ff19f6b59de6eaa387c2cee1d SHA1 d08f37cccd6315f9d01c9f237204862ddd621f14 SHA256 753e782a575562c6d30d3cfd4fd0366b28b178d8bced4b57b5eaa1b020205dd5
 MD5 a4c6e8236b9c25f6b558a418d88d571e files/klibc-1.4.7-nostdinc-flags.patch 1163
 RMD160 bf741c5a26ac478ff19f6b59de6eaa387c2cee1d files/klibc-1.4.7-nostdinc-flags.patch 1163
@@ -34,15 +33,10 @@ AUX klibc.m4 3619 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 SHA1 ebe928932
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 files/klibc.m4 3619
 SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 files/klibc.m4 3619
-DIST klibc-1.1.16.tar.bz2 451284 RMD160 869ed4a53f86bf33b12e5abfa8d343b70da5f8b6 SHA1 8058136ba91f06ab2bf00382b079d8ed03c2585f SHA256 3e7a6f303a7aca1fe938f860c9ee9c93ff7937644b9158bec07df7b1217e8d8b
 DIST klibc-1.1.tar.bz2 444770 RMD160 d25df89a8468f05e480ea7348c8cfa25aa4a061e SHA1 167832f15b48f0d7eda160eee4b05b9afa446a69 SHA256 42de47159a382d852750e38fe4877ee2f97f2ff4c47e27f3ce512193d31f63e7
 DIST klibc-1.2.1.tar.bz2 451620 RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d SHA1 ff09e5c083326299083846cced052058a291c5bd SHA256 c413b565ea6bd33d4f0af5ee3319d9bc1d804e5cb859b9f3284cad2c449d7c5c
 DIST klibc-1.4.12.tar.bz2 473002 RMD160 f10be3132faf99b2e75287c05aa5d1d12c58ebcf SHA1 e61fc2bc3ebebcb60e1e24096f8496d46d977049 SHA256 78f7330e156080809c82dce6d3461ed1f8a547db58bc99c162253c71f3865e89
 DIST klibc-1.4.13.tar.bz2 473178 RMD160 659f2b0f443547587f7eca46a01ce3b7a264f14c SHA1 36bf42f6225c522c4a930d217550ccf1b9178f60 SHA256 54d45fa13cf50cc0dfd7f960046e152e74cb80f150f816d4587cc7a140ea1d72
-EBUILD klibc-1.1.16-r1.ebuild 4240 RMD160 6661dd8da518731a420ff98d7dc3f4aabbbeac40 SHA1 fb616105b742112f4f0b9c9db70fec85e0514508 SHA256 7aecfa6e8f3a63fe3c855113c4e535ba93fdc212e9af5818ac1daa35d715858a
-MD5 92a3930943687a2c731a7a6eab4850cd klibc-1.1.16-r1.ebuild 4240
-RMD160 6661dd8da518731a420ff98d7dc3f4aabbbeac40 klibc-1.1.16-r1.ebuild 4240
-SHA256 7aecfa6e8f3a63fe3c855113c4e535ba93fdc212e9af5818ac1daa35d715858a klibc-1.1.16-r1.ebuild 4240
 EBUILD klibc-1.1.ebuild 4165 RMD160 322fb2a8bab3b1240ed44831507691be457677d0 SHA1 a193b334cdb3a86d6214ac877027116ce3898077 SHA256 94ef3179da75c07c197c830e644520b0032b0493601d8c3ee217f81d6f124230
 MD5 8aeec3288335b9aa00b16bf2c0ae45b6 klibc-1.1.ebuild 4165
 RMD160 322fb2a8bab3b1240ed44831507691be457677d0 klibc-1.1.ebuild 4165
@@ -59,24 +53,21 @@ EBUILD klibc-1.4.12.ebuild 6117 RMD160 f5732cb2378c8647088e3c78090918c385228820
 MD5 52151bbf0bc764dfd4aa468cbe3c6103 klibc-1.4.12.ebuild 6117
 RMD160 f5732cb2378c8647088e3c78090918c385228820 klibc-1.4.12.ebuild 6117
 SHA256 8d88bb5a7ea5a39ec7919a2853dd1326893a04bae5cf9086b7f23659da5820e6 klibc-1.4.12.ebuild 6117
-EBUILD klibc-1.4.13.ebuild 6117 RMD160 4f62a09344fd373eace221f61e288173cfd9fd0b SHA1 0796246f8dcb2cfe052dc1690dfcd7872aa05daf SHA256 fb8b98cd6dc16858410f4adbe71499913d401f2b45e9046881f2812717c6b688
-MD5 27578866b2384aeb0a4fcbe3a279e41d klibc-1.4.13.ebuild 6117
-RMD160 4f62a09344fd373eace221f61e288173cfd9fd0b klibc-1.4.13.ebuild 6117
-SHA256 fb8b98cd6dc16858410f4adbe71499913d401f2b45e9046881f2812717c6b688 klibc-1.4.13.ebuild 6117
-MISC ChangeLog 5721 RMD160 5117478b0bb44252f9bef01dc4807182c8128fa0 SHA1 f654783c7b6a3e51132fc23acb86d21d0aa877c2 SHA256 728136a69c21b89f2c90465d1d9b6168a515065c4e9dbaccf64fbd73be5818ad
-MD5 d6de7307d8a02100e8cc675ef74ba189 ChangeLog 5721
-RMD160 5117478b0bb44252f9bef01dc4807182c8128fa0 ChangeLog 5721
-SHA256 728136a69c21b89f2c90465d1d9b6168a515065c4e9dbaccf64fbd73be5818ad ChangeLog 5721
-MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0
-MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
-RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223
-SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0 metadata.xml 223
+EBUILD klibc-1.4.13.ebuild 6161 RMD160 815b7b973c2c9d954a203aac54eaed5de4704e4c SHA1 6295ba784f79dec30d4cc7e2c730d56bd6e8025e SHA256 d749437684ad62d15289ed84dcc2191d50de1ead2c81955f34c0b9f6568376c3
+MD5 b437293887bda037f25ffff523176dd0 klibc-1.4.13.ebuild 6161
+RMD160 815b7b973c2c9d954a203aac54eaed5de4704e4c klibc-1.4.13.ebuild 6161
+SHA256 d749437684ad62d15289ed84dcc2191d50de1ead2c81955f34c0b9f6568376c3 klibc-1.4.13.ebuild 6161
+MISC ChangeLog 6211 RMD160 6a69fc98dcdbb0086b0831901300f9900c6c808c SHA1 86753f94df3ae9cc6bec7eb9933ddabea0253a9a SHA256 199556bf396aa4e61b11879c442618f5226a1d435a8c7c7f72576e9d7f78b47f
+MD5 309c78e3b15cd51aacb047db2837df4f ChangeLog 6211
+RMD160 6a69fc98dcdbb0086b0831901300f9900c6c808c ChangeLog 6211
+SHA256 199556bf396aa4e61b11879c442618f5226a1d435a8c7c7f72576e9d7f78b47f ChangeLog 6211
+MISC metadata.xml 255 RMD160 75ae6908f50f0d53cbbb7701a46da40620fd2045 SHA1 b25e947b330f113c6e81ff1fcf7dd8942e2b5d6f SHA256 0423eac765a8f4f9045d4757f3ed0a4329d44e4ba43d83dc1b18a40a153b174f
+MD5 0e02063021e56846dae34e2f30b1936b metadata.xml 255
+RMD160 75ae6908f50f0d53cbbb7701a46da40620fd2045 metadata.xml 255
+SHA256 0423eac765a8f4f9045d4757f3ed0a4329d44e4ba43d83dc1b18a40a153b174f metadata.xml 255
 MD5 c8c9867a9085efbf2ca158aa9a777a4b files/digest-klibc-1.1 232
 RMD160 0bda0dcb23543c4f3567476873404d06ce7aae00 files/digest-klibc-1.1 232
 SHA256 8dde1dc4fbdb71a2953cd3302828ebad3706570900cdf2757238a3bdc4c0e2b7 files/digest-klibc-1.1 232
-MD5 9fc764dc447c0db7aae5025c343a7ff0 files/digest-klibc-1.1.16-r1 241
-RMD160 1abd5c4a05f0d033999430f179145eac9629f4ed files/digest-klibc-1.1.16-r1 241
-SHA256 02639e4bca80dc7e393c0a958b858c097015e2efdbac9d035908b0235ac04f66 files/digest-klibc-1.1.16-r1 241
 MD5 e2c54f1b35309be367759ba42ef5027b files/digest-klibc-1.2.1-r1 238
 RMD160 19cd909eb9419c8aa5c0e829dab15f8783188ae2 files/digest-klibc-1.2.1-r1 238
 SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/digest-klibc-1.2.1-r1 238
@@ -89,3 +80,10 @@ SHA256 f7f48c53b5630392ad4dcdd6603ff14bf4922f30a918dcde8836dda59f54ea27 files/di
 MD5 37cd7042545680010abe83dd5e52d6d0 files/digest-klibc-1.4.13 241
 RMD160 510d482cc1079a0026727837e952a6b15e6ea74f files/digest-klibc-1.4.13 241
 SHA256 ed62a4a37224c36d34369c3903a144f73e3c78b985f3457afb876e98059cdb3a files/digest-klibc-1.4.13 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFsfW5yuNVb5qfaOYRAinLAJsHpvt8qhKVOsZSrfNEb6G3ZtBo6wCeLISg
+l97b1UtZT0APFIImUtPe8yY=
+=SJYh
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/digest-klibc-1.1.16-r1 b/dev-libs/klibc/files/digest-klibc-1.1.16-r1
deleted file mode 100644
index 9d3adf70e4f5..000000000000
--- a/dev-libs/klibc/files/digest-klibc-1.1.16-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80b85e84306695ed61049720008dd409 klibc-1.1.16.tar.bz2 451284
-RMD160 869ed4a53f86bf33b12e5abfa8d343b70da5f8b6 klibc-1.1.16.tar.bz2 451284
-SHA256 3e7a6f303a7aca1fe938f860c9ee9c93ff7937644b9158bec07df7b1217e8d8b klibc-1.1.16.tar.bz2 451284
diff --git a/dev-libs/klibc/files/klibc-1.1.16-mips-ldpaths.patch b/dev-libs/klibc/files/klibc-1.1.16-mips-ldpaths.patch
deleted file mode 100644
index 0295cfee55fb..000000000000
--- a/dev-libs/klibc/files/klibc-1.1.16-mips-ldpaths.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naurp klibc-1.1.16.orig/klibc/arch/mips/MCONFIG klibc-1.1.16/klibc/arch/mips/MCONFIG
---- klibc-1.1.16.orig/klibc/arch/mips/MCONFIG	2006-01-06 01:11:43 -0500
-+++ klibc-1.1.16/klibc/arch/mips/MCONFIG	2006-01-26 04:24:46 -0500
-@@ -12,4 +12,4 @@ OPTFLAGS     = -Os
- BITSIZE      = 32
- 
- # Extra linkflags when building the shared version of the library
--SHAREDFLAGS	= -T arch/$(ARCH)/klibc.ld
-+SHAREDFLAGS	= -T klibc/arch/$(ARCH)/klibc.ld
diff --git a/dev-libs/klibc/files/klibc-1.1.16-mips32.patch b/dev-libs/klibc/files/klibc-1.1.16-mips32.patch
deleted file mode 100644
index 1e3ac5596637..000000000000
--- a/dev-libs/klibc/files/klibc-1.1.16-mips32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp klibc-1.1.16.orig/Makefile klibc-1.1.16/Makefile
---- klibc-1.1.16.orig/Makefile	2006-01-06 01:11:43 -0500
-+++ klibc-1.1.16/Makefile	2006-01-26 04:24:02 -0500
-@@ -14,7 +14,7 @@ include scripts/Kbuild.include
- export CC      := gcc
- NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include)
- 
--export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-+export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/mips64/mips/)
- 
- export HOSTCC     := gcc
- export HOSTCFLAGS := -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
diff --git a/dev-libs/klibc/files/klibc-1.4.13-resumelib.patch b/dev-libs/klibc/files/klibc-1.4.13-resumelib.patch
new file mode 100644
index 000000000000..ba22a82b8d02
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.4.13-resumelib.patch
@@ -0,0 +1,13 @@
+Index: klibc-1.4.13/usr/kinit/resume/resumelib.c
+===================================================================
+--- klibc-1.4.13.orig/usr/kinit/resume/resumelib.c
++++ klibc-1.4.13/usr/kinit/resume/resumelib.c
+@@ -12,7 +12,7 @@
+ #include <limits.h>
+ #include <sys/stat.h>
+ #include <sys/sysmacros.h>
+-#include <linux/config.h>	/* For CONFIG_PM_STD_PARTITION */
++#include <linux/autoconf.h>	/* For CONFIG_PM_STD_PARTITION */
+ 
+ #include "kinit.h"
+ #include "do_mounts.h"
diff --git a/dev-libs/klibc/klibc-1.1.16-r1.ebuild b/dev-libs/klibc/klibc-1.1.16-r1.ebuild
deleted file mode 100644
index c0627813a706..000000000000
--- a/dev-libs/klibc/klibc-1.1.16-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.16-r1.ebuild,v 1.2 2006/01/22 01:30:04 kumba Exp $
-
-inherit eutils linux-mod
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-DESCRIPTION="A minimal libc subset for use with initramfs."
-HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
-SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/${P}.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
-LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~mips ppc ~x86"
-IUSE="n32"
-RESTRICT="nostrip"
-
-DEPEND="dev-lang/perl
-	virtual/linux-sources"
-RDEPEND="dev-lang/perl"
-
-if [[ ${CTARGET} != ${CHOST} ]] ; then
-	SLOT="${CTARGET}"
-else
-	SLOT="0"
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-guess_arch() {
-	local x
-	local host=$(echo "${CTARGET%%-*}" | sed -e 's/i.86/i386/' \
-	                                         -e 's/sun4u/sparc64/' \
-	                                         -e 's/arm.*/arm/' \
-	                                         -e 's/sa110/arm/' \
-	                                         -e 's/powerpc/ppc/')
-
-	# Sort reverse so that we will get ppc64 before ppc, etc
-	for x in $(ls -1 "${S}/include/arch/" | sort -r) ; do
-		if [[ ${host} == "${x}" ]] ; then
-			echo "${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	# Make sure kernel sources are OK
-	# (Override for linux-mod eclass)
-	check_kernel_built
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if [[ ! -d /usr/${CTARGET} ]] ; then
-		echo
-		eerror "It does not look like your cross-compiler is setup properly!"
-		die "It does not look like your cross-compiler is setup properly!"
-	fi
-
-	if ! guess_arch &>/dev/null ; then
-		echo
-		eerror "Could not guess klibc's ARCH from your CTARGET!"
-		die "Could not guess klibc's ARCH from your CTARGET!"
-	fi
-
-	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::')
-	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
-		echo
-		eerror "Your kernel sources are not configured for your chosen arch!"
-		eerror "(KERNEL_ARCH=\"${kernel_arch}\", ARCH=\"$(guess_arch)\")"
-		die "Your kernel sources are not configured for your chosen arch!"
-	fi
-
-	cd ${S}
-
-	# Add our linux source tree symlink
-	ln -snf ${KV_DIR} linux
-
-	# set the build directory
-	echo "KRNLOBJ = ${KV_OUT_DIR}" >> MCONFIG
-
-	# We do not want all the nice prelink warnings
-	# NOTE: for amd64, we might change below to '/usr/$(get_libdir)/klibc',
-	#       but I do not do it right now, as the build system do not support
-	#       the lib64 yet ....
-	cat > "${S}/70klibc" <<-EOF
-		PRELINK_PATH_MASK="/usr/lib/klibc"
-	EOF
-
-	# klibc detects mips64 systems as having 64bit userland
-	# Force them to 32bit userlands instead
-	if ! use n32; then
-		epatch ${FILESDIR}/${PN}-1.1.16-mips32.patch
-	fi
-
-	# Linker path is awry
-	epatch ${FILESDIR}/${PN}-1.1.16-mips-ldpaths.patch
-}
-
-src_compile() {
-	if is_cross ; then
-		einfo "ARCH = \"$(guess_arch)\""
-		einfo "CROSS = \"${CTARGET}-\""
-		emake ARCH=$(guess_arch) \
-			CROSS="${CTARGET}-" || die "Compile failed!"
-	else
-		env -u ARCH \
-		emake || die "Compile failed!"
-	fi
-}
-
-src_install() {
-	local klibc_prefix
-
-	if is_cross ; then
-		make INSTALLROOT=${D} \
-			ARCH=$(guess_arch) \
-			CROSS="${CTARGET}-" \
-			install || die "Install failed!"
-
-		klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-bindir)
-	else
-		env -u ARCH \
-		make INSTALLROOT=${D} install || die "Install failed!"
-
-		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-bindir)
-	fi
-
-	# Hardlinks becoming copies
-	for x in gunzip zcat ; do
-		rm -f "${D}/${klibc_prefix}/${x}"
-		dosym gzip "${klibc_prefix}/${x}"
-	done
-
-	if ! is_cross ; then
-		insinto /usr/share/aclocal
-		doins ${FILESDIR}/klibc.m4
-
-		doenvd ${S}/70klibc
-
-		dodoc ${S}/README ${S}/klibc/{LICENSE,CAVEATS}
-		newdoc ${S}/klibc/README README.klibc
-		newdoc ${S}/klibc/arch/README README.klibc.arch
-		docinto dash; newdoc ${S}/dash/README.klibc README
-		docinto gzip; dodoc ${S}/gzip/{COPYING,README}
-	fi
-}
-
-pkg_postinst() {
-	# Override for linux-mod eclass
-	return 0
-}
diff --git a/dev-libs/klibc/klibc-1.4.13.ebuild b/dev-libs/klibc/klibc-1.4.13.ebuild
index 367c7eccb441..92ba6e2e23ea 100644
--- a/dev-libs/klibc/klibc-1.4.13.ebuild
+++ b/dev-libs/klibc/klibc-1.4.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.4.13.ebuild,v 1.1 2006/07/27 07:25:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.4.13.ebuild,v 1.2 2007/01/20 10:58:43 phreak Exp $
 
 inherit eutils linux-info multilib
 
@@ -65,6 +65,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
+	epatch "${FILESDIR}"/${P}-resumelib.patch
+
 	if [[ ! -d /usr/${CTARGET} ]] ; then
 		echo
 		eerror "It does not look like your cross-compiler is setup properly!"
diff --git a/dev-libs/klibc/metadata.xml b/dev-libs/klibc/metadata.xml
index 7fdfe1013083..b7307e2a033e 100644
--- a/dev-libs/klibc/metadata.xml
+++ b/dev-libs/klibc/metadata.xml
@@ -2,8 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>azarah@gentoo.org</email>
-</maintainer>
+	<herd>kernel</herd>
+	<maintainer>
+		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
+	</maintainer>
 </pkgmetadata>