4 files changed, 106 insertions, 8 deletions
diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 71e2194e13f7..47406f6bda2e 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.15 2012/05/17 18:41:28 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.16 2012/06/16 18:57:43 ryao Exp $
+
+*spl-0.6.0_rc9 (16 Jun 2012)
+
+  16 Jun 2012; Richard Yao <ryao@gentoo.org> +spl-0.6.0_rc9.ebuild,
+  spl-9999.ebuild:
+  Introduce SPL 0.6.0-rc9 without keywords
 
   17 May 2012;  <richard@gentoo.org> metadata.xml:
   Changed maintainer from floppym to ryao to reflect change in ryao's dev status
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 350ca5562dc9..817ef64f5ee8 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,3 +1,5 @@
-EBUILD spl-9999.ebuild 1708 RMD160 a5b9681019bc2b40516d764195e96a6cf0a5150d SHA1 253238152ffd3e3233a91c64c39a727d069c2515 SHA256 66c6beecd3e63acebf7eae9a0609fe1231672742a3fb718b2036d878b4452b03
-MISC ChangeLog 1999 RMD160 e6065981e142247a191248da0d8190347453fca7 SHA1 e2c710f513f26eb0516d38076e96fd295b73fa4d SHA256 d27dc76a4f6a7957da9af76b1e261e2298bb3549e4900231852a9d420b766aa2
+DIST spl-0.6.0-rc9.tar.gz 449444 RMD160 50673f08253d5939f84dfe09e66c409b15d553a9 SHA1 c4c0ba92652f4635a3e0ffe62de68f9e4bd59a4c SHA256 9b1f7d0c94e3b70942f460d726180c3bed0b6b6cd71fc90d4d52dc6b218d17dd
+EBUILD spl-0.6.0_rc9.ebuild 1925 RMD160 284a3680bdb1279d8b2b5f5d06aba162940d0b51 SHA1 42fead26b067f95544a53b46a0b32e4dcd4a9abe SHA256 62488a76cc998b9fa1bead0b5f300209badd542567ca927aaef991cfe020399b
+EBUILD spl-9999.ebuild 1921 RMD160 f856aac169ccfb587a51646c4f49f3599990c960 SHA1 ba715d12936f284675fcd78842d315b870629c05 SHA256 db5d2e54014055caeacf3c91c4ef2a590d3718028bf61bc36ef484137bd2ee11
+MISC ChangeLog 2160 RMD160 12f26515da3c3acba00a1e40736bd965379612a8 SHA1 7faf091e9c994f641390b8badfeb6b2f8e511f85 SHA256 3e878f7b16e0bb2ae46b8e8d8a7cc88ff18a7f92f826dc7d93e7ddb049d8a3a8
 MISC metadata.xml 228 RMD160 7f4566d402fa232a1d2bb22589d7fe8cc72a241c SHA1 9a2f59b4e342ac0f1e064255f59b0bdec32ab1a9 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8
diff --git a/sys-kernel/spl/spl-0.6.0_rc9.ebuild b/sys-kernel/spl/spl-0.6.0_rc9.ebuild
new file mode 100644
index 000000000000..d6efe8bb2d14
--- /dev/null
+++ b/sys-kernel/spl/spl-0.6.0_rc9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild,v 1.1 2012/06/16 18:57:43 ryao Exp $
+
+EAPI="4"
+AUTOTOOLS_AUTORECONF="1"
+
+inherit flag-o-matic linux-mod autotools-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS=""
+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 GPL-3 )"
+SLOT="0"
+IUSE="custom-cflags debug"
+
+RDEPEND="!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		!PREEMPT
+		!PREEMPT_VOLUNTARY
+		MODULES
+		KALLSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
+	check_extra_config
+}
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	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_test() {
+	if [[ ! -e /proc/modules ]]
+	then
+		die  "Missing /proc/modules"
+	elif [[ $UID -ne 0 ]]
+	then
+		ewarn "Cannot run make check tests with FEATURES=userpriv."
+		ewarn "Skipping make check tests."
+	elif grep -q '^spl ' /proc/modules
+	then
+		ewarn "Cannot run make check tests with module spl loaded."
+		ewarn "Skipping make check tests."
+	else
+		autotools-utils_src_test
+	fi
+}
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 5af8c264f0b6..e050eeee3bf0 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -1,20 +1,28 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.14 2012/04/21 17:53:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.15 2012/06/16 18:57:43 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
 
-inherit flag-o-matic git-2 linux-mod autotools-utils
+inherit flag-o-matic linux-mod autotools-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	inherit versionator
+	MY_PV=$(replace_version_separator 3 '-')
+	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS=""
+fi
 
 DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs"
 HOMEPAGE="http://zfsonlinux.org/"
-SRC_URI=""
-EGIT_REPO_URI="git://github.com/zfsonlinux/spl.git"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS=""
 IUSE="custom-cflags debug"
 
 RDEPEND="!sys-devel/spl"