From 8d1cbc1f385feac31b41e9e1303b39aeeaa1cfb4 Mon Sep 17 00:00:00 2001
From: Yuta Satoh <nigoro.dev@gmail.com>
Date: Thu, 5 May 2016 19:59:52 +0900
Subject: sys-freebsd/freebsd-sources: Fix errata, EN-16:07.ipi and
 EN-16:08.zfs

---
 sys-freebsd/freebsd-sources/Manifest               |   2 +
 .../freebsd-sources/freebsd-sources-10.2-r4.ebuild | 170 --------------------
 .../freebsd-sources/freebsd-sources-10.2-r5.ebuild | 172 +++++++++++++++++++++
 .../freebsd-sources/freebsd-sources-10.3-r1.ebuild | 161 +++++++++++++++++++
 .../freebsd-sources/freebsd-sources-10.3.ebuild    | 157 -------------------
 5 files changed, 335 insertions(+), 327 deletions(-)
 delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.2-r4.ebuild
 create mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.2-r5.ebuild
 create mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.3-r1.ebuild
 delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.3.ebuild

(limited to 'sys-freebsd')

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index aaf28815b15c..184d850e4a6b 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -5,6 +5,8 @@ DIST freebsd-sources-EN-1601-filemon.patch 15491 SHA256 8237b34ca75e6991f7de33c2
 DIST freebsd-sources-EN-1602-pf-10.2.patch 12239 SHA256 ad2bc821210a9dbca355b21c9c4577344158f3d67e9871788d9295c35e357e97 SHA512 b7aa136b9ece36525bdfe4d63711f073e070d552136663715ca98b9c3dfb58146d61d74cd9032c4f7a239c421992d19ad609a75ad106038e21c8fc6e4e77d08a WHIRLPOOL 085fdbdef54a96ad0a7a90217ff5027a69452c87d12d77e857066bfb7de4ac910371c827d10b5202331afc04c9ebc97773f91dee11f1a89b55fadc618ffea7d9
 DIST freebsd-sources-EN-1604-hyperv.patch 1187 SHA256 8e1d9f7e693cec0118a3640827a595d654d49ca53e4bc24650cec730297d55da SHA512 a5fe7bd750e55835a99ddf2e1efd8ad508940c29cafbac5ff1cbafce5c1eeaa21f2f3eb3268b0131db1927d1ba440a71d23715a15fd5f45cf129d3d267b863d3 WHIRLPOOL 7b36faf5f2981e76ce984be89e184ba79fe7d37aa10047cd2e957ec3a93e3ca1e9ea80cdf1f8637e64bd7989a42cdeec3ac809f22f9b0fb2516a0192f3b59c23
 DIST freebsd-sources-EN-1605-hv_netvsc.patch 884 SHA256 1038a9064e7f5154624dbce413fa0298c488d4513dba12c2e878650d7944475b SHA512 80ca1cbe8ae2cd97bcd685c6fdc6ad5bd3179f5186adcc4101b802a7c48543c968aae3c8af51927e348dfe55e438caabd4b5e62d1dca0e5fc8de2fb95db427f6 WHIRLPOOL 5d1af2116aa1a9871ee5c75f898bafc0d2960e0c507fa233a47ad98b5e1cf8b1740243a0320b88e7ebafdefc2ef5b89d66e1667f71d371a63a4dc72e0640e777
+DIST freebsd-sources-EN-1607-ipi.patch 2557 SHA256 da1a24b82a16de4007379e4f2c030054787e5b3c95f9ecf8afc1693f456943b2 SHA512 41bee92ac36685ea81437befc07e1d1f7ba9d93b3d733981fce512e68a77eb3e9563a88e23fd9ae27a331e63c42966a55041cd5ae05d61895b8e20b1edae86dd WHIRLPOOL 650d5fabf4e017d387baf96a0f8c9131e0f5d4fdf80a36f673746a92a9382fd4d6566a382590a1d66b6f0d384b38ac26d2b782a0a9449b954c15271cc4348fa5
+DIST freebsd-sources-EN-1608-zfs.patch 280 SHA256 1d6b954e2819bec83084224fba47f79781bf458f50a777dcd2ae3c1413fd95a2 SHA512 df2e133cfa565332da3c2b173c98e866bc1d9ddcfa06156da1f9a2f382186cafb130b7f0e19617482af71b730d95b9d8a7d81195a57760a93736bc2f49ed1c03 WHIRLPOOL fdb4e88206dbd732aec0541c8aa986a4540cbd52c36140d87db5a775fe8c3600a4c8369d67fad5207a85df2f06b6e4cc0a1c99df198c31f7e1f44bde16054278
 DIST freebsd-sources-SA-1601-sctp.patch 608 SHA256 19eb23dd143c6e5b0e3ee44d523dcb340d9b36d29bcb9bb21d27a248c1b093d0 SHA512 4671377b5c9034c28d2aa3176f872dab38dbec06d5d944d99164b2e449e996bc361f7910f70046290439636c3a8a7139da382c79123518d6cfbc5aead47f9ab6 WHIRLPOOL 2e5303d45f8e6aea0accbef603ec4c9bbd1b0bb0fcf78f797f353cacbe10f5e90c0217ff7c3d1396ed59d0b08f6c60bb5b7fa70f9641cda3fc2fd64dcb5b3423
 DIST freebsd-sources-SA-1603-linux.patch 2815 SHA256 81e9590e56f091f6e67f2f6826c552f67172d5d3067defda3569377c61cb43d3 SHA512 9773a4b12c352d96a22279bdf428bef40650e38f8daec85beb8d321524ff0e45c4f31b40c897a3928261b0c9131dbfa80cb8c80ed2aa41eb4846588fc0980a63 WHIRLPOOL 15f8a62df9d5517f3f66635740069b791b676a2cdbaa696a63cf939df8926521acd891005f866a5607f235c52c737d1acdec36d72d61cc74c47c0cd075ae1180
 DIST freebsd-sources-SA-1604-linux.patch 1164 SHA256 0c1f169904600d13a5efe2bef6999f3da433a615642a80cb2ec960f164ff6208 SHA512 ccc15464071032b5bb4a5bed46a28cb036699b281b543ce5cdfb37f2cb728c66d9194080e1e010169145591ae3f4770ae84daf3149d9498c6302c0870ae2da10 WHIRLPOOL b58344e4b2b1e53e33674039882572d7f0b8987202371ff631e91f345698368d70e6af7ad43010f1d6cb7f0161b3d59587abdffd621300db461701832953dabb
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r4.ebuild
deleted file mode 100644
index 93204c938646..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:01/sctp.patch"
-	"SA-16:03/linux.patch"
-	"SA-16:04/linux.patch"
-	"SA-16:05/tcp.patch"
-	"SA-16:10/linux.patch"
-	"SA-16:15/sysarch.patch"
-	"EN-15:19/kqueue.patch"
-	"EN-15:20/vm.patch"
-	"EN-16:01/filemon.patch"
-	"EN-16:02/pf-10.2.patch"
-	"EN-16:04/hyperv.patch"
-	"EN-16:05/hv_netvsc.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
-
-pkg_setup() {
-	# Add the required source files.
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	# 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 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use zfs ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	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
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r5.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r5.ebuild
new file mode 100644
index 000000000000..fae31de2a43a
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="0"
+
+IUSE="+build-kernel debug dtrace zfs"
+
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "SA-16:01/sctp.patch"
+	"SA-16:03/linux.patch"
+	"SA-16:04/linux.patch"
+	"SA-16:05/tcp.patch"
+	"SA-16:10/linux.patch"
+	"SA-16:15/sysarch.patch"
+	"EN-15:19/kqueue.patch"
+	"EN-15:20/vm.patch"
+	"EN-16:01/filemon.patch"
+	"EN-16:02/pf-10.2.patch"
+	"EN-16:04/hyperv.patch"
+	"EN-16:05/hv_netvsc.patch"
+	"EN-16:07/ipi.patch"
+	"EN-16:08/zfs.patch" )
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
+fi
+
+EXTRACTONLY="
+	sys/
+	contrib/bmake/
+	usr.bin/bmake/
+"
+
+RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!sys-freebsd/virtio-kmod
+	!sys-fs/fuse4bsd
+	!<sys-freebsd/freebsd-sources-9.2_beta1"
+DEPEND="build-kernel? (
+		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+		>=sys-freebsd/freebsd-usbin-9.1
+		=sys-freebsd/freebsd-mk-defs-${RV}*
+	)"
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+KERN_BUILD=GENTOO
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+	"${FILESDIR}/${PN}-10.0-gentoo.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	"${FILESDIR}/${PN}-7.1-includes.patch"
+	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
+	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
+
+pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
+	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+}
+
+src_prepare() {
+	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
+
+	# 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 10.0-RELEASE it's 1000001.
+	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	# Set the kernel configuration using USE flags.
+	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
+	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
+	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
+
+	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
+	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
+}
+
+src_configure() {
+	if use build-kernel ; then
+		tc-export CC
+		cd "${S}/$(tc-arch-kernel)/conf" || die
+		config ${KERN_BUILD} || die
+	fi
+}
+
+src_compile() {
+	if use build-kernel ; then
+		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
+			cd "${WORKDIR}"/usr.bin/bmake || die
+			CC=${CHOST}-gcc freebsd_src_compile
+			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
+		fi
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_compile depend
+		freebsd_src_compile
+	else
+		einfo "Nothing to compile.."
+	fi
+}
+
+src_install() {
+	if use build-kernel ; then
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_install
+		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
+		cd "${S}"
+	fi
+
+	insinto "/usr/src/sys"
+	doins -r "${S}/".
+	if use zfs ; then
+		insinto "/usr/src/cddl"
+		doins -r "${WORKDIR}/cddl/".
+	fi
+}
+
+pkg_preinst() {
+	if [[ -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys is a symlink, removing it..."
+		rm -f "${ROOT}/usr/src/sys"
+	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
+
+	ewarn "If you want manual compile (not recommended), please don't forget the following step."
+	if ! use sparc-fbsd ; then
+		ewarn "export CC=clang"
+		ewarn "export CXX=clang++"
+	fi
+	if ! use zfs ; then
+		ewarn "export WITHOUT_CDDL="
+		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
+	fi
+	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
+		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
+	fi
+}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r1.ebuild
new file mode 100644
index 000000000000..841cbee3c042
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="0"
+LICENSE="BSD zfs? ( CDDL )"
+
+IUSE="+build-kernel debug dtrace zfs"
+
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-16:07/ipi.patch"
+	"EN-16:08/zfs.patch" )
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
+fi
+
+EXTRACTONLY="
+	sys/
+	contrib/bmake/
+	usr.bin/bmake/
+"
+
+RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!sys-freebsd/virtio-kmod
+	!sys-fs/fuse4bsd
+	!<sys-freebsd/freebsd-sources-9.2_beta1"
+DEPEND="build-kernel? (
+		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+		>=sys-freebsd/freebsd-usbin-9.1
+		=sys-freebsd/freebsd-mk-defs-${RV}*
+	)"
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+KERN_BUILD=GENTOO
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+	"${FILESDIR}/${PN}-10.0-gentoo.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	"${FILESDIR}/${PN}-7.1-includes.patch"
+	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
+	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
+
+pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
+	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+}
+
+src_prepare() {
+	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
+
+	# 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 10.0-RELEASE it's 1000001.
+	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	# Set the kernel configuration using USE flags.
+	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
+	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
+	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
+
+	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
+	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
+}
+
+src_configure() {
+	if use build-kernel ; then
+		tc-export CC
+		cd "${S}/$(tc-arch-kernel)/conf" || die
+		config ${KERN_BUILD} || die
+	fi
+}
+
+src_compile() {
+	if use build-kernel ; then
+		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
+			cd "${WORKDIR}"/usr.bin/bmake || die
+			CC=${CHOST}-gcc freebsd_src_compile
+			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
+		fi
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_compile depend
+		freebsd_src_compile
+	else
+		einfo "Nothing to compile.."
+	fi
+}
+
+src_install() {
+	if use build-kernel ; then
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_install
+		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
+		cd "${S}"
+	fi
+
+	insinto "/usr/src/sys"
+	doins -r "${S}/".
+	if use zfs ; then
+		insinto "/usr/src/cddl"
+		doins -r "${WORKDIR}/cddl/".
+	fi
+}
+
+pkg_preinst() {
+	if [[ -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys is a symlink, removing it..."
+		rm -f "${ROOT}/usr/src/sys"
+	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
+
+	ewarn "If you want manual compile (not recommended), please don't forget the following step."
+	if ! use sparc-fbsd ; then
+		ewarn "export CC=clang"
+		ewarn "export CXX=clang++"
+	fi
+	if ! use zfs ; then
+		ewarn "export WITHOUT_CDDL="
+		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
+	fi
+	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
+		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
+	fi
+}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3.ebuild
deleted file mode 100644
index 073893e014d2..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
-
-pkg_setup() {
-	# Add the required source files.
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	# 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 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use zfs ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	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
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
-- 
cgit v1.2.3-65-gdbad