remove old

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

18 files changed, 19 insertions, 675 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 415a2b3c67e7..4a9348ce0251 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.83 2013/05/07 14:18:08 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.84 2013/06/18 23:32:01 aballier Exp $
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-sources-7.2-r3.ebuild, -freebsd-sources-8.0.ebuild,
+  -files/freebsd-sources-7.0-gentoo.patch,
+  -files/freebsd-sources-7.0-werror.patch,
+  -files/freebsd-sources-7.1-asm.patch,
+  -files/freebsd-sources-7.1-subnet-route-pr40133.patch,
+  -files/freebsd-sources-7.2-devfs7.patch,
+  -files/freebsd-sources-7.2-ipv6.patch, -files/freebsd-sources-7.2-null.patch,
+  -files/freebsd-sources-7.2-pipe.patch,
+  -files/freebsd-sources-7.2-sparc64.patch,
+  -files/freebsd-sources-7.2-zfs712.patch,
+  -files/freebsd-sources-8.0-arpresolve_panic.patch,
+  -files/freebsd-sources-8.0-mf626.patch,
+  -files/freebsd-sources-8.0-sparc64.patch,
+  -files/freebsd-sources-8.0-werror.patch,
+  -files/freebsd-sources-8.0-zfs.patch:
+  remove old
 
 *freebsd-sources-9.1-r1 (07 May 2013)
 
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch
deleted file mode 100644
index 7da5197d8de2..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur ../src.orig/sys/conf/kern.mk ./sys/conf/kern.mk
---- ../src.orig/sys/conf/kern.mk	2007-05-24 23:53:42.000000000 +0200
-+++ ./sys/conf/kern.mk	2008-03-14 14:37:47.216420518 +0100
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+		${_wundef} ${_Wno_pointer_sign}
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
- .endif
-@@ -36,7 +36,7 @@
- # reserved for user applications.
- #
- .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 \
-+CFLAGS+=	-mpreferred-stack-boundary=2 \
- 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
- INLINE_LIMIT?=	8000
- .endif
-Only in ./sys/conf: kern.mk.rej
-Only in ./sys/conf: kern.mk~
-diff -ur ../src.orig/sys/dev/aic7xxx/aicasm/Makefile ./sys/dev/aic7xxx/aicasm/Makefile
---- ../src.orig/sys/dev/aic7xxx/aicasm/Makefile	2005-11-21 15:41:10.000000000 +0100
-+++ ./sys/dev/aic7xxx/aicasm/Makefile	2008-03-14 14:36:35.859698365 +0100
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- 
- # Correct path for kernel builds
- # Don't rely on the kernel's .depend file
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch
deleted file mode 100644
index 3a2be631b1b7..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-werror.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur ../src.orig/sys/conf/kern.pre.mk ./sys/conf/kern.pre.mk
---- ../src.orig/sys/conf/kern.pre.mk	2007-08-08 21:12:06.000000000 +0200
-+++ ./sys/conf/kern.pre.mk	2008-03-14 14:10:03.183569137 +0100
-@@ -90,7 +90,7 @@
- .if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
-     ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \
-     ${MACHINE_ARCH} == "sparc64"
--WERROR?= -Werror
-+WERROR?= -Wno-error
- .endif
- .endif
- 
-Only in ./sys/conf: kern.pre.mk.rej
-Only in ./sys/conf: kern.pre.mk~
-diff -ur ../src.orig/sys/conf/kmod.mk ./sys/conf/kmod.mk
---- ../src.orig/sys/conf/kmod.mk	2007-07-11 03:20:37.000000000 +0200
-+++ ./sys/conf/kmod.mk	2008-03-14 14:11:21.856366378 +0100
-@@ -79,7 +79,6 @@
- . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+=	-fno-strict-aliasing
- . endif
--#WERROR?=	-Werror
- .endif
- CFLAGS+=	${WERROR}
- CFLAGS+=	-D_KERNEL
-Only in ./sys/conf: kmod.mk.rej
-Only in ./sys/conf: kmod.mk~
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch
deleted file mode 100644
index c0f5d787cd1d..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-asm.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -ur ../src.orig/sys/compat/ndis/winx32_wrap.S ./sys/compat/ndis/winx32_wrap.S
---- ../src.orig/sys/compat/ndis/winx32_wrap.S	2006-06-12 22:35:59.000000000 +0200
-+++ ./sys/compat/ndis/winx32_wrap.S	2008-03-14 14:00:41.949886084 +0100
-@@ -369,7 +369,7 @@
- 	ret
- 
- ENTRY(x86_setfs)
--	movl	4(%esp),%fs
-+	movw	4(%esp),%fs
- 	ret
- 
- ENTRY(x86_gettid)
-diff -ur ../src.orig/sys/i386/i386/locore.s ./sys/i386/i386/locore.s
---- ../src.orig/sys/i386/i386/locore.s	2007-03-24 20:53:22.000000000 +0100
-+++ ./sys/i386/i386/locore.s	2008-03-14 14:00:41.946886262 +0100
-@@ -358,7 +358,7 @@
- 	pushl	%eax
- 	testl	$PSL_VM,UC_EFLAGS(%eax)
- 	jne	1f
--	movl	UC_GS(%eax),%gs		/* restore %gs */
-+	movw	UC_GS(%eax),%gs		/* restore %gs */
- 1:
- 	movl	$SYS_sigreturn,%eax
- 	pushl	%eax			/* junk to fake return addr. */
-@@ -375,7 +375,7 @@
- 	pushl	%eax
- 	testl	$PSL_VM,UC4_EFLAGS(%eax)
- 	jne	1f
--	movl	UC4_GS(%eax),%gs	/* restore %gs */
-+	movw	UC4_GS(%eax),%gs	/* restore %gs */
- 1:
- 	movl	$344,%eax		/* 4.x SYS_sigreturn */
- 	pushl	%eax			/* junk to fake return addr. */
-@@ -393,7 +393,7 @@
- 	pushl	%eax
- 	testl	$PSL_VM,SC_PS(%eax)
- 	jne	9f
--	movl	SC_GS(%eax),%gs		/* restore %gs */
-+	movw	SC_GS(%eax),%gs		/* restore %gs */
- 9:
- 	movl	$103,%eax		/* 3.x SYS_sigreturn */
- 	pushl	%eax			/* junk to fake return addr. */
-diff -ur ../src.orig/sys/i386/i386/swtch.s ./sys/i386/i386/swtch.s
---- ../src.orig/sys/i386/i386/swtch.s	2007-08-22 07:06:14.000000000 +0200
-+++ ./sys/i386/i386/swtch.s	2008-03-14 14:00:41.948886237 +0100
-@@ -130,7 +130,7 @@
- 	movl	%ebp,PCB_EBP(%edx)
- 	movl	%esi,PCB_ESI(%edx)
- 	movl	%edi,PCB_EDI(%edx)
--	movl	%gs,PCB_GS(%edx)
-+	movw	%gs,PCB_GS(%edx)
- 	pushfl					/* PSL */
- 	popl	PCB_PSL(%edx)
- 	/* Test if debug registers should be saved. */
-@@ -301,7 +301,7 @@
- 	/* This must be done after loading the user LDT. */
- 	.globl	cpu_switch_load_gs
- cpu_switch_load_gs:
--	movl	PCB_GS(%edx),%gs
-+	movw	PCB_GS(%edx),%gs
- 
- 	/* Test if debug registers should be restored. */
- 	testl	$PCB_DBREGS,PCB_FLAGS(%edx)
-@@ -371,7 +371,7 @@
- 	movl	%ebp,PCB_EBP(%ecx)
- 	movl	%esi,PCB_ESI(%ecx)
- 	movl	%edi,PCB_EDI(%ecx)
--	movl	%gs,PCB_GS(%ecx)
-+	movw	%gs,PCB_GS(%ecx)
- 	pushfl
- 	popl	PCB_PSL(%ecx)
- 
-diff -ur ../src.orig/sys/i386/include/cpufunc.h ./sys/i386/include/cpufunc.h
---- ../src.orig/sys/i386/include/cpufunc.h	2007-08-09 22:14:35.000000000 +0200
-+++ ./sys/i386/include/cpufunc.h	2008-03-14 14:03:09.264377451 +0100
-@@ -452,7 +452,7 @@
- rfs(void)
- {
- 	u_int sel;
--	__asm __volatile("movl %%fs,%0" : "=rm" (sel));
-+	__asm __volatile("movw %%fs,%0" : "=rm" (sel));
- 	return (sel);
- }
- 
-@@ -468,7 +468,7 @@
- rgs(void)
- {
- 	u_int sel;
--	__asm __volatile("movl %%gs,%0" : "=rm" (sel));
-+	__asm __volatile("movw %%gs,%0" : "=rm" (sel));
- 	return (sel);
- }
- 
-@@ -492,7 +492,7 @@
- rss(void)
- {
- 	u_int sel;
--	__asm __volatile("movl %%ss,%0" : "=rm" (sel));
-+	__asm __volatile("movw %%ss,%0" : "=rm" (sel));
- 	return (sel);
- }
- 
-@@ -507,13 +507,13 @@
- static __inline void
- load_fs(u_int sel)
- {
--	__asm __volatile("movl %0,%%fs" : : "rm" (sel));
-+	__asm __volatile("movw %0,%%fs" : : "rm" (sel));
- }
- 
- static __inline void
- load_gs(u_int sel)
- {
--	__asm __volatile("movl %0,%%gs" : : "rm" (sel));
-+	__asm __volatile("movw %0,%%gs" : : "rm" (sel));
- }
- 
- static __inline void
-diff -ur ../src.orig/sys/i386/linux/linux_locore.s ./sys/i386/linux/linux_locore.s
---- ../src.orig/sys/i386/linux/linux_locore.s	2001-02-25 07:29:01.000000000 +0100
-+++ ./sys/i386/linux/linux_locore.s	2008-03-14 14:00:41.949886084 +0100
-@@ -8,7 +8,7 @@
- NON_GPROF_ENTRY(linux_sigcode)
- 	call	*LINUX_SIGF_HANDLER(%esp)
- 	leal	LINUX_SIGF_SC(%esp),%ebx	/* linux scp */
--	movl	LINUX_SC_GS(%ebx),%gs
-+	movw	LINUX_SC_GS(%ebx),%gs
- 	movl	%esp, %ebx			/* pass sigframe */
- 	push	%eax				/* fake ret addr */
- 	movl	$LINUX_SYS_linux_sigreturn,%eax	/* linux_sigreturn() */
-@@ -20,7 +20,7 @@
- 	call	*LINUX_RT_SIGF_HANDLER(%esp)
- 	leal	LINUX_RT_SIGF_UC(%esp),%ebx	/* linux ucp */
- 	leal	LINUX_RT_SIGF_SC(%ebx),%ecx	/* linux sigcontext */
--	movl	LINUX_SC_GS(%ecx),%gs
-+	movw	LINUX_SC_GS(%ecx),%gs
- 	push	%eax				/* fake ret addr */
- 	movl	$LINUX_SYS_linux_rt_sigreturn,%eax   /* linux_rt_sigreturn() */
- 	int	$0x80				/* enter kernel with args */
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch
deleted file mode 100644
index 1184280b5d8f..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-subnet-route-pr40133.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes changing the default subnet route after removing an ip address.
-
-See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
-and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
-
-Thanks to Roy Marples.
---- sys/netinet/in.c.orig
-+++ sys/netinet/in.c
-@@ -858,6 +858,12 @@
- 	error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
- 	if (!error)
- 		target->ia_flags |= IFA_ROUTE;
-+	else if (error == EEXIST) {
-+		/*
-+		 * the fact that the route already exists is not an error.
-+		 */
-+		error = 0;
-+	}
- 	return error;
- }
- 
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
deleted file mode 100644
index e1fcefb028ce..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-devfs7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-09:14.devfs.asc
-
-Index: sys/fs/devfs/devfs_vnops.c
-===================================================================
---- sys/fs/devfs/devfs_vnops.c	(revision 192300)
-+++ sys/fs/devfs/devfs_vnops.c	(revision 192301)
-@@ -890,6 +890,7 @@
- 	if (fp != NULL) {
- 		FILE_LOCK(fp);
- 		fp->f_data = dev;
-+		fp->f_vnode = vp;
- 		FILE_UNLOCK(fp);
- 	}
- 	fpop = td->td_fpop;
-
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
deleted file mode 100644
index de8e0ac27c9b..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-ipv6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-09:10.ipv6.asc
-
-Index: sys/netinet6/in6.c
-===================================================================
-RCS file: /home/ncvs/src/sys/netinet6/in6.c,v
-retrieving revision 1.109
-diff -p -u -I__FBSDID -I$FreeBSD -u -r1.109 in6.c
---- sys/netinet6/in6.c	27 May 2009 14:11:23 -0000	1.109
-+++ sys/netinet6/in6.c	8 Jun 2009 18:02:59 -0000
-@@ -215,6 +215,7 @@ in6_control(struct socket *so, u_long cm
- 	case SIOCSRTRFLUSH_IN6:
- 	case SIOCSDEFIFACE_IN6:
- 	case SIOCSIFINFO_FLAGS:
-+	case SIOCSIFINFO_IN6:
- 		if (td != NULL) {
- 			error = priv_check(td, PRIV_NETINET_ND6);
- 			if (error)
-@@ -223,7 +224,6 @@ in6_control(struct socket *so, u_long cm
- 		/* FALLTHROUGH */
- 	case OSIOCGIFINFO_IN6:
- 	case SIOCGIFINFO_IN6:
--	case SIOCSIFINFO_IN6:
- 	case SIOCGDRLST_IN6:
- 	case SIOCGPRLST_IN6:
- 	case SIOCGNBRINFO_IN6:
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
deleted file mode 100644
index 16e5023806eb..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-null.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-EN-09:05.null.asc
-
-Index: sys/kern/kern_exec.c
-===================================================================
---- sys/kern/kern_exec.c	(revision 197682)
-+++ sys/kern/kern_exec.c	(working copy)
-@@ -122,6 +122,11 @@
- SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW, 
-     &ps_arg_cache_limit, 0, "");
- 
-+static int map_at_zero = 1;
-+TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
-+SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
-+    "Permit processes to map an object at virtual address 0.");
-+
- static int
- sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
- {
-@@ -939,7 +944,7 @@
- 	int error;
- 	struct proc *p = imgp->proc;
- 	struct vmspace *vmspace = p->p_vmspace;
--	vm_offset_t stack_addr;
-+	vm_offset_t sv_minuser, stack_addr;
- 	vm_map_t map;
- 	u_long ssiz;
- 
-@@ -955,13 +960,17 @@
- 	 * not disrupted
- 	 */
- 	map = &vmspace->vm_map;
--	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser &&
-+	if (map_at_zero)
-+		sv_minuser = sv->sv_minuser;
-+	else
-+		sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE);
-+	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser &&
- 	    vm_map_max(map) == sv->sv_maxuser) {
- 		shmexit(vmspace);
- 		pmap_remove_pages(vmspace_pmap(vmspace));
- 		vm_map_remove(map, vm_map_min(map), vm_map_max(map));
- 	} else {
--		error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser);
-+		error = vmspace_exec(p, sv_minuser, sv->sv_maxuser);
- 		if (error)
- 			return (error);
- 		vmspace = p->p_vmspace;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
deleted file mode 100644
index 4b7db0298a20..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-pipe.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-09:09.pipe.asc
-
-Index: sys/kern/sys_pipe.c
-===================================================================
-RCS file: /home/ncvs/src/sys/kern/sys_pipe.c,v
-retrieving revision 1.201
-diff -p -u -I__FBSDID -I$FreeBSD -r1.201 sys_pipe.c
---- sys/kern/sys_pipe.c	10 Mar 2009 21:28:43 -0000	1.201
-+++ sys/kern/sys_pipe.c	5 Jun 2009 07:53:01 -0000
-@@ -761,6 +761,8 @@ pipe_build_write_buffer(wpipe, uio)
- 	pmap = vmspace_pmap(curproc->p_vmspace);
- 	endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size);
- 	addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base);
-+	if (endaddr < addr)
-+		return (EFAULT);
- 	for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) {
- 		/*
- 		 * vm_fault_quick() can sleep.  Consequently,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch
deleted file mode 100644
index b179fd62db63..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-sparc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sys/conf/ldscript.sparc64.old	2009-05-17 11:04:47 +0000
-+++ sys/conf/ldscript.sparc64	2009-05-17 11:05:41 +0000
-@@ -1,6 +1,6 @@
- /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.30.1 2009/04/15 03:14:26 kensmith Exp $ */
--OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
--	      "elf64-sparc")
-+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
-+	      "elf64-sparc-freebsd")
- OUTPUT_ARCH(sparc:v9)
- ENTRY(_start)
- SEARCH_DIR(/usr/lib);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch
deleted file mode 100644
index 814ced29f6a6..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-zfs712.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-10:03.zfs.asc
-
-Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
-===================================================================
---- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	(revision 200583)
-+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	(working copy)
-@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
- {
- 	VATTR_NULL(vap);
- 	vap->va_mask = (uint_t)mask;
--	vap->va_type = IFTOVT(mode);
--	vap->va_mode = mode & MODEMASK;
--	vap->va_uid = (uid_t)uid;
--	vap->va_gid = (gid_t)gid;
-+	if (mask & AT_TYPE)
-+		vap->va_type = IFTOVT(mode);
-+	if (mask & AT_MODE)
-+		vap->va_mode = mode & MODEMASK;
-+	if (mask & AT_UID)
-+		vap->va_uid = (uid_t)uid;
-+	if (mask & AT_GID)
-+		vap->va_gid = (gid_t)gid;
- 	vap->va_rdev = zfs_cmpldev(rdev);
- 	vap->va_nodeid = nodeid;
- }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch
deleted file mode 100644
index c624532d8c93..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-arpresolve_panic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This one (plus a misrule in my pf.conf) made my box crash at random after 6
-to 48 hours of uptime. Thanks to an incoming icmp packet.
-
-Taken from:
-http://svn.freebsd.org/viewvc/base/head/sys/netinet/if_ether.c?r1=198418&r2=201416
---- head/sys/netinet/if_ether.c
-+++ head/sys/netinet/if_ether.c
-@@ -372,8 +372,8 @@
- 	if (la->la_asked < V_arp_maxtries)
- 		error = EWOULDBLOCK;	/* First request. */
- 	else
--		error =
--			(rt0->rt_flags & RTF_GATEWAY) ? EHOSTUNREACH : EHOSTDOWN;
-+		error = rt0 != NULL && (rt0->rt_flags & RTF_GATEWAY) ?
-+		    EHOSTUNREACH : EHOSTDOWN;
- 
- 	if (renew) {
- 		LLE_ADDREF(la);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch
deleted file mode 100644
index 9121c0a819f3..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-mf626.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Backport this 3g modem that I have.
-Given it's quite common, should be useful
-And I hate when I forget to patch the kernel after a re-emerge.
-
---- sys/dev/usb/usbdevs.orig
-+++ sys/dev/usb/usbdevs
-@@ -2055,6 +2055,7 @@
- product QUALCOMM2 CDMA_MSM	0x3196	CDMA Technologies MSM modem
- product QUALCOMMINC CDMA_MSM	0x0001	CDMA Technologies MSM modem
- product QUALCOMMINC ZTE_STOR	0x2000	USB ZTE Storage
-+product QUALCOMMINC MF626	0X0031	3G modem
- product QUALCOMMINC AC8700	0xfffe	CDMA 1xEVDO USB modem
- 
- /* Qtronix products */
---- sys/dev/usb/serial/u3g.c.orig
-+++ sys/dev/usb/serial/u3g.c
-@@ -184,6 +184,7 @@
- 	/* OEM: Qualcomm, Inc. */
- 	U3G_DEV(QUALCOMMINC, ZTE_STOR, U3GFL_SCSI_EJECT),
- 	U3G_DEV(QUALCOMMINC, CDMA_MSM, U3GFL_SCSI_EJECT),
-+	U3G_DEV(QUALCOMMINC, MF626, 0),
- 	/* OEM: Huawei */
- 	U3G_DEV(HUAWEI, MOBILE, U3GFL_HUAWEI_INIT),
- 	U3G_DEV(HUAWEI, E180V, U3GFL_HUAWEI_INIT),
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch
deleted file mode 100644
index 1729beb4c6ed..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-sparc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sys/conf/ldscript.sparc64.old	2010-03-10 14:42:03 +0100
-+++ sys/conf/ldscript.sparc64	2010-03-10 14:42:30 +0100
-@@ -1,6 +1,6 @@
- /* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4.32.1.2.1 2009/10/25 01:10:29 kensmith Exp $ */
--OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
--	      "elf64-sparc")
-+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
-+	      "elf64-sparc-freebsd")
- OUTPUT_ARCH(sparc:v9)
- ENTRY(_start)
- SEARCH_DIR(/usr/lib);
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch
deleted file mode 100644
index 2d2e028d10c0..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sys/conf/kern.pre.mk.old	2010-03-10 14:20:43 +0100
-+++ sys/conf/kern.pre.mk	2010-03-10 14:20:56 +0100
-@@ -93,7 +93,7 @@
- CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
- CFLAGS+= --param inline-unit-growth=100
- CFLAGS+= --param large-function-growth=1000
--WERROR?= -Werror
-+WERROR?= -Wno-error
- .endif
- 
- # XXX LOCORE means "don't declare C stuff" not "for locore.s".
---- sys/conf/kmod.mk.old	2010-03-10 14:21:06 +0100
-+++ sys/conf/kmod.mk	2010-03-10 14:21:16 +0100
-@@ -79,7 +79,7 @@
- . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+=	-fno-strict-aliasing
- . endif
--WERROR?=	-Werror
-+WERROR?=	-Wno-error
- .endif
- CFLAGS+=	${WERROR}
- CFLAGS+=	-D_KERNEL -D__FreeBSD_cc_version=700004
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch
deleted file mode 100644
index f81b2b5bed07..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-zfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
-===================================================================
---- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	(revision 200583)
-+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c	(working copy)
-@@ -60,10 +60,14 @@ zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64
- {
- 	VATTR_NULL(vap);
- 	vap->va_mask = (uint_t)mask;
--	vap->va_type = IFTOVT(mode);
--	vap->va_mode = mode & MODEMASK;
--	vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
--	vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
-+	if (mask & AT_TYPE)
-+		vap->va_type = IFTOVT(mode);
-+	if (mask & AT_MODE)
-+		vap->va_mode = mode & MODEMASK;
-+	if (mask & AT_UID)
-+		vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
-+	if (mask & AT_GID)
-+		vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
- 	vap->va_rdev = zfs_cmpldev(rdev);
- 	vap->va_nodeid = nodeid;
- }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r3.ebuild
deleted file mode 100644
index efb163655ac1..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-7.2-r3.ebuild,v 1.1 2010/01/09 16:38:37 aballier Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-7.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 7.0-RELEASE it's 700003.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=700004:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	epatch "${FILESDIR}/${PN}-7.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-7.1-asm.patch"
-	epatch "${FILESDIR}/${PN}-7.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-7.2-sparc64.patch"
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-7.1-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	epatch "${FILESDIR}/${PN}-7.2-pipe.patch"
-	epatch "${FILESDIR}/${PN}-7.2-ipv6.patch"
-	epatch "${FILESDIR}/${PN}-7.2-devfs7.patch"
-	epatch "${FILESDIR}/${PN}-7.2-null.patch"
-	epatch "${FILESDIR}/${PN}-7.2-zfs712.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		"s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# See http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-	# ld doesn't provide symbols constructed as the __start_set_(s) ones
-	# are on FreeBSD modules.
-	# This patch adds code to generate a list of these and adds them
-	# as undefined references to ld's commandline to get them.
-	# Without this kernel modules will not load.
-	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild
deleted file mode 100644
index 1979e729ae48..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-8.0.ebuild,v 1.2 2010/04/20 23:06:53 the_paya Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 8.0-RELEASE it's 800001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	epatch "${FILESDIR}/${PN}-8.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-8.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-8.0-sparc64.patch"
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-zfs.patch"
-	epatch "${FILESDIR}/${PN}-8.0-arpresolve_panic.patch" # Already in SVN
-	epatch "${FILESDIR}/${PN}-8.0-mf626.patch" # Backported from SVN
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# See http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-	# ld doesn't provide symbols constructed as the __start_set_(s) ones
-	# are on FreeBSD modules.
-	# This patch adds code to generate a list of these and adds them
-	# as undefined references to ld's commandline to get them.
-	# Without this kernel modules will not load.
-	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}