Version bump to 0.6.4

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

3 files changed, 137 insertions, 16 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 851a17cda3dc..15183eff0964 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.81 2014/12/12 07:51:56 ryao Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.82 2015/04/27 13:53:59 ryao Exp $
+
+*spl-0.6.4 (27 Apr 2015)
+
+  27 Apr 2015; Richard Yao <ryao@gentoo.org> +spl-0.6.4.ebuild:
+  Version bump to 0.6.4
 
   12 Dec 2014; Richard Yao <ryao@gentoo.org> spl-0.6.3-r1.ebuild,
   spl-0.6.3.ebuild, spl-9999.ebuild:
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index c103c3933674..2dbf2bac41a9 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -24,6 +24,7 @@ DIST spl-0.6.2-p4.tar.xz 9076 SHA256 8b434bb53da79c5adb5339b36bddf4d19c4e8d5df7a
 DIST spl-0.6.2.tar.gz 215032 SHA256 a8147eaba030ca71bf8c47b46a2c7ae92f9b4ef60aa8ccfa7368f395faeb85ac SHA512 ef5b77046259ec754e0a41f90b51c27207bf91e832d54a8502232b19cfaff711de301f24945ca739faeac2544b3ef22a57f58cf6298d756a1ebaff06f765b8a9 WHIRLPOOL ab7229691a6f56ab3f98513fd0e32048c11dd7cf3ea61e438bac2d97ebd8cd92eeeb422ef1c4e639572feb3e8f69c0840b861f654ca31de481601ef54295be37
 DIST spl-0.6.3-patches-r1.tar.xz 15996 SHA256 7f1cf74c9be5c14eeff529ce0a45d7dcca33cc08e5b9e7d17fc79dd5a58719d7 SHA512 6eeee3a18466bbe8ca903910d807a3242bff0c12848d4fc6e226fe40592cd6cd9109bc5ee301867f0512b5cf2ad28eab2988e261c69fd200c5dd6eb6d8027b2c WHIRLPOOL 93578cfa435dc343edc8087a0d49aa90ddc457bf75292b0c10ce30836e00f27ea0c4768a62270a6ec559238b778ccfcde71c15740a8242f9f93c7d84934c5f72
 DIST spl-0.6.3.tar.gz 221430 SHA256 5d60dfbe86a50e65dbce17f538d8d0874a0cc293374f59eed46cd2dd1809a944 SHA512 c4b82f1e279c7581d0082c044157e8a933edf53233c8c7c8202117454cfda0473ab85fbb56ac0b6da09a4d6798e33020a9c55bf23e25d630efa3265545c3defc WHIRLPOOL eaf001a96a80264e16ce416da38b988eabbfd2fce17690151a496a3141c32e92e5d00791e2d9c009ae0cf6910f80434c10f02a700752fc664f6bf6723bb03dba
+DIST spl-0.6.4.tar.gz 190348 SHA256 290c20cec89161a0e3e3a885494dfb7b0b7defbe38006cb2ecfdf2b241136415 SHA512 4dda082170884811a2667ecdc130e9e3743bf362109bebb53bd69a18115b8e2b41305d212a03f4233258f866fe7c56ed4a3f08fc1814fa1f8e947b5305a056ab WHIRLPOOL 475593c4b0f75fb30c963196bf6e45219b4a57bd8c9d4350f02ff358c97a69f066b5d4ce8cb346b67d773d7ff985e1812925a5490b8911b9cd657e654772bb9f
 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
@@ -35,23 +36,24 @@ EBUILD spl-0.6.2-r5.ebuild 2803 SHA256 4f7cb43fb7520e95297c896473f2797731f71883e
 EBUILD spl-0.6.2.ebuild 2753 SHA256 ec4e5bf742b024f947cf67c29b173da8d116f307b07c4b8133f916ffc4597dcd SHA512 c0ed093310bcea33564b3c621dc9e72cdfc46c0edd20c026a1dbcbee02d56154e1c9829b65d7a10db2dc615f688c45c6766b42dd86e8e078961cbfb05df1cf19 WHIRLPOOL c892c44a627e871584b2da17ac427824d051933b725b6e482e0856f7ee8f5d32dd903c285a8fddede5b8e143b9da2e5a28c0021be5f9519d6955e450b7193cee
 EBUILD spl-0.6.3-r1.ebuild 3134 SHA256 8c205acae4a10e39204e635ddd0fdf2c78bb6079f2199c4c4c4eb04401eda87d SHA512 3372d1af86f2f0ffabc332cf8c8f51e60b9bd420ccce5048a281cebae62d5e1dcf9cf9edd44efc717f0b45a0e70609592af3a7f157f65c2880dd000921a9ec4c WHIRLPOOL 5e8f265a2cf2ca21a295110f49fd16472738a8e69709cd127542517fe1f7dac814482f960d45fca2a36323893a0d01123957f8f637c66dd8dd8d0191d920bafd
 EBUILD spl-0.6.3.ebuild 2993 SHA256 cf2c0d4f3046962192f00ae36a2c0e84b77a20f72b58857e36142d1f8ba0b112 SHA512 4a3d50fa6988ede48fb29dbbb595115ace3496f61ecff702c0bdd12b4ad8dde258494ebebba56abfc2afc18834e2a774b1b331d332c11182741fe67bfa97f833 WHIRLPOOL 273e676472935d27bf80d96a4ed2913feecd3105b0c1b1a6f6a4404c103011ab24b33de8c0d4a570d9224871824236cec9d4d708976d00c5c3f1d254fda4ae95
+EBUILD spl-0.6.4.ebuild 2886 SHA256 1ac2e830191be0cd6ac91c8ea395645e4ad20a30b1eccabc3e534b2610d1916a SHA512 ce300c229b12522d2e6dd032d8659e545ffa0a722aa47dca3c41ad3427538041145b13445b63abee8d4dac93f23d0e40acee44f9793aa08823e8568c2510411e WHIRLPOOL 2d35b9c0c4ba882033e433e08fb312f391862f473566460a03b689cec39bb0ab397cdf054801c7604e4f1aba0990ab4803b1ff04514c2ad888d8f6559213a928
 EBUILD spl-9999.ebuild 2993 SHA256 552c0302d219542a7d2ebc5e72ddc543b4b2064852999c3a780cf89794d13e8f SHA512 c1be9c20b9801059ae869c11c67a40a75c0cd2619f7d331ceecd630391885533d1fbfe47f95c064ed31e341728b1e1a1b196a2fe299c11b882c698df65de6d18 WHIRLPOOL ca25efc68fb89fd8a565f7a8535f066c1143cd4425b903d910e06fa7c2d4afc21cfef87e3f2a42aa4d53c59b76abe7c41414664ac48a1a5f57631bde98c32e2b
-MISC ChangeLog 15598 SHA256 6bfbb657928503953ae6df3d4a0a5dae1a198629223c2ca57c26876f4c751747 SHA512 c7a33af80f9edfa57da508e8d568b2d9712226923515289a9dca2527e7a0f3c90298ab20d9d7843291a5cb26ff1bd2070190b9e8f3696862fa32388541abab0d WHIRLPOOL 20f4eb85521e3ab49c3b88846aa288d5fec440903612cae4cef93ca08187654b150433e5d57090177f6f3162afc74465953fcb28c2deaba0542b3f22ab024b07
+MISC ChangeLog 15713 SHA256 2438dff384b115f86f798c8d4e77cab2265d0628b15cf1ceb3abdd0fdf6b500f SHA512 06b8da0b67102b0cc11e80c01514e77a3e9eefe5bc2d1d25359c5102868ba6ea6051cab36cf6832933b9fdf8c1dc872131efadbcc803e2c0bc2a75cc0a3fad54 WHIRLPOOL 36279a0bdbdeb87f5e4f33ee4eb8b94a3e3d5afcb3addaf19ef92367c4e061e742e0372884774eb8d250206ed5e1c63fc3ad21e1880b2cab28109a81c08250dc
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUip7BAAoJECDuEZm+6ExkEA8P/0+gM+KukZe0DkEODnsx6Fp7
-DSJc6TP+Fuj0imU51/QfpfM1KSWDQ3ZFUKTmqcLyte6ynoMJrv0KfDb532k66KyM
-qYPmuGJESVdMl2d7weiZZsAsZOjcEeKHYis3pl4PJwGIbFmWDF15hdTHLl/ljZDM
-/AcY2fjXu0lmWEdAtUKWEchlrh/imKRJ4Tmb5ju/20+g4dVkAsWkZRDs8swnRIA+
-05dcepdILnJWZCA8LgMNFxTOtn2TlkX/A8rv8RhsZq/apXA1iylLa7KwJor3xrbP
-C1DfDy4B6ZgzGgiMypA2sGInRtkfSF/4ZNAKzUSja+1S8q/3f5MWFyH/0cO/Dyyc
-81Vmw5r2FYeKR1b9kPJHv5HCPADc2qXdNkkiCvift84o/7RRnMMYjkxh+XKg81vn
-asUyBv9EMcop5DnVrj2a33g89cL9K/JWE0Ku/70wL2ctpaCIi2o4ht3EAgFeFFDO
-AaKVze7AcS+3DisQhjfSPZ6jU/3Xl9STHYD6NJf8Px2xa0i5uqN+WQSyQLmSalEC
-4btp5jFReT7PiOiGGJ3TmEVbGLiVXI8DReNFtPbyfR4eAXQnP0EvvnzX8jA1OkMB
-KZRkw1Oc3g5tATWX3NFlQS4JI4Cz6oQmM5pTb00njPJMhng10AtipR6HPjmerIq/
-+tI0U+eyTwK74SXm80xL
-=TuEh
+iQIcBAEBCAAGBQJVPj+XAAoJECDuEZm+6ExkfG0P/A8dlnYrMoFpIlYfHTdAKTuR
+66RiE+JtQWo45MTvohFJMdIOiLj8RBxhlKvzOnTbkSlbEExo4p773dRUoqzksysy
+7Hr3PTrbpmrZH5uS5imoQk6CzVf5AHahb68SnjTXpPuXgREzbzdUiY9xeSLZcjYq
+KrPTVXx6uFn89Co0S/SbLWV1BBhyN71g6FpLTm2evtZONEpg8cNY9ViiIB3aP2w4
+J+iMjUeTFw4zQlq3w+NcPvJaQDPuv618DTxoMWTzEb1HCfzgVv4yUY3Cx/8Ae6eq
+qsp8JFxeS5z86ycj6LwzrnarBmpJTNyiIcOMQDRBY4uFvJXO89Nf9Os6IFVdAd0o
+bb8I8443dyNDzPg4+tzmvdEpvHywPJfsdy0AaAeA5Xk6LJO/Ns+IuQvvBBqAef/7
+mXc/g2U93PPrA80mdKUMmWFkPqEvEXXnR3xeHIYOaUC7nKh8YLuiast0+BgKYmO7
+zhrLBNn/n8p4qXWXr+bk+zoEZBXuwReHtNO9KQN/L/DgdcaUaE98HTAmxSphh2xM
+d0N+KoQiBi/zn+DMsk5tLLFizxCas0sR6/PeskSa6zaGrMBS8CU8MTPpfu0TPrv2
+k+1A6qAz5bV/Tiv1vsNlyamMJJiC0cv/qx8OLDhq457TjY+ui2pmDjDp48uKbXFr
+VdK99qqGjQGqCMEJVwxi
+=yZCw
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/spl-0.6.4.ebuild b/sys-kernel/spl/spl-0.6.4.ebuild
new file mode 100644
index 000000000000..3122429c5cad
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.4.ebuild,v 1.1 2015/04/27 13:53:59 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="https://github.com/zfsonlinux/${PN}.git"
+else
+	inherit eutils versionator
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+	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="debug? ( strip ) 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
+		!PAX_SIZE_OVERFLOW
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 4 20 || die "Linux 4.0 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	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)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	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
+}