Linux 3.12 support

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 e72f51006684..201b13e77055 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.65 2013/10/14 14:36:59 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.66 2013/11/21 14:47:28 ryao Exp $
+
+*spl-0.6.2-r2 (21 Nov 2013)
+
+  21 Nov 2013; Richard Yao <ryao@gentoo.org> +spl-0.6.2-r2.ebuild:
+  Linux 3.12 support
 
   14 Oct 2013; Richard Yao <ryao@gentoo.org> spl-0.6.2-r1.ebuild:
   Reverse stabilization of sys-kernel/spl-0.6.2-r1 (to avoid confusing users
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 1cc67a6b9ff1..2df18f427c02 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -24,6 +24,7 @@ DIST spl-0.6.0-rc13.tar.gz 210192 SHA256 500d9c9297f2b7abdc4fce43efe05dddda2edbe
 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-p1.tar.xz 6552 SHA256 1784bccdd889dc7e2caa0b37a57d98d3db1b451043238b8c3b8af5da4bd84964 SHA512 12ae76e28a8fbf2d7051049be8a9226230a85b7cf8126839b3c285d7af01a7e4a12dbad33c94ed1edd2cbd9fa0392e9df499522f356dc1329579e76debeb7099 WHIRLPOOL 7c04bc7ae60f830b8c44ea2472a006a5cd81c8e0c3cafbf919f5d6e8088498362ea60c44c93b63af32e54c56b958e9edb35e8c37192efb6189d0da9d280f4e1c
 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
@@ -32,24 +33,25 @@ EBUILD spl-0.6.0_rc13-r2.ebuild 2733 SHA256 3fa4d14bc8ab5fe37b37bb864a5aa5626dd0
 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 b811b359b4fa3678775189ec2ea1458c227eb7aa32ec5237f55de024f4a647a0 SHA512 995278782beaf4439d00857fd04d4e41a8e572d7f85469126f81b184ef0ad7bb5886c140b9b080a966f92ee7d5ffc7e6b25324411c449ed31db520361639e159 WHIRLPOOL 54c46797943658c90790eed37941d8de2b0b7cd41acc5e356430aa09ae65541ee0e0d5de627f7a9413025bbd891cccb434099ac3d9067247a35864dc8fbefc27
+EBUILD spl-0.6.2-r2.ebuild 2803 SHA256 7cb6a8748d1a92a3013476661f20e19f8c633c83e6352105fbfedc473524fa41 SHA512 ff330940068e68c976d57b6c526998ede2eef988247cdb2f9294e1fde62122b3d91fa50974c03046e7d8aac2fe2469b44b1cf71d19f6b4f100a4877f606d1a33 WHIRLPOOL 26dcd074c9df0bb04d1ae7175c72c875a95636f352581ef1179a616dd8e39b903cc6a40385143c6465548de0e32e93ed9739f481bbe791d42b7aba3d1fcd69ff
 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 12502 SHA256 aa20668d67fa3c1e0e15e3661177551c4ebb55fbd40f18ecfdad0784fc1f5f9a SHA512 d21883d577c53bf651f9896212e58c794c9301971cf432fa828e5608beb8793d7d3106f39718c216cf91457f75d801f121dc92911436a919ea2f0e43627cf77f WHIRLPOOL a5e3732820aa18e13fbfd84829b2687fab8dc7846c78c12269fe322c449d7cd2a1f8bb35d1578fef6c02eef5e4176abb7a766f14cd7abdb7f07bffd87d4ddde8
+MISC ChangeLog 12620 SHA256 be8fd8f7a4093749893c8456b9e3d7f7e2bb131393a49c3b557dd2e40fdde016 SHA512 9887e94d41d55f7c6de7eb23718cbece3c43566e181e012fc0c0ba33c1bae73f28905d01208d75dd779f8c6cda1f44839caebd54c3003b629b8dd68a6403596e WHIRLPOOL 5e369cd1553c8519dc3271ef5d72623fdbc4cdf0653d9f1abcade4681e8b6918326b35958572f875ddd7184c644561162ac0d9ac7c246b7a02ca50bcd5d27572
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSXAFYAAoJECDuEZm+6ExkpMUQAKy+ZruvNGfh/clfqA/yokna
-iVh+A/yHiBseTiIIt+yLAGsvdHPQWUpHItbP7z5IgekeGbmDvNFcPBwv02xOMFQq
-mfkoLmYbwkPsfklJVRgTLefU/NOIra2OmsaByL+j4gjnWnUqYRYwq47k3FFahi6l
-Ez6uTNowC1rMacSrIr7r81wbXQOjRFNQm8rFCjr5IAZlh+Tj+E3Veg4n2gHHHRiV
-ISD6oe2YPV4w4+tGLpYXhN+o6oSK0opyAtfyYybALgmuFQGCQdGPGKZtXcaKdWnp
-zaNxGNotijKPMnAHtMLj+ClkycJUQNAmKfEVqpkCDLpAnnIJzeZx8hNwEEfY7iBo
-YJJitBV4FCVbK4YSuKunGIS9r7Hj2urjHYsufq2LdISkeUQFxkowcxqCqFIDzMjV
-1D7RDBa0guOYnzXRmLWFCRgw40bZk94v/xrR/IlmCLQakAiIh9yrbt8r0CU5fQZH
-zfp6/oULvrzIDscJ3BQqw0gpVqZHOregGLCHEy65SrBAMJnDxnTTOpbYG4hSbZwk
-Ty3jE1a2gaxaoSKoUl8+QLrXj+Rtvudfd4JsZ7Hq+DWiy4R2pH5eSf9r+jxGDBck
-mQPfvR7XwoPurQ5Eoz0HiYK9L2zWOlHN6w+KH9XtFeteKNvQOfjHwMezSgvQDlmk
-lqlkUcRFBCUEZRyljXKc
-=5OXI
+iQIcBAEBCAAGBQJSjh0ZAAoJECDuEZm+6Exkp9EQAKSmcLwk0MYHb53c4c5DYQwp
+VHhAO5wtO3nS3WQMRGC4VBlu/O7ziZXvfMKS8ErxcKIO0yU0J+C2Nq4K5DfYvUqY
+Cbj19TXnnR/AIXCJlmBxzPh9oy3GhiEBxZNmlEOPRs6c1gpnbkn/FEDhd2mkgIta
+nsOjtV0iU1aQAp8V0fcONRh+sGu8d/3I5W2HAaqYTzBzGfPELutIr/kJexEn/bEi
+JcQzLEaQOlanZMi4tY6N7qKFAVrGFC/gVSu3uqJC7RQecDk/+oCEQpM4T8pMeXEg
+om45t9bw4por87UDHyz0zZdMl3/nb6Oud5YFZ6bmH4WKVnETczF0C1iZdh0CXRuA
+EQPgOFRM5XNWMqrgJMqmGvNaOzdiiPz8tYw6qizn/sHTKPbrv8S7Yi6Tu9xFgT3x
+UbKGz8DJh0oEuRe7b2UvZxhKsNlYY/7RvpCdsF2BYBOD5EDPw+sUlPMOYkNcvBW5
+kOUG4xsKT8zpxkfgtm/wDbNe5t67TtQonkw0wuuQamJMd/Gv0XAQ7ehYe1Tcwhge
+61bI1r44ot1BJuNWzU4zw3c3cqF+Kg4KvBFibu+XcePib16W0ds46ZjgZ36pF4TC
+O4EuVKA53mu5iP9ZsaKBesEtj1ImQtdWE2peFgAbXtnBTt9pOw1pLKWM+ev/1HCl
+qmxlN45rwrmg0+//iZHt
+=asbB
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/spl-0.6.2-r2.ebuild b/sys-kernel/spl/spl-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..0360f86bfe7a
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.2-r2.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-r2.ebuild,v 1.1 2013/11/21 14:47:28 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}-p1.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 12 || die "Linux 3.12 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
+}