Improved 3.11 compatibility

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

3 files changed, 135 insertions, 15 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 3adfb85e7a4d..65126219407d 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.62 2013/08/23 23:19:49 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.63 2013/10/05 21:50:23 ryao Exp $
+
+*spl-0.6.2-r1 (05 Oct 2013)
+
+  05 Oct 2013; Richard Yao <ryao@gentoo.org> +spl-0.6.2-r1.ebuild:
+  Improved 3.11 compatibility
 
 *spl-0.6.2 (23 Aug 2013)
 
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 9bc59f213246..17bae3c743b3 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -23,6 +23,7 @@ DIST spl-0.6.0-rc12.tar.gz 546842 SHA256 5352ecfa3bed7807bf4b154121c7f6349d986fe
 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
 DIST spl-0.6.1.tar.gz 213191 SHA256 24d73eeeb0b08bcc162342c5236f116b90ed0a2e69344ae34de744f61c2e3663 SHA512 116117235b4730b5e7041107188747fa2872fb204a08d67a03e1ec95d6302ca57aa17edd12e6f9284492a844e60d446a25d1172d7a2ce53075c36bd889879b31 WHIRLPOOL 4554eb9ba4a2b60fbfc7d73ada4b5c7ce20b26d6655f0a8d9fe5479d11124acc27cf2ba6eab5af4e4a08c886b06687dcbb656322c8e26c43f07b4066770f9a4d
+DIST spl-0.6.2-p0.tar.xz 3740 SHA256 e07570e0141d0563f38c0eb48c2a43432720f03e805ed0bbc16b657826f8f0fb SHA512 512690cbde850e57b25bdff633efb33838d08591c1923cf8e01d15e0b84e7730fc12f7d64dc39c90d1a6d74e8e344065b86465d2d7651ed4974baa5c99aecca8 WHIRLPOOL 10944742881f92d041f7ed3054cf6a22373919a6a469b2ef6c4e83772c8197139339b8994f4bcbd449b4f33e629854a51240f6dad77bc5e690b76b9f7acac0ba
 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
@@ -30,24 +31,25 @@ EBUILD spl-0.6.0_rc12-r1.ebuild 2724 SHA256 c823bbd4e526ce3d27470a13c05ae719c7f9
 EBUILD spl-0.6.0_rc13-r2.ebuild 2733 SHA256 3fa4d14bc8ab5fe37b37bb864a5aa5626dd00ba476dfac8fe4ffba5fe1ab9800 SHA512 4e4f5072ba99b71d6e6c648f46e24bbea3d8a83a165b5fedcc58c7f24a4516de24ecf2ca6b746f4a30dfa70e3b8e1f25a9ea2138727dbcab6b05c929114fb552 WHIRLPOOL de5356479b58616466140faac63f5b7c2f790568abdb91479a296a64d3696a68f03752dedb8136036ea49715ea30e0c6ba98ffc384501576be84231b1d19b0c1
 EBUILD spl-0.6.0_rc14-r3.ebuild 3006 SHA256 9d18af9888114c69a69f4a84c5fe0af68e43e4e129729b2a2d0f222828e19dda SHA512 1ff588df6dd6f807f35eb8b77f348a0cf622eea066f03db8fb777d620ee57184ea50d72842fb37d0ec18b5401c9415e40a9654a3f2f58f55b1d50cfba4336ffb WHIRLPOOL 4cbdaa9397e73774aaeea8bb8ff1d00fcb5368fc0a30cda60fba06e2359663aae12acc9b4dc138eec336ce69e0aa16be61a851e8f06b75ebc1dde021d2380e9f
 EBUILD spl-0.6.1-r3.ebuild 3168 SHA256 9d6497c36ac7f7c90ce277a529e80010e71f498b6dfc8f794c03cf85d664b813 SHA512 9f56c5f34a639c81fd6e165ddd03a51627a915a3e3339c39c29f75b02d790ffdbfe3693c2a306deb36dbb02540b7e81775f0a40f17e37f287f06a7caa9c98097 WHIRLPOOL 892988b98edd8dae4a92049dd369ca419e69a905fc839316218efb43b4f7c43e47f1a546ac1f8f4aed04081ac086d23391206eaeba2fc56773f617a8dff8ca05
+EBUILD spl-0.6.2-r1.ebuild 2803 SHA256 841e09180d6e7a61ae7f5c0dcb0577bf48a7063757c20eeb2eff767ae59e9dd9 SHA512 a9391b2ffd1ec80e10ec85075ca9b17d37107afc0cc020a9dc7716e291024efc5af7ac11c8f3a2d2383c49c1f556ea19da832527e2867c5bb60cd5ec7753fa10 WHIRLPOOL b7927d345f3a90e9795492f422627ef75bc4a6b744ec315e12cb75420c730a90d92ede62af292e96044f60faed60b990aa0fc6de1936da2413cb304fa805e5bf
 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 11968 SHA256 9c0e9d0581757433991d84dfe96001c0a4c61e2e6a1f99e421cb637252e6468f SHA512 23595e2b02dad5d7f5b38f8d93e18ef6c6ce9a7f9ada7c85f9fa5e42128d9848f99dbbc04ff8888251b9ac0a392018f7a45aae5a9d1154c73c4ea2cc02059044 WHIRLPOOL 1ab72792aaf97fdc0aa76e9a3221acc8ab87d70ebaea8d71be1ed1b8506d70ed4af7e83ae456f979c5fa2433d70fc61148438fe294ac51da053ef482831139fd
+MISC ChangeLog 12095 SHA256 b8fa9489384df100e34392377765783ffb2ab15ab9f704bcce8e219a5317f8a2 SHA512 7371d9c3dd0eb883d2ce842e686073d01499ec236325ba10555e33271b04342d07ce8d7d0fd982ff9d49baf15ed9a4374b32af54b2e50e0260fbb7546f5cc395 WHIRLPOOL ec7cad8396a8bcf8016dc7c71010279395e94d09f94340fc8b0f2c29a8c1625436db21b295aaabfdf98efd04f338f5a419ad8c174d7f226115112323a661515b
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSF+4KAAoJECDuEZm+6ExkQE8P/3eojDiEL9e5/mI7u7Y04Ra0
-W6/5aCYq0t15ZI3iunKBwxIxtdBYGIVo1m6fhy/OSVEnyMEjhS+GZxWtdBM5yoV5
-9VFzFQALiKsD2kh2KDuXO2ghwvE0552lBTzDnwgtFCGZfvH4UdGE4H1ni7OPkj6k
-okGIUTPjheOGxHoBD3pBg5Ucb4UDzr3fL/7p364qxNVjLo8ymZ0kZt5Jcp2zyZUg
-NsNEXnMDd/SXMoYzxk/rr3OZQrWSc1kG4G1DwJq44fbYrW8sVqXGx/D6hrGrGXSs
-9sd1zo4IS0TSRti0CBfB6ljUpt+AnktC6BhJBdGZlb6JUkx3qK6bO1YewExkCoUM
-G9nkbaTvH3ua6YSRO2qJW6TLAFgifIvYWB16g3Rf/N4WnBY3ytffv1oOj+Ydy0s8
-hyIaIcgzC+1iNk4d+Xg3Hx7M0Vzxd2047XSBPIxRXEXOGjE3DFtDQrlxbw6bkTS6
-xOqTRIC80PukVy9pc9OEv59e21B2Y9rqzru1owkdqoWY3wDNgHJxT3UE+DYLWt6t
-c7lv7GH2+nV2CN5BanfEEFeo70r4OFZYOL1afs3I861j5+3uxqEZVYyWeHAEzDgq
-N/dt07yX8S1XloejBUTc7EJ3lQsJtl5uvv/lRzVuin6MvpLMhtg/8Vbx//jb5YBY
-ccGqTBwadAcZjILlCHKH
-=87re
+iQIcBAEBCAAGBQJSUIl0AAoJECDuEZm+6Exk4WgQAIxWCD80wMtaSIgiOLWwz9Bw
+dgiP33VY4IG2JOCk8XBaoXmFC7gvvLVDoQOwtvql1FF7OmbdOkaRXzZqSIkvsOY9
+SO+Gs9RuvZcVwq8TjTFf2msHUmsJRRQ3wZqeIU7THXtakKMOXt6HidhZqbMN0DBA
+a96UPaoBOqzhxjuk8JX8SBYlTOx095smyRkZXFLnzXLXtaoqL+9I3PDJngDiUSSW
+g5GtAJcq1sW8e114e8x8Lr+cG3bQKy/YQ3nS5GHGHcKOndheyAVxaoawsCr0x9rN
+uCAty1qU0aHCwPe8LKdUKAl4BKOYX4XxpeNgpnoKJWvQIvVGa2ifC7N/kv386X4/
+Uc+4MVPzdGgO9HEDpDZzfz8mdeL6g+yk4zjsPl+OzxiRCbx5ko3zkTooxGfna/YB
+zH3sQ5BzoTwQHIRE/SY1+uvUH4PWky49JsdVhj94xatWhvbU7nsWJ2PXZ1YTjTyC
+s54F2UKc4LErIZWHLpS8XTIEjcodBeiNeCxnXTSUmG5Ly/9XLeKLe69a70lfywh/
+akqIZTg38anw96DJMJRZ3esWv6Pb4QIMJN5t2IIkzBfJ1NImFMbAzpXL6uYrRH25
+Ne/CJC3+mabS2tJ7nWZAz71for67sK4mQB7MVzTiSVRREbRkjE6moHKiCdvhFuR1
+PP8ag9mVsYCfY9dbanHV
+=kCo9
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/spl-0.6.2-r1.ebuild b/sys-kernel/spl/spl-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..f88993570954
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.2-r1.ebuild
@@ -0,0 +1,113 @@
+# 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.2-r1.ebuild,v 1.1 2013/10/05 21:50:23 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}-p0.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 11 || die "Linux 3.11 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
+}