Backport kernel compatibility fixes to older versions in all situations possible without new patches

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

10 files changed, 57 insertions, 412 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 6d80bcaf5d97..28718fbd2c18 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.43 2013/02/06 01:45:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.44 2013/02/11 23:25:16 ryao Exp $
+
+  11 Feb 2013; Richard Yao <ryao@gentoo.org> -spl-0.6.0_rc11.ebuild,
+  -spl-0.6.0_rc12.ebuild, -spl-0.6.0_rc13-r1.ebuild, -spl-0.6.0_rc13.ebuild,
+  spl-0.6.0_rc10.ebuild, spl-0.6.0_rc11-r2.ebuild, spl-0.6.0_rc12-r1.ebuild,
+  spl-0.6.0_rc13-r2.ebuild:
+  Backport kernel compatibility fixes to older versions in all situations
+  possible without new patches
 
 *spl-0.6.0_rc14-r1 (06 Feb 2013)
 
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index e375cc31041b..d44b47d21336 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -12,15 +12,11 @@ DIST spl-0.6.0-rc11.tar.gz 521190 SHA256 0f39edfb87c444781080e6f60acbd1094e3113c
 DIST spl-0.6.0-rc12.tar.gz 546842 SHA256 5352ecfa3bed7807bf4b154121c7f6349d986fea44125bd171240985ef28c898 SHA512 d71db7cc6e8ddec13f90a089a60d9b024f16576ed47b5458b88b7a8efad833b95219d9802c57edf76bfa77e65fd523e31aa768a37f8cd4036c828e7e4cf0534d WHIRLPOOL c6adccbcb9e7c30bead63b94168fc6348cd25ce3348e9e8191797b4100481fb727633760692c8aebb263062b393ae843aeb97718d106ac611e6664d1c5d475b3
 DIST spl-0.6.0-rc13.tar.gz 210192 SHA256 500d9c9297f2b7abdc4fce43efe05dddda2edbe403f9ca76d01ae632f798ee1f SHA512 630b63c15e98ada397bc8b8a1a5b6a48255ffa5d7fad8dd0ed9ad7fbede32f3557651effcc99234ffef1a1b9bb13e289c0ca5a2cf60307e0a57ac3a93b709f6b WHIRLPOOL 9330dd1567421e610a714b69d096bbae66c102baaf90fa3daed45cc1a2928eb3dd0e8537f3cf83a7fb2b157bf52ff37b031bcf6c9f52760acd6e480ad335b69a
 DIST spl-0.6.0-rc14.tar.gz 210495 SHA256 92785e2c2c6caf93ec31175e192a18b27458613a99e6578041f6029875b061e3 SHA512 85d066a97d62ce60f60c552d121c20d5a719e95e0eb6d7ec1b10e29acca1e3429a751bcbb811e9cee2a14282c8908684cb9ee0df9cbc8e53ddfe47da18df4cf9 WHIRLPOOL 6473236476dd9a2d392e2f71fee6810ed83e68f309d1eaaa5fbad1f73ae567ad629db97a2bc81a4ad9e28991f4be3d4100c1b9ab0f65941206afe6e5b03f64ab
-EBUILD spl-0.6.0_rc10.ebuild 2270 SHA256 7e92260be5292c5bb21c7ec72ecfc6cf48493a185aa32f0acb7fe9c03eb48593 SHA512 b5f7f52d4c911c5bee17a9623001dd4cd53f9e92efa837693e8fa4c8a124a370d05ab86fd0d53b7f1e9e2133f34749fea9341c3b3a62d80ac53d9cf717d87d82 WHIRLPOOL 5c07c427d66c768bf0381d6289b43aebb0acc4b7b438aa07c7eb165e88621481750406ca7284af3730ff3c429b57e1d4fd04cd9f8dd416ba3925840f2b618212
-EBUILD spl-0.6.0_rc11-r2.ebuild 2389 SHA256 92e7e9fa0e7bbb39a4f9c302443b542b321be6b35a56c90231c0a760921d1937 SHA512 d2b3e3f67c4c69683398392465d8fd1c3e1ba7087eab45f2c39cdb74d314304ba706ad5769742f0bbb7eb2dcdfaa1d5946f968dc5d58df092dd02eeb9d350056 WHIRLPOOL 5f10a92a2c76130b931cb70248bcffb9b06061a3c4c3bcb39593452c7d9bbc3b9a4737cb11dea1bda2d0c6cdf393c0e17baa3d768f83a923df9488776d8d1986
-EBUILD spl-0.6.0_rc11.ebuild 2206 SHA256 a3ecf91b15147a7fac8b8c345f99a6400aae2d9368904260ffcbe947bbb1443a SHA512 e1b38b8abac67a5ba4801dc7978ad56245ff72e39a28ace601da860c625504298e26ed91e03ce51e7bf7262b0ab3d35643c9001aa2c9161acae28cb319c24d6c WHIRLPOOL 15c334f014bbbaa6567ff1fe3769c41f96d7192a1f91476a69def5c153eec613a2acc39253d1758796fffad37213a009efac9d09955be5fce0304bb00436c128
-EBUILD spl-0.6.0_rc12-r1.ebuild 2405 SHA256 593bc66ae7567628928618279b11417a6fdb669da8e3783b1acb9b49c9c04091 SHA512 033df4488c5be473beb35bc7cca4bdace3201d2ce499d7189e447b2b8b7934a23aeb0fafd000c1543a4a8268218ec3baffea18446dd7f2f1b66d910b3a2b5a58 WHIRLPOOL 5e329a1910c587d4ce83243b4425e0efc6a094a05e9cb7d6a214bc4bd153f188e0f044d4a34acc4faf5c2acc1b76c52b0f1a0b3cbe9cebb83352c4d0fb3d2d98
-EBUILD spl-0.6.0_rc12.ebuild 2180 SHA256 f8743858eed39d98302bb9a63cb218e4681b7f826d1da4f9204c7216129ba48b SHA512 4029ec5377bf66f46f5d5343a5c18b7f08f54737bd721e68784db9dae71eee117cd7e6ccc060034621cacc91eb4caf42fa8b4ced4caf7b810041015662ab3768 WHIRLPOOL 7c4a7c1e834839f19e1f4d042bcc3039ca2a8bf3059bde206f2670c2abd454b8619935100042ddfd79172e1097cf0bef245a1f2116a53623fc8aba5344869c30
-EBUILD spl-0.6.0_rc13-r1.ebuild 2418 SHA256 06d541b6dbb6ab42e1558ff5eee17fa0bbc72267934ed7203a98a66e9f6b4f75 SHA512 0b685f87123346bf5cdbab2c0102e98103c85e6324d8003ec51bf6d8719da291513d994e76931d7fed4552d624c7b73bfd6242a8456d7a85ed4a5d89adde4785 WHIRLPOOL e80653195c82f75191f14e48e2eab2f4ba95ab56fa1587897c1d93da2bcc7320cfc20395157638384c7f47cd9115edce71d1f22b268f667f5f46b3fa1422b7c5
-EBUILD spl-0.6.0_rc13-r2.ebuild 2441 SHA256 0336a2a57270a032e96f66cd467c1dbce64ffd34eda248ebdeab70f85eff242f SHA512 90a858d44b5346500f29eb3d05ee35195e2c97a6633e407a7be568bf98e3271b8cd3665942f326b0ffb1122c7f395d3c552061f85e9a48768acc3b541c0b89b3 WHIRLPOOL 5a82db1aaca745d0d8a9d62753b003a670086ef5def314de7a54b690090ea58be943068ad19f70669c1b119b1e7f98abe7dd80e8aea94a2d8d30fe6e3fc28f5b
-EBUILD spl-0.6.0_rc13.ebuild 2184 SHA256 33647f2c160bf3922d4327677f45487fe8352b9d6ebc7d3ca5c7a132cd6225df SHA512 36b1dad8a8d181744a3d3ca12ce6272c217845d6a350ccd4e9ce4927cfc5c24ac206dd88978ecace616881c0b78e60642bea609b9ee61e1e079ff1f19f2a8941 WHIRLPOOL abecc7f63ed1bfcc386103e827b83fbc46764322d29b3401b71c6120dfff20ef6a6d11c215ae41d1000068fbbb8b6250848be261cf71e01ae7f85462e0074ed1
+EBUILD spl-0.6.0_rc10.ebuild 2725 SHA256 5dd0e5d92b4bb98f2ac0e6c247b675ee9742832e74008c240fe22cbed1b5a134 SHA512 b45629a8c0fb0f3ec51e5a0ed1a9f133c4fca3e3cf4d4ab37af12ac6168cdaa0c332d99fa7dab329c247c9b2e5d437ea0c35e15d16be9c582d0843f00653692c WHIRLPOOL 9bcd72fcfa8e9f06a95ff9e247c449a292a6268786c296742d0431ef0bf5e9d7a173ce3e244807a3e8696cf35a8efaee14892f2d1dae838d68459aba26fc7364
+EBUILD spl-0.6.0_rc11-r2.ebuild 2633 SHA256 afb50729119fd9fcedcd48f4f4f4b36062fb7f4a69c1f67f6fea0b83d35e0ef5 SHA512 f1cbdc1a6c226d711b6e8c8937c349ceb5c06fa416cde3f36992dd932703bb4deeda70ebed563d42a622417d904644b22f8ed3280704d3ed822f66f6ddd8c3e0 WHIRLPOOL 9b288b043971558230be7c728ce3d5317a9b7358a792eceac512274025248ccec0ee45b73d166c052462cd7567b36a814a66c29b7a269e2db15d0459fb5616ad
+EBUILD spl-0.6.0_rc12-r1.ebuild 2689 SHA256 c71c87ffdb0bd02acbc5692f6c7c90833badc2ad8616da319dbdd2f265307e80 SHA512 c883bb47acd6f6cf29a28b306c8e25d9acbd8ea1acea6a690d83a783d2289a158856dda93aa6ffda3ebfc41f92ebc307110a95dd7dd105edd0a49bcf58d11947 WHIRLPOOL 4702932aea93b39ba394c41c1a7d8a17060cd915e7da760c9cf00e47413a5e0b2013b0da256f76ddd5282227e23da730dc6dc8333e8698a5cdeef244e735a2de
+EBUILD spl-0.6.0_rc13-r2.ebuild 2685 SHA256 50b309bd16cdc8c0f1622c9e5d23a02b44f06769fb9989450e77f0de8883b07c SHA512 c47b78ae89443946adc050d6542827d718c465b56eccf17954df951328927b208a53a5784b09e1666478e78d5d943f83ab336b576c6b3c84df61be7aa07a3fb2 WHIRLPOOL cd3e45107d382337cca6cadca74859deb69481eae447854a6b825a0e67ae45f1f45ecd807ffb22b3e6090ec27879f015bf2c055d4827a197b7c2ba4a39e344dc
 EBUILD spl-0.6.0_rc14-r1.ebuild 2464 SHA256 cffd632a2c1faa6f5020d51f6d7c3d39a43563960f3f5197b7f34bb7734bfff9 SHA512 8a5358a196b07b23e55d702fca3dae517d7529f8754b80a2f6d62fa65c1daddf57d0c199850da0316917a250cb558f7f7018ba867b5ebb7abc00251e692e4092 WHIRLPOOL e357b6907d86b0624a8b3b80beb33e9176a62e96d2095108bbce8c3b7e162c0f989317e6f829bd9b0f8a18f41dff2624f2921742f26c8c78c3fbcf79312ddaeb
 EBUILD spl-9999.ebuild 2456 SHA256 9adc2d8f018fd6053ab82ec16e5e6e84b0122422e2126fa469009bf7cc888bd6 SHA512 c78e9a081186dc2f72a2fd1c43ea2f2131e9bbb38a955f1e4be8c27532666cd53bf083021be97433c23f1e3fb8a6cebb36ba725263c57015d8aa39f596c99170 WHIRLPOOL 00d4e3da3d3e6c1831aad13256928f3686a8089afd18f45521f20d97850a9a2c704958693888d0e345eaaf7380ce18361c09b50f8c23f65b33768c13941db38d
-MISC ChangeLog 7780 SHA256 32c1cd8f9eebfafcf9f51be8c33f36c3d17c92800515e7bcd8577a94a236f89d SHA512 5a4448b0fb7b908a6c786902590cf6a7c38e91bfba3f9c3f8907add9d07744f2a906150e026c9be77b362401c59160b43757256d12d3e10fd4b633d13229d989 WHIRLPOOL 96ff53cd60dd4497c9eb6979de4b0b2b1b6bd3804370a2d1fbb6b6e36bdbb825c6765889c47de0970f4db44620cce55227df2a53faba431e788493b275263a91
+MISC ChangeLog 8137 SHA256 4a5cea44248008095e377de67e9a55dca8f2a84f99be723e7486a29821d65740 SHA512 ff603208c1c7102429de6252e65d92df9e955c292ff2a323ff613dfe2d8deb7819189d1edc7e02e3b04a38a5c7e2da9ba9c4701aa3102d770e3f1ffa29f20311 WHIRLPOOL 004dd72b4bb4103b7409b662e246263a7f11d6b2ec6f3017b7947d0ee361e624c04873d6416ccb894c7e97cb478aa13eb0bd5d0c92da7792e37f1352634fefec
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
diff --git a/sys-kernel/spl/spl-0.6.0_rc10.ebuild b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
index af7374fd0c6e..24ac78e39e08 100644
--- a/sys-kernel/spl/spl-0.6.0_rc10.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.7 2013/02/06 01:45:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.8 2013/02/11 23:25:16 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -50,7 +50,7 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 5 || die "Linux 3.5 is the latest supported version."; }
+		{ kernel_is le 3 6 || die "Linux 3.6 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -61,7 +61,18 @@ src_prepare() {
 
 	if [ ${PV} != "9999" ]
 	then
+		# Fix potential deadlocks when ZFS is used on swap
 		epatch "${FILESDIR}/${PN}-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch"
+
+		# Linux 3.6 Support
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc12-fix-3.6-compat-regression.patch"
+
+		# Fix x86 build failures on Linux 3.4 and later, bug #450646
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-atomic64-checks.patch"
+
+		# Fix autotools check that fails on ~ppc64
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-mutex-owner-check.patch"
 	fi
 
 	autotools-utils_src_prepare
diff --git a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
index 48b390d678a2..98c86795933d 100644
--- a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.6 2013/02/06 01:45:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.7 2013/02/11 23:25:16 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -64,6 +64,12 @@ src_prepare() {
 		# Linux 3.6 Support
 		epatch "${FILESDIR}/${P}-linux-3.6-compat.patch"
 		epatch "${FILESDIR}/${PN}-0.6.0_rc12-fix-3.6-compat-regression.patch"
+
+		# Fix x86 build failures on Linux 3.4 and later, bug #450646
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-atomic64-checks.patch"
+
+		# Fix autotools check that fails on ~ppc64
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-mutex-owner-check.patch"
 	fi
 
 	autotools-utils_src_prepare
diff --git a/sys-kernel/spl/spl-0.6.0_rc11.ebuild b/sys-kernel/spl/spl-0.6.0_rc11.ebuild
deleted file mode 100644
index b0c94a761ee7..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11.ebuild,v 1.5 2013/02/06 01:45:21 ryao Exp $
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 5 || die "Linux 3.5 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-		$(use_enable debug-log)
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
index 4e3222b8a5b0..1a3b7bbe6075 100644
--- a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.4 2013/02/06 01:45:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.5 2013/02/11 23:25:16 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -50,7 +50,7 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 7 || die "Linux 3.7 is the latest supported version."; }
+		{ kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -59,14 +59,23 @@ src_prepare() {
 	# Workaround for hard coded path
 	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
 
-	# Stability Fix
-	epatch "${FILESDIR}/${P}-fix-race-in-slabs.patch"
+	if [ ${PV} != "9999" ]
+	then
+		# Stability Fix
+		epatch "${FILESDIR}/${P}-fix-race-in-slabs.patch"
+
+		# Linux 3.6 Support
+		epatch "${FILESDIR}/${P}-fix-3.6-compat-regression.patch"
 
-	# Linux 3.6 Support
-	epatch "${FILESDIR}/${P}-fix-3.6-compat-regression.patch"
+		# Linux 3.7 Support
+		epatch "${FILESDIR}/${P}-linux-3.7-compat.patch"
 
-	# Linux 3.7 Support
-	epatch "${FILESDIR}/${P}-linux-3.7-compat.patch"
+		# Fix x86 build failures on Linux 3.4 and later, bug #450646
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-atomic64-checks.patch"
+
+		# Fix autotools check that fails on ~ppc64
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-mutex-owner-check.patch"
+	fi
 
 	autotools-utils_src_prepare
 }
diff --git a/sys-kernel/spl/spl-0.6.0_rc12.ebuild b/sys-kernel/spl/spl-0.6.0_rc12.ebuild
deleted file mode 100644
index a89c8124f102..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12.ebuild,v 1.5 2013/02/06 01:45:21 ryao Exp $
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 6 || die "Linux 3.6 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
deleted file mode 100644
index b176845c609f..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild,v 1.3 2013/02/06 01:45:21 ryao Exp $
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	if [ ${PV} != "9999" ]
-	then
-		# Fix on_each_cpu autotools to work correctly
-		epatch "${FILESDIR}/${P}-fix-on_each_cpu-autotools-check.patch"
-
-		# Fix soft lockup regression
-		epatch "${FILESDIR}/${P}-fix-soft-lockup.patch"
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
index 35fa279d54bd..b99c08948ebd 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.2 2013/02/06 01:45:21 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.3 2013/02/11 23:25:16 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -66,6 +66,12 @@ src_prepare() {
 
 		# Fix soft lockup regression
 		epatch "${FILESDIR}/${P}-fix-soft-lockup.patch"
+
+		# Fix x86 build failures on Linux 3.4 and later, bug #450646
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-atomic64-checks.patch"
+
+		# Fix autotools check that fails on ~ppc64
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-fix-mutex-owner-check.patch"
 	fi
 
 	autotools-utils_src_prepare
diff --git a/sys-kernel/spl/spl-0.6.0_rc13.ebuild b/sys-kernel/spl/spl-0.6.0_rc13.ebuild
deleted file mode 100644
index e6f36dc0bb1d..000000000000
--- a/sys-kernel/spl/spl-0.6.0_rc13.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13.ebuild,v 1.3 2013/02/06 01:45:21 ryao Exp $
-
-EAPI="4"
-AUTOTOOLS_AUTORECONF="1"
-
-inherit flag-o-matic linux-mod autotools-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug debug-log"
-RESTRICT="test"
-
-COMMON_DEPEND="virtual/awk"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-devel/spl"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		!GRKERNSEC_HIDESYM
-		MODULES
-		KALLSYMS
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 7 || die "Linux 3.7 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=all
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-		$(use_enable debug-log)
-	)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	if [[ ! -e /proc/modules ]]
-	then
-		die  "Missing /proc/modules"
-	elif [[ $UID -ne 0 ]]
-	then
-		ewarn "Cannot run make check tests with FEATURES=userpriv."
-		ewarn "Skipping make check tests."
-	elif grep -q '^spl ' /proc/modules
-	then
-		ewarn "Cannot run make check tests with module spl loaded."
-		ewarn "Skipping make check tests."
-	else
-		autotools-utils_src_test
-	fi
-}