proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

13 files changed, 392 insertions, 0 deletions

diff --git a/dev-libs/klibc/files/klibc-1.1-mips32.patch b/dev-libs/klibc/files/klibc-1.1-mips32.patch
new file mode 100644
index 000000000000..8eaf5d136801
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.1-mips32.patch
@@ -0,0 +1,12 @@
+diff -Naurp klibc-1.1.orig/MCONFIG klibc-1.1/MCONFIG
+--- klibc-1.1.orig/MCONFIG	2005-09-20 02:16:17 -0400
++++ klibc-1.1/MCONFIG	2005-09-20 02:16:57 -0400
+@@ -33,7 +33,7 @@ KRNLOBJ = $(SRCROOT)/linux
+ KLIBCVER = -D__KLIBC__=$(shell cut -d. -f1 < $(SRCROOT)/version) \
+ 	   -D__KLIBC_MINOR__=$(shell cut -d. -f2 < $(SRCROOT)/version)
+ 
+-ARCH    = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/)
++ARCH    = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/ -e s/mips64/mips/)
+ CC	= $(CROSS)gcc
+ LD      = $(CROSS)ld
+ KLIBSRC = $(SRCROOT)/klibc
diff --git a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch
new file mode 100644
index 000000000000..a5bb91765287
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
+index c2bfd2f..8066bda 100644
+--- a/usr/klibc/Kbuild
++++ b/usr/klibc/Kbuild
+@@ -152,7 +152,7 @@ # build interp.o
+ targets += interp.o
+ 
+ quiet_cmd_interp = BUILD   $@
+-      cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__     \
++      cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__     \
+                              -DLIBDIR=\"$(SHLIBDIR)\"         \
+ 			     -DSOHASH=\"$(SOLIBHASH)\" \
+ 			     -c -o $@ $<
diff --git a/dev-libs/klibc/files/klibc-1.5-klibcasmarch.patch b/dev-libs/klibc/files/klibc-1.5-klibcasmarch.patch
new file mode 100644
index 000000000000..854d5337057d
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5-klibcasmarch.patch
@@ -0,0 +1,25 @@
+--- a/scripts/Kbuild.install	2007-03-04 02:52:10.000000000 +0100
++++ b/scripts/Kbuild.install    2007-11-04 15:43:28.000000000 +0100
+@@ -84,6 +84,13 @@
+ # 1) Create directories, install headers and man pages
+ # 2) Tell that we now install binaries
+ # 3) Install binaries by descending
++
++# Arch specific definitions for klibc
++include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
++
++# include/asm-* architecture
++KLIBCASMARCH      ?= $(KLIBCARCH)
++
+ .PHONY: header footer descend
+ header:
+ 	$(Q)echo "  INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+@@ -95,7 +102,7 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
++	$(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
+ 	  mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+ 	  for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
+ 	           $(KLIBCKERNELOBJ)/include2 ; do \
diff --git a/dev-libs/klibc/files/klibc-1.5-sigaction.patch b/dev-libs/klibc/files/klibc-1.5-sigaction.patch
new file mode 100644
index 000000000000..59f422048de1
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5-sigaction.patch
@@ -0,0 +1,37 @@
+---
+ usr/include/arch/ppc/klibc/archsignal.h   |    6 ++++++
+ usr/include/arch/sparc/klibc/archsignal.h |    7 -------
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+--- a/usr/include/arch/ppc/klibc/archsignal.h
++++ b/usr/include/arch/ppc/klibc/archsignal.h
+@@ -8,7 +8,13 @@
+ #ifndef _KLIBC_ARCHSIGNAL_H
+ #define _KLIBC_ARCHSIGNAL_H
+ 
++#ifdef _SIGNAL_H
++#undef _SIGNAL_H
+ #include <asm/signal.h>
++#define _SIGNAL_H
++#else
++#include <asm/signal.h>
++#endif
+ /* No special stuff for this architecture */
+ 
+ #endif
+--- a/usr/include/arch/sparc/klibc/archsignal.h
++++ b/usr/include/arch/sparc/klibc/archsignal.h
+@@ -11,13 +11,6 @@
+ #define __WANT_POSIX1B_SIGNALS__
+ #include <asm/signal.h>
+ 
+-struct sigaction {
+-	__sighandler_t	sa_handler;
+-	unsigned long	sa_flags;
+-	void		(*sa_restorer)(void);	/* Not used by Linux/SPARC */
+-	sigset_t	sa_mask;
+-};
+-
+ /* Not actually used by the kernel... */
+ #define SA_RESTORER	0x80000000
+ 
diff --git a/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch b/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch
new file mode 100644
index 000000000000..0404a66a1ef1
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch
@@ -0,0 +1,26 @@
+diff -Nuar --exclude '*.orig' --exclude '*.rej' klibc-1.5.11.orig/scripts/Kbuild.install klibc-1.5.11/scripts/Kbuild.install
+--- klibc-1.5.11.orig/scripts/Kbuild.install	2008-06-15 17:28:23.000000000 -0700
++++ klibc-1.5.11/scripts/Kbuild.install	2008-06-26 10:14:05.365949576 -0700
+@@ -84,6 +84,13 @@
+ # 1) Create directories, install headers and man pages
+ # 2) Tell that we now install binaries
+ # 3) Install binaries by descending
++
++# Arch specific definitions for klibc
++include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
++
++# include/asm-* architecture
++KLIBCASMARCH      ?= $(KLIBCARCH)
++
+ .PHONY: header footer descend
+ header:
+ 	$(Q)echo "  INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+@@ -95,7 +102,7 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)set -e ; for d in linux asm asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
++	$(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
+ 	  for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
+ 	           $(KLIBCKERNELOBJ)/include2 ; do \
+ 	    [ ! -d $$r/$$d ] && continue; \
diff --git a/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff b/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff
new file mode 100644
index 000000000000..8ed2fa044cc9
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff
@@ -0,0 +1,28 @@
+diff -Naur klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h klibc-1.5.8/usr/include/arch/x86_64/sys/io.h
+--- klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h	2007-12-11 18:20:29.000000000 +0100
++++ klibc-1.5.8/usr/include/arch/x86_64/sys/io.h	2008-06-26 12:04:22.760046895 +0200
+@@ -60,21 +60,21 @@
+ {
+ 	unsigned char __v;
+ 	asm volatile ("inb %1,%0" : "=a" (__v) : "dN"(__p));
+-	return v;
++	return __v;
+ }
+ 
+ static __inline__ unsigned short inw(unsigned short __p)
+ {
+ 	unsigned short __v;
+ 	asm volatile ("inw %1,%0" : "=a" (__v) : "dN"(__p));
+-	return v;
++	return __v;
+ }
+ 
+ static __inline__ unsigned int inl(unsigned short __p)
+ {
+ 	unsigned int __v;
+ 	asm volatile ("inl %1,%0" : "=a" (__v) : "dN"(__p));
+-	return v;
++	return __v;
+ }
+ 
+ /* String I/O macros */
diff --git a/dev-libs/klibc/files/klibc-1.5.20-kbuild.patch b/dev-libs/klibc/files/klibc-1.5.20-kbuild.patch
new file mode 100644
index 000000000000..b47131bfc445
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.20-kbuild.patch
@@ -0,0 +1,20 @@
+diff -urN klibc-1.5.20.orig/usr/klibc/socketcalls/Kbuild klibc-1.5.20/usr/klibc/socketcalls/Kbuild
+--- klibc-1.5.20.orig/usr/klibc/socketcalls/Kbuild	2010-08-25 14:40:28.000000000 -0400
++++ klibc-1.5.20/usr/klibc/socketcalls/Kbuild	2010-11-23 15:40:25.000000000 -0500
+@@ -48,3 +48,6 @@
+                        $(obj)/SOCKETCALLS.i                         \
+                        $(src)/socketcommon.h
+ 	$(call cmd,socketcalls)
++
++PHONY += FORCE
++
+diff -urN klibc-1.5.20.orig/usr/klibc/syscalls/Kbuild klibc-1.5.20/usr/klibc/syscalls/Kbuild
+--- klibc-1.5.20.orig/usr/klibc/syscalls/Kbuild	2010-08-25 14:40:28.000000000 -0400
++++ klibc-1.5.20/usr/klibc/syscalls/Kbuild	2010-11-23 15:40:49.000000000 -0500
+@@ -95,3 +95,6 @@
+                     $(src)/syscommon.h $(obj)/syscalls.nrs                 \
+                     $(obj)/typesize.bin FORCE
+ 	$(call if_changed,syscalls)
++
++PHONY += FORCE
++
diff --git a/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch b/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch
new file mode 100644
index 000000000000..8afa2b6b5af6
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.20-parallel-make.patch
@@ -0,0 +1,11 @@
+--- scripts/Kbuild.install.orig	2013-03-14 09:33:32.429919267 -0400
++++ scripts/Kbuild.install	2013-03-14 09:33:55.443820061 -0400
+@@ -95,7 +95,7 @@ header:
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+ 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
diff --git a/dev-libs/klibc/files/klibc-1.5.23-parallel-make.patch b/dev-libs/klibc/files/klibc-1.5.23-parallel-make.patch
new file mode 100644
index 000000000000..f3c98e32aa70
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.23-parallel-make.patch
@@ -0,0 +1,11 @@
+--- klibc-1.5.23/scripts/Kbuild.install.orig
++++ klibc-1.5.23/scripts/Kbuild.install
+@@ -95,7 +95,7 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
++	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+ 	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+ 	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ 	$(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
diff --git a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
new file mode 100644
index 000000000000..94a0caee2526
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch
@@ -0,0 +1,12 @@
+diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in
+--- klibc-1.5.7-orig/klcc/klcc.in	2007-12-03 01:17:26.000000000 +0100
++++ klibc-1.5.7/klcc/klcc.in	2007-12-03 01:18:39.000000000 +0100
+@@ -259,7 +259,7 @@ if ( $operation ne '' ) {
+     unlink(@rmobjs);
+ 
+     if ( $strip && !$rv ) {
+-	$rv = mysystem($STRIP, @STRIPFLAGS, $output);
++	$rv = mysystem($STRIP, @STRIPFLAGS, $output || 'a.out');
+     }
+ }
+ 
diff --git a/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
new file mode 100644
index 000000000000..cfbc5f63655f
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-2.0.2-mkfifo.patch
@@ -0,0 +1,15 @@
+diff -Nuar --exclude '*.g' --exclude '*.cmd' klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c
+--- klibc-2.0.2-r1/work/klibc-2.0.2/usr/utils/mkfifo.c	2012-10-03 09:41:43.000000000 -0700
++++ klibc-2.0.2.orig/work/klibc-2.0.2/usr/utils/mkfifo.c	2013-12-26 13:19:34.270949780 -0800
+@@ -13,6 +13,11 @@
+ 
+ char *progname;
+ 
++int mkfifo (const char *__p, mode_t __m)
++{
++	return mknod(__p, (__m & ~S_IFMT) | S_IFIFO, (dev_t) 0);
++}
++
+ static int make_fifo(char *dir)
+ {
+ 	if (mkfifo(dir, leaf_mode)) {
diff --git a/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch b/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch
new file mode 100644
index 000000000000..7d253977e998
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch
@@ -0,0 +1,88 @@
+Update header locations for uapi & generated
+
+In the v3.6 kernel, many of the headers were split out into a uapi variant.
+klibc should be using those variants to compile.
+
+There is also a generated subdir, to seperate out generated headers.
+
+The old kernel header location needs to be included as well, because
+linux/compiler.h is available only in the base include directory.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar klibc-2.0.3.orig/scripts/Kbuild.klibc klibc-2.0.3/scripts/Kbuild.klibc
+--- klibc-2.0.3.orig/scripts/Kbuild.klibc	2013-12-03 10:53:46.000000000 -0800
++++ klibc-2.0.3/scripts/Kbuild.klibc	2013-12-26 14:39:07.113906101 -0800
+@@ -77,7 +77,10 @@
+ KLIBCCFLAGS       :=
+ 
+ # Defaults for arch to override
+-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include
++KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated \
++                    -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include
+ 
+ # Arch specific definitions for klibc
+ include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
+@@ -116,6 +119,9 @@
+-KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)/include				    \
++KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)/include/uapi				    \
++                    -I$(KLIBCKERNELSRC)/include/generated/uapi				    \
++                    -I$(KLIBCKERNELSRC)/include/generated				    \
++                    -I$(KLIBCKERNELSRC)/include				    \
+                      $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 	    \
+ 		       -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include)    \
+ 		     $(KLIBCARCHINCFLAGS)
+ 
+ # klibc definitions
+diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG klibc-2.0.3/usr/klibc/arch/i386/MCONFIG
+--- klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG	2013-12-03 10:53:46.000000000 -0800
++++ klibc-2.0.3/usr/klibc/arch/i386/MCONFIG	2013-12-26 14:44:56.349161344 -0800
+@@ -34,3 +34,6 @@
+ 
+ # Asm includes for i386 are in the merged x86 tree
+-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include
++KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \
++                    -I$(KLIBCKERNELOBJ)/arch/x86/include
+diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG
+--- klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG	2013-12-03 10:53:46.000000000 -0800
++++ klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG	2013-12-26 14:44:56.350161362 -0800
+@@ -24,6 +24,9 @@
+ 
+ # The kernel so far has both asm-ppc* and asm-powerpc.
+-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include
++KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \
++                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include
+ 
+ # The asm include files live in asm-powerpc
+ KLIBCASMARCH	= powerpc
+diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG
+--- klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG	2013-12-03 10:53:46.000000000 -0800
++++ klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG	2013-12-26 14:44:56.350161362 -0800
+@@ -22,6 +22,9 @@
+ 
+ # The kernel so far has both asm-ppc* and asm-powerpc.
+-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include
++KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \
++                    -I$(KLIBCKERNELOBJ)/arch/powerpc/include
+ 
+ # The asm include files live in asm-powerpc
+ KLIBCASMARCH	= powerpc
+diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG
+--- klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG	2013-12-03 10:53:46.000000000 -0800
++++ klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG	2013-12-26 14:44:54.522128579 -0800
+@@ -37,3 +37,6 @@
+ 
+ # Asm includes for x86_64 are in the merged x86 tree
+-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include
++KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \
++                    -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \
++                    -I$(KLIBCKERNELOBJ)/arch/x86/include
diff --git a/dev-libs/klibc/files/klibc.m4 b/dev-libs/klibc/files/klibc.m4
new file mode 100644
index 000000000000..389226974506
--- /dev/null
+++ b/dev-libs/klibc/files/klibc.m4
@@ -0,0 +1,94 @@
+# klibc.m4 serial 99
+## Copyright (C) 1995-2003 Free Software Foundation, Inc.
+## This file is free software, distributed under the terms of the GNU
+## General Public License.  As a special exception to the GNU General
+## Public License, this file may be distributed as part of a program
+## that contains a configuration script generated by Autoconf, under
+## the same distribution terms as the rest of that program.
+##
+## This file can can be used in projects which are not available under
+## the GNU General Public License or the GNU Library General Public
+## License but which still want to provide support for the GNU gettext
+## functionality.
+## Please note that the actual code of the KLIBC Library is partly covered
+## by the GNU Library General Public License, and party copyrighted by the
+## Regents of The University of California, and the rest is covered by a
+## MIT style license. 
+
+# Authors:
+#   Martin Schlemmer <azarah@nosferatu.za.org>, 2005.
+
+
+# AC_CHECK_KLIBC
+# --------------
+# Check if the user wants KLIBC support enabled.  If so, set KLIBC=yes and
+# fill in KLIBC_PREFIX, KLIBC_BINDIR, KLIBC_SBINDIR, KLIBC_LIBDIR and
+# KLIBC_INCLUDEDIR.  CC is also set to the proper klcc executable.
+# NOTE:  This should be called before AC_PROG_CC, and before header, function
+#        or type checks.
+AC_DEFUN([AC_CHECK_KLIBC],
+[AC_BEFORE([$0], [AC_PROG_CC])
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_ARG_ENABLE([klibc],
+              [AS_HELP_STRING([--enable-klibc],
+                              [Enable linking to klibc [no].  You need at
+                               least klibc-1.0 or later for this.  Set KLCC
+                               to the absolute file name of klcc if not in
+                               the PATH])],
+              [KLIBC=$enableval], [KLIBC=no])
+AC_ARG_ENABLE([klibc-layout],
+              [AS_HELP_STRING([--enable-klibc-layout],
+                              [Enable installing binaries, libraries and
+                               headers into the klibc prefix [yes] ])],
+              [if test "X$KLIBC" != Xno; then
+                 KLIBC_LAYOUT=$enableval
+               else
+                 KLIBC_LAYOUT=no
+               fi],
+              [if test "X$KLIBC" != Xno; then
+                 KLIBC_LAYOUT=yes
+               else
+                 KLIBC_LAYOUT=no
+               fi])
+
+if test "X$KLIBC" != Xno; then
+  # Basic cross compiling support.  I do not think it is wise to use
+  # AC_CHECK_TOOL, because if we are cross compiling, we do not want
+  # just 'klcc' to be returned ...
+  if test "${host_alias}" != "${build_alias}"; then
+    AC_CHECK_PROGS([KLCC], [${host_alias}-klcc], [no])
+  else
+    AC_CHECK_PROGS([KLCC], [klcc], [no])
+  fi
+  if test "X$KLCC" = Xno; then
+    AC_MSG_ERROR([cannot find klibc frontend 'klcc'!])
+  fi
+
+  CC="$KLCC"
+  CFLAGS="-Os"
+
+  KLIBC_KCROSS="$($KLCC -print-klibc-kcross 2>/dev/null)"
+  KLIBC_PREFIX="$($KLCC -print-klibc-prefix 2>/dev/null)"
+  KLIBC_BIN_DIR="$($KLCC -print-klibc-bindir 2>/dev/null)"
+  KLIBC_SBIN_DIR="${KLIBC_PREFIX}/${KLIBC_KCROSS}sbin"
+  KLIBC_LIB_DIR="$($KLCC -print-klibc-libdir 2>/dev/null)"
+  KLIBC_INCLUDE_DIR="$($KLCC -print-klibc-includedir 2>/dev/null)"
+
+  if test "X$KLIBC_LAYOUT" != Xno; then
+    prefix="$KLIBC_PREFIX"
+    bindir="$KLIBC_BIN_DIR"
+    sbindir="$KLIBC_SBIN_DIR"
+    libdir="$KLIBC_LIB_DIR"
+    includedir="$KLIBC_INCLUDE_DIR"
+  fi
+
+  # At least KLIBC_LIB_DIR should be valid, else klibc is too old or
+  # something went wrong
+  if test ! -d "$KLIBC_LIB_DIR"; then
+    AC_MSG_ERROR([your klibc installation is too old or not functional!])
+  fi
+fi
+
+AC_SUBST(KLIBC)
+])# AC_CHECK_KLIBC
+