3 files changed, 135 insertions, 15 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 7d658de779c6..06bf3510ba50 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.67 2014/01/27 04:48:35 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.68 2014/04/10 03:12:25 ryao Exp $
+
+*spl-0.6.2-r4 (10 Apr 2014)
+
+  10 Apr 2014; Richard Yao <ryao@gentoo.org> +spl-0.6.2-r4.ebuild:
+  Module versioning support and Linux 3.14 support bump
 
 *spl-0.6.2-r3 (27 Jan 2014)
 
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index ffb43811ab48..5fa93a0d2caa 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -26,6 +26,7 @@ DIST spl-0.6.1.tar.gz 213191 SHA256 24d73eeeb0b08bcc162342c5236f116b90ed0a2e6934
 DIST spl-0.6.2-p0.tar.xz 3740 SHA256 e07570e0141d0563f38c0eb48c2a43432720f03e805ed0bbc16b657826f8f0fb SHA512 512690cbde850e57b25bdff633efb33838d08591c1923cf8e01d15e0b84e7730fc12f7d64dc39c90d1a6d74e8e344065b86465d2d7651ed4974baa5c99aecca8 WHIRLPOOL 10944742881f92d041f7ed3054cf6a22373919a6a469b2ef6c4e83772c8197139339b8994f4bcbd449b4f33e629854a51240f6dad77bc5e690b76b9f7acac0ba
 DIST spl-0.6.2-p1.tar.xz 6552 SHA256 1784bccdd889dc7e2caa0b37a57d98d3db1b451043238b8c3b8af5da4bd84964 SHA512 12ae76e28a8fbf2d7051049be8a9226230a85b7cf8126839b3c285d7af01a7e4a12dbad33c94ed1edd2cbd9fa0392e9df499522f356dc1329579e76debeb7099 WHIRLPOOL 7c04bc7ae60f830b8c44ea2472a006a5cd81c8e0c3cafbf919f5d6e8088498362ea60c44c93b63af32e54c56b958e9edb35e8c37192efb6189d0da9d280f4e1c
 DIST spl-0.6.2-p2.tar.xz 8264 SHA256 2fb106eda86a19aa01ff33a74bc71e84facba82f67efb23cfbeb9f90d0653a93 SHA512 1f2484637a624e37859da8295f6301f755cf7abd3c4e4c4db815bc430e0adf03a26432d5004c76715869301a4dcf2affe789ed8c1b1a62dd97ca6f5a8d45abc3 WHIRLPOOL d3e335c30032082634668a259bec43ab72cd12da2f21b6fc83ad3bf2a2f93048edb7fd95a6f5bf09249eed178f0d34c016a96a1d7b2dc28298183fd535a1be18
+DIST spl-0.6.2-p3.tar.xz 8676 SHA256 8544b8f4bcbb29b61cae58d750fc442683a1ed200b58d90c7e0886eb812b3dc2 SHA512 a298765a1cb396192a08b2f8e4a1cffdbf50e3b720ae48b262958659386efa0ad4fc4550192c8bf672abc5a1c309ff2b1b6d64307bfb0ab29023a0adfa9ac858 WHIRLPOOL ca9e97e0fb52b5506fd3f410ef00fab05cfb01aed4727702c52e31f527967ae6c22d8bafb8f8faf039e937f5f32d446ef05c04e0adf0b8c8acfe26ff18507a75
 DIST spl-0.6.2.tar.gz 215032 SHA256 a8147eaba030ca71bf8c47b46a2c7ae92f9b4ef60aa8ccfa7368f395faeb85ac SHA512 ef5b77046259ec754e0a41f90b51c27207bf91e832d54a8502232b19cfaff711de301f24945ca739faeac2544b3ef22a57f58cf6298d756a1ebaff06f765b8a9 WHIRLPOOL ab7229691a6f56ab3f98513fd0e32048c11dd7cf3ea61e438bac2d97ebd8cd92eeeb422ef1c4e639572feb3e8f69c0840b861f654ca31de481601ef54295be37
 EBUILD spl-0.6.0_rc10.ebuild 2761 SHA256 7761c60372ff8dd15a42b3f0465677a0e5ea68d1a52669760027e93e98980b14 SHA512 77095f7fb504fe7c3dfbd7e7443c11f831d7cd08ec06b74249717fec77102d6ce715dee93092fbcc57a052824731a14e98b25f55793b505f90af1dc10ae376a6 WHIRLPOOL 6ff9e6b13268e64ce2fbfb933371a926da2d3308df583c353ace6053042f9504bb8d0ad0d9838ced4e1d1b87b384384bf8c35c4fe493f9637fc48a6745b25aa5
 EBUILD spl-0.6.0_rc11-r2.ebuild 2662 SHA256 38352e8e8bb40dcafd2232482db0266fb32008f0e35db3d0e8fa69c10d90a67c SHA512 a4ea604509da4fb98c48303c590e281fd1c576c4a6c57db3c73eb93fd90fa8135c18a9efe72a8084bd210a1aab69d6107c4865a58bebecf36e3c39f56dabc4b1 WHIRLPOOL f5186bb6e14cee091627727d4a227d0bb5900f7cf7a74a7adb6e1b4191b6001ae9de1f8e58674233b046725eabd6585a8284e6651d9aa7299c6a50826b1cc3ac
@@ -36,24 +37,25 @@ EBUILD spl-0.6.1-r3.ebuild 3168 SHA256 9d6497c36ac7f7c90ce277a529e80010e71f498b6
 EBUILD spl-0.6.2-r1.ebuild 2803 SHA256 b811b359b4fa3678775189ec2ea1458c227eb7aa32ec5237f55de024f4a647a0 SHA512 995278782beaf4439d00857fd04d4e41a8e572d7f85469126f81b184ef0ad7bb5886c140b9b080a966f92ee7d5ffc7e6b25324411c449ed31db520361639e159 WHIRLPOOL 54c46797943658c90790eed37941d8de2b0b7cd41acc5e356430aa09ae65541ee0e0d5de627f7a9413025bbd891cccb434099ac3d9067247a35864dc8fbefc27
 EBUILD spl-0.6.2-r2.ebuild 2803 SHA256 7cb6a8748d1a92a3013476661f20e19f8c633c83e6352105fbfedc473524fa41 SHA512 ff330940068e68c976d57b6c526998ede2eef988247cdb2f9294e1fde62122b3d91fa50974c03046e7d8aac2fe2469b44b1cf71d19f6b4f100a4877f606d1a33 WHIRLPOOL 26dcd074c9df0bb04d1ae7175c72c875a95636f352581ef1179a616dd8e39b903cc6a40385143c6465548de0e32e93ed9739f481bbe791d42b7aba3d1fcd69ff
 EBUILD spl-0.6.2-r3.ebuild 2803 SHA256 516d6ebe843d1a58fdabaf215545d1b60400e66abdddfa16b536db8be3d38578 SHA512 dd8cd024b65a28b0642f388290cee46385bb0d86ce7421e1c588e625029603aa10bb8085943f4d73387b1dfad8d77f59d3ba6d890a975000258f6b44ad231254 WHIRLPOOL 9b268ca17c69d2107488291a5065c9c168145d25db9592f0fc9e4f978d416f3552b2bf9aad11d7940924551164146f82d4385c0fb41b80bf1487eecb0625cadb
+EBUILD spl-0.6.2-r4.ebuild 2803 SHA256 cd33ed179b9d6cc85502e679c252c55717235838a9ce60cfbccf6433a357f583 SHA512 57b6437d48cf00ff5d009a30585c9398e36546cc64190c4535edaf11236774598bd4008edb1da4f874500659b5dd2718e82610d89a524aa34edf7886be3b27fb WHIRLPOOL 985313e0d3aff18981673874e5cd1b626df7de6347e412f55106673e121077a8c594ace32dc58068bf670fe0ad9d0fde68614b0e2abccbf3474956f4cf91f21d
 EBUILD spl-0.6.2.ebuild 2753 SHA256 ec4e5bf742b024f947cf67c29b173da8d116f307b07c4b8133f916ffc4597dcd SHA512 c0ed093310bcea33564b3c621dc9e72cdfc46c0edd20c026a1dbcbee02d56154e1c9829b65d7a10db2dc615f688c45c6766b42dd86e8e078961cbfb05df1cf19 WHIRLPOOL c892c44a627e871584b2da17ac427824d051933b725b6e482e0856f7ee8f5d32dd903c285a8fddede5b8e143b9da2e5a28c0021be5f9519d6955e450b7193cee
 EBUILD spl-9999.ebuild 2751 SHA256 4d36de6b940b8b6d396587a444fbfd492b963c6a81dbbc3f01409e81f5939158 SHA512 07fce75a9a8e21a1fca41b2a1869557e7021e4269ce7c7099294d98bf56d06cd5bdf6278ec5800e78baad09db52d0f19816fd10ccda84fb736ffa64c16752b49 WHIRLPOOL 4745ff4e05fbe4a6447e64afdabb55c92f4e720be2d66a0d31f54b963f1f80be0d9608d3b8ff7ae8fc98b44343f3e03912617d35961c479b25cee5aac60ecbfe
-MISC ChangeLog 12784 SHA256 3608a3a2d0ae1dcb6d8560e1762e602e18e8b1117195fa69f509bfd284051345 SHA512 7486c8f6ddc8c163514e60e0da9b0e87f349ad38260673b84f625ace07ff93d419962c4f9eb85066590ff0865c8db8a51b95c682d169f5499e4a69c043bffa1a WHIRLPOOL 730031d32ef1c5a0a0ef6b8ef134dc9d8c6087fbba4ac8ad73344f3082e1383a28daeed1edbd7f4e11b9762fb2455014bebe378d101c4ffdf185398a97e7bddd
+MISC ChangeLog 12937 SHA256 4350edf6b3c3acfca15eb33df0576065ce22d5ffe60fcd325c0256ebc65f1671 SHA512 df14e021525594fb3f9b5359bc484b85fa57fbf242d23f81e205a4855e8f8d70c3afe28fef901ee8155992c3bc943e0121eebba4eec84be5ad08f148e55f0ba4 WHIRLPOOL ae94ce0fd964c07c60dab309f04deae6d7d2efa56fc58bc7a07eac6dc0e422384e790d7a21e0d8f1fc0183d4ea5c24a8e50bde98981215d11c4df747dae00265
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5eVVAAoJECDuEZm+6ExkIicP/iQEn7vd/yu7KuRuyu7iMvvS
-bxlaQ8QwIbT4jH/jb0AF6e/l4f549UwQIWTKRMAxxQiW5pOAvsUdfbiUpXbRk9vZ
-Bc/wE/8kpZf7SlC+q0YXAVFWp333UzfnFX8+84Shqle0ue7AOapsATL5MNbMCxHT
-rN5DwAgB8GZ3pqpmKOcheuN4ltxZ0eZx/dkB+NvAkc3z8u/TrGnwvuF/gxU8rfTm
-xiHKLJn2Qi01nisnVHu/YGGQE1NDtRqDg5nS+ooeqj1P+jMbQnqjcpDCAWheS2qx
-H8vwCQmcy8fIKEFO+H4qFtsoBWrxAsMQrUo/qmLhnxVDoWcKbI9MQeZoax3yeDll
-/6qfNrbCqav1QkjLkdV5OTplteKD/2pMUetLsfEC91z8fyfTQ8mwbMbWk8tyOWOZ
-WvQUtEAHyKbVChCowy/3zkaVhbvYx8tFYQHlGvSJPSgFHJxTuhVVTXFq79i/hQPg
-zr4Z3LwQx9wE4FnpdOLZBRpJfkKsIe6sAs96r+pRMw6ZI60bSS2JigVq08cFkG7c
-X6bCANaA03o2zOOEbLs8KRjMe1fv3DhsALI91+A+RLpascRzX5pV9/p7N5o4LVAF
-J0/JJkF9FOl6SLU28wZmVAwWXqctVibap3vhjPVYOPyu7dpSX8mfePPVoZeIgCrw
-oGvJYah+1/If/U1r/cKW
-=vDYB
+iQIcBAEBCAAGBQJTRgwPAAoJECDuEZm+6ExkcuoQAKm0IgfDRW7P1Ai5+9P1M7Tw
+JYDXhQXmP0VDjW8+mKVD4tb766rNAZaRqFZfSLBx6qAqsDwidcHq+a4mNR7NUzrF
+/D1ALpTo5qHwD5JRTuUC32ivZQLvAbulOui7uT+4stYhwvQRqFqyeXELU4laAph/
+2LQ7ENImCruO+v9MPTg79n+4Q/MQEPeiULkx5e3sF2hfgtOymzcJzT0508CI47M7
+1ETpTGFv1UDmK6QxBRd+aFMMkkZ+XprUV8/NqChabJGVpiydaPrkZW/1IrjciiVk
+TM0ozZNOsYDrgbvopRkG2C+siJvGKDfDtafWklYxYR+xi9Y2ABQnVOBXJeHq4ZUN
+MG78tcux+0j6iW5gE4vaLSR1bmM180HParbAlSW+84TXuTlcpmRjwm9W9/NccrIu
+WVhgHA1NXn3Uei23fVqQuxIPfRS9LMZQx4Cqcw29BIZe1NwTFy7Tlr9ZzNu0TPFm
+ks3I4GoSWerlAeSvlZnaWIns5Idz7JtboO7FXLBxP77eqB/v+OnZoJu/2aSDCqzP
+ca69RFuiW+v04LabxkQK3UQnPxzEq7nCkIcJBl6cAWszYV7lpoOxs41nvEk/Xz64
+F+VZV8KNJ4gzGOpTg9vgaarysgGW+X3sCVv9uHDY4WyN9ETJ60SdMFb9dlJfEJc3
+S8GEuz8V//5viLxrg4Mi
+=1+3U
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/spl-0.6.2-r4.ebuild b/sys-kernel/spl/spl-0.6.2-r4.ebuild
new file mode 100644
index 000000000000..3a849488c904
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.2-r4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.2-r4.ebuild,v 1.1 2014/04/10 03:12:25 ryao Exp $
+
+EAPI="4"
+AUTOTOOLS_AUTORECONF="1"
+
+inherit flag-o-matic linux-info 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
+		http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p3.tar.xz"
+	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="dev-lang/perl
+	virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	linux-info_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 14 || die "Linux 3.14 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
+		# Apply patch set
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
+	fi
+
+	# splat is unnecessary unless we are debugging
+	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	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_install() {
+	autotools-utils_src_install
+	dodoc AUTHORS DISCLAIMER README.markdown
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+}