Bump to 0.6.3

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

3 files changed, 131 insertions, 16 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 66ece1244021..80077b41602c 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.72 2014/06/08 17:11:38 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.73 2014/06/13 01:21:06 ryao Exp $
+
+*spl-0.6.3 (13 Jun 2014)
+
+  13 Jun 2014; Richard Yao <ryao@gentoo.org> +spl-0.6.3.ebuild:
+  Bump to 0.6.3
 
   08 Jun 2014; Richard Yao <ryao@gentoo.org>
   -files/spl-0.6.0_rc11-linux-3.6-compat.patch,
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 67dbc6da479f..4becd7c68d14 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -22,6 +22,7 @@ DIST spl-0.6.2-p2.tar.xz 8264 SHA256 2fb106eda86a19aa01ff33a74bc71e84facba82f67e
 DIST spl-0.6.2-p3.tar.xz 8676 SHA256 8544b8f4bcbb29b61cae58d750fc442683a1ed200b58d90c7e0886eb812b3dc2 SHA512 a298765a1cb396192a08b2f8e4a1cffdbf50e3b720ae48b262958659386efa0ad4fc4550192c8bf672abc5a1c309ff2b1b6d64307bfb0ab29023a0adfa9ac858 WHIRLPOOL ca9e97e0fb52b5506fd3f410ef00fab05cfb01aed4727702c52e31f527967ae6c22d8bafb8f8faf039e937f5f32d446ef05c04e0adf0b8c8acfe26ff18507a75
 DIST spl-0.6.2-p4.tar.xz 9076 SHA256 8b434bb53da79c5adb5339b36bddf4d19c4e8d5df7a8a5d2a4ca1bcf7336094e SHA512 77ca1ce0235edb85cf36243ad45710ee8759dcc49bacddc661a986d558eb9cd92671ce256c88287e056732882a038b12bb0d9ae131229819702a06de18c50bc1 WHIRLPOOL afc335ba0a7d24a610f272e6a65460326b91ab91652bf66525e14110a811b2490de65847560989f793aab8d473794c56836e438cb7f1e19d4e253373178f0a72
 DIST spl-0.6.2.tar.gz 215032 SHA256 a8147eaba030ca71bf8c47b46a2c7ae92f9b4ef60aa8ccfa7368f395faeb85ac SHA512 ef5b77046259ec754e0a41f90b51c27207bf91e832d54a8502232b19cfaff711de301f24945ca739faeac2544b3ef22a57f58cf6298d756a1ebaff06f765b8a9 WHIRLPOOL ab7229691a6f56ab3f98513fd0e32048c11dd7cf3ea61e438bac2d97ebd8cd92eeeb422ef1c4e639572feb3e8f69c0840b861f654ca31de481601ef54295be37
+DIST spl-0.6.3.tar.gz 221430 SHA256 5d60dfbe86a50e65dbce17f538d8d0874a0cc293374f59eed46cd2dd1809a944 SHA512 c4b82f1e279c7581d0082c044157e8a933edf53233c8c7c8202117454cfda0473ab85fbb56ac0b6da09a4d6798e33020a9c55bf23e25d630efa3265545c3defc WHIRLPOOL eaf001a96a80264e16ce416da38b988eabbfd2fce17690151a496a3141c32e92e5d00791e2d9c009ae0cf6910f80434c10f02a700752fc664f6bf6723bb03dba
 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
@@ -31,24 +32,24 @@ EBUILD spl-0.6.2-r3.ebuild 2803 SHA256 516d6ebe843d1a58fdabaf215545d1b60400e66ab
 EBUILD spl-0.6.2-r4.ebuild 2803 SHA256 cd33ed179b9d6cc85502e679c252c55717235838a9ce60cfbccf6433a357f583 SHA512 57b6437d48cf00ff5d009a30585c9398e36546cc64190c4535edaf11236774598bd4008edb1da4f874500659b5dd2718e82610d89a524aa34edf7886be3b27fb WHIRLPOOL 985313e0d3aff18981673874e5cd1b626df7de6347e412f55106673e121077a8c594ace32dc58068bf670fe0ad9d0fde68614b0e2abccbf3474956f4cf91f21d
 EBUILD spl-0.6.2-r5.ebuild 2803 SHA256 4f7cb43fb7520e95297c896473f2797731f71883e8b950230932192036b04405 SHA512 a1726f60a74f9725faf8836d9dfcee05ff7a29bd0870957d1a8266dc2b6809b211f5f5d1fc17e02744c12b8234e4d431b5433b36157de14a519c1f6e9dbabbe7 WHIRLPOOL 56a1e1a0aee7fe51a35c19dd91a7bcfec46e08e2bfed3adc12667bb7092b2e5c6e6fced223b940efc0c91c983f155b3839813f8fac272eb1282b666baee9d01f
 EBUILD spl-0.6.2.ebuild 2753 SHA256 ec4e5bf742b024f947cf67c29b173da8d116f307b07c4b8133f916ffc4597dcd SHA512 c0ed093310bcea33564b3c621dc9e72cdfc46c0edd20c026a1dbcbee02d56154e1c9829b65d7a10db2dc615f688c45c6766b42dd86e8e078961cbfb05df1cf19 WHIRLPOOL c892c44a627e871584b2da17ac427824d051933b725b6e482e0856f7ee8f5d32dd903c285a8fddede5b8e143b9da2e5a28c0021be5f9519d6955e450b7193cee
+EBUILD spl-0.6.3.ebuild 2770 SHA256 fd87bf0a3942e07216c8abda9f474d49d08f4bc0b6de856bfc0ec7f14f48db1d SHA512 bee62e014f03f2fc1de06ba046463208e3c1ad80ec2c54954aa05fa3888930b02846d6ec35ff69e7da6818ddaf375ae2aa53a35cf1f64d235e91da811b0959b2 WHIRLPOOL dbcbf83d8865fee1a4cda77354b889f51be0fa454c20e3bdfe9d01a378a68c78aa523f95c90fef8cf27487a8f76f012f38273d78c7c9db129305c6ae6f24ec02
 EBUILD spl-9999.ebuild 2823 SHA256 2aea3d789ec89bf74ea6c26e572c47d8ab382f65ae20ae146e159890b363ea0f SHA512 cec91ace2c4b4fb135ab9cb39264cde74909a03d46545c6f3fea5126f96fd8eee05829c793d70bbfcd508e9c9cce0b4fd6774ca82e15c2667dc522aca030731e WHIRLPOOL 8f7a1e4f3bc1936ebb995f8d241efca7371f56a5afaad851eea3ef54749feba41114812e25b5cf400c54e5ba94ccea3a59cd1dd42e4ef055758af6c24c48525d
-MISC ChangeLog 13930 SHA256 a976d225c129c9ec5b41e0db714d8f8cffd72a3ffc6a4b0ee40bbf86e4524880 SHA512 62db2889b6a987079c77213da67404d4f2bd86a089323c6b8c9b22640c2e65e3668d52d57674711f7d2b74461c76c162b6a3828e38dc50ef2abda36ab991d772 WHIRLPOOL b3ab1626e069563ca5707b0d0a73f5fbd8b4f08b48ca3c8e93c61d88943a190960a62f499a5f9590341e6c5962c5a33b4deea519b75c3d9756631a6d6555e4b8
+MISC ChangeLog 14037 SHA256 01a486fb6240aed1eb940ebc2f2d12fab9dc959a547e8d08ef98124f29651092 SHA512 534a13da0d0c2c662f7d290a3b10fc1339c9bafee01133d2a18b461acb7cf7ddb656df37cd3cbfd7b5db34e9c0eeae0bbcc60d11fa3245f12790d059ced0ed73 WHIRLPOOL 28727827d57846454e8597bef78fea21a5b1d98dab991f2c01b06d2ee12bf9481f5d0f3625a7e7d1008a7f6bedf563d13d7a3cc122ded46bafdb9c9989b7d091
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
-MISC spl-9999.ebuild.orig 2751 SHA256 4d36de6b940b8b6d396587a444fbfd492b963c6a81dbbc3f01409e81f5939158 SHA512 07fce75a9a8e21a1fca41b2a1869557e7021e4269ce7c7099294d98bf56d06cd5bdf6278ec5800e78baad09db52d0f19816fd10ccda84fb736ffa64c16752b49 WHIRLPOOL 4745ff4e05fbe4a6447e64afdabb55c92f4e720be2d66a0d31f54b963f1f80be0d9608d3b8ff7ae8fc98b44343f3e03912617d35961c479b25cee5aac60ecbfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlJlkAAoJECDuEZm+6Exkv28P/j8Fb3j7JyDSh3OVr+WNfnK0
-nE5YRI9DwOgqx06gCmankIOqLUzmFkl+ampE7Gua+bYB+j8V1jxOhAFBnpEA+lHy
-wcZ+KM5GmaID+G11zbbDu89USUyadlOUQyp/sGz91fDKYF8tMTD//nSRA2L5Memv
-doKqaGhDEN16dS/PMw6EDbhC/NYqNqZnsC96SO+EZQyLxRL83clqebO0YKJX9uLl
-wy3v2RJYmoOgO+ZjCUjkcwJqZl+D0RSwRLS91TVhqyfyvKjK1wH0ATgf9pz7pmQQ
-H2UP3PPtNTKj/5y6ZovOOhlopQt3KjL9MxDlMFtm6QLzK/UZ093fIxOTqtlX8smK
-t1QHozKP02icXS6sMaM0yRjH7PRlvlwIJNtnZxkiWZ99NlfW2kZcVHCTDTzOW3zq
-DJOkiEYxxHWHi1Q3tlYndCFXppSmbU6NB0znvHEZJoMn3JYRvCrh+ES7dnfn4DW0
-rPX3ePZtzefXrxmCEoCVr7CAPcNzEm9u67GBSPMgPdeVO1bXMbtCYCB3CcKvP9jB
-U0X3FvIXbTwjiRgXgcUaqUW2ZYzdgxs7HZVL7GW9uEVlp1KLXO2lhYraUD75jb/D
-LfYC7INEkznGoDuXbi17iJdwMFWAocOsTN9MIAevh61o573EFWzntxWqxzj6cECG
-YMZkirE8LTFfhs12iuuW
-=ypwY
+iQIcBAEBCAAGBQJTmlH2AAoJECDuEZm+6ExkG5UQAJJSZWesLmUVLg9+f4K1F3gM
+d2+qWZBIEnmZ7A+jvLLbB9StZ7/FVtDVH80s2IB+1EnuNPTC5OyqjMxGcRXJU0Fv
+lqoR1ZB37u9vFg/bYXDMsX7WS+qbwnDBSh7U0kblyk+PCd+RW0p6ERrcSdYKsqbW
+P7Zgqib77vSqNCErYPp0i/mkHNTDCijWqug0sfqrFGy/uPcm7VnvN+/U7eZqY2cF
+3X5J/o32MzoU8QMAkX42CLKj5PLG8a19277ksz/JZfiIJT3Aes5i4+qq0zZVMz9s
+Hbg8CAeMNLtIAzAeaTjHRRjo78yqdNTRNAHrRYFwIKtbnlKPRpfMn45Z3mpF0DTc
+EjuySpmQVMMjGzx7m0XJxPkoQYkwgx9tQwmdFz4+4EKTkoLif4kByfq2VR1b7eoj
+btMOTuONEcyXaUGCRGzOP4WN7Fo+sdec3p5BzlaIia2gzv4Lm5rCpIcbC+VrWWiI
+2bRIHjvvyS90rzdad/P0hqYXUT9fK4H2+4lx7IEKjttKYdAIxckCuba7aCg1m/Zp
+dYyrOr77P27+RClmNPQB+xF5r4wTc3qwS9mfkIDxSYwWBGPvnhj4PenQ0740UJoA
+Y0HMqGDbbsJScAIYv9hHKzQhLEP3HWBY8w6SywNhQd++WApgRP7CDlBK5yzLeS6o
+ZYJm8XWnQOmJzaL7ew0O
+=6y2J
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/spl/spl-0.6.3.ebuild b/sys-kernel/spl/spl-0.6.3.ebuild
new file mode 100644
index 000000000000..c62d59fccacd
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.3.ebuild
@@ -0,0 +1,109 @@
+# 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.3.ebuild,v 1.1 2014/06/13 01:21:06 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"
+	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="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
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+	use debug && CONFIG_CHECK="FRAME_POINTER
+	DEBUG_INFO"
+
+	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 3 15 || die "Linux 3.15 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
+
+	# splat is unnecessary unless we are debugging
+	use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die
+
+	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
+}