Add preliminary ebuild changes for Gentoo Prefix support; Provide message to die if updating META fails; Sync 0.6.3 and 9999 ebuilds.

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

4 files changed, 49 insertions, 28 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index 9448b255a34a..89e7f74bcd8b 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.51 2014/08/07 18:23:45 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.52 2014/09/05 18:23:36 ryao Exp $
+
+  05 Sep 2014; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.3.ebuild,
+  zfs-kmod-9999.ebuild:
+  Add preliminary ebuild changes for Gentoo Prefix support; Provide message to
+  die if updating META fails; Sync 0.6.3 and 9999 ebuilds.
 
   07 Aug 2014; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.3.ebuild:
   No code changes are needed to support Linux 3.16. I modifying the ebuild to
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 84bd09ca6e99..c33256411bd1 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -37,24 +37,24 @@ EBUILD zfs-kmod-0.6.1-r2.ebuild 4247 SHA256 99332fddd683857632399b83bda56e2018da
 EBUILD zfs-kmod-0.6.2-r3.ebuild 3414 SHA256 9c26a3f82a0002084d4b96082cc589eb52046e6793691f07ca9d6651e9a0b5aa SHA512 1431b2204e791e71dc75ff6929deedf0201858a428b1008397ccaf329d09df4dfe32b0a820fd5de2f45b896b3558a6da901b3e7633cc0f78bf3b99cb9d5ccd1c WHIRLPOOL 45bdaf81d82bcfd464171a88e726d8158f31408daa68317b04fc57af896fd729d6505dd6906abbd7c0cced0eaf06d47d3b457b0f6051c3bee25297c7aca97490
 EBUILD zfs-kmod-0.6.2-r4.ebuild 3414 SHA256 abfd3a39d1bafe288474f2fd93191ea5261562d5f9829ec1fa3fa85aab7cc08e SHA512 cfa0ad4bb57d90ed53912736245ec7478d8cead7e943294b862c71191b869b311f1afb252ecdbf98856f65c16738ef65701f542d85eca5988ece486fcb84861b WHIRLPOOL 7ea56465d15cc5d9240cd637c2fad4083f2001fd1163617291d1dc968d43d5630479e3ffdd60db655a66f1441649ba5a1d79b5551dab98d3b70bed41848c0367
 EBUILD zfs-kmod-0.6.2-r5.ebuild 3414 SHA256 e1351abb1a3ac482eee2d253271cb4364462aef43d6135fbc6f61e487d358441 SHA512 586a58fd1b0e6289d9e90ce134a4ea90d7280c2313f8ac0d2d1d8c30d698685ae7c90089671e438a2ce4ddeb9144c2edb73f35014e8f84e693f5524b77dd1d2e WHIRLPOOL 0baa387212abba6fb03770f4a4d9cd299171b0420a6fdac107aee76033fa3a0de928c2ade5cf16a09b480df2b3fdd4f46dc0ccf5bb8e0c767fb21e4a6cdbefd4
-EBUILD zfs-kmod-0.6.3.ebuild 3401 SHA256 687ec5df2461570c57d4c80f530e1dc3eef41bfae7c41d9f4c2412ca4102bff5 SHA512 f1bdf4d9842f5015e22d734ce7a79535c5912cbd636a587498ec99dfcc0713cc4788115357c4970719ed28830bd0519f6b5fa73031084449a79a24af124816d4 WHIRLPOOL 60aed5f90643831b74ac2fd76c884282fdcac15a97b4a265cce3834b1341ed9fd943164988f78e56ec012c964a059e93968e669a80accb2a842d30b0fae64e4c
-EBUILD zfs-kmod-9999.ebuild 3335 SHA256 907fa830a12e65b24c28c545248702eb7f8b8750f975f496e16745be35b1295a SHA512 bcbed95fc35918a00e5b05b8a45efbde2875f7e003dcddc5863cf6fc6e342836069b28ce3258c3092cf2547a6a0a75704f13bca1b144fdef614e18e934e42910 WHIRLPOOL daed530fdfd401463f8e31d39c2edfdeaa08c6457e59085440e89e977752fcc153ef22bdd5b67617d470889cca09d85c9cb0fb93851434f2bbeacb81688687c1
-MISC ChangeLog 14802 SHA256 182a82c2d5b84aec0d1df7654ea3186fafd51f2b817127927a41a8e336cf97bc SHA512 56c5deaeb6811a4977154abc843cf44b5ea991eaecae80a352a5661def2caa098de09502036aec2fdd6afc1d68d4e3668a32d1a340fc189a29dc4710cdc0a367 WHIRLPOOL fbeec92495d54baf33a38b4fec64cdb9f39b3e69a162ee77accdab1086dcc7a835a63a7067cf5f661d563729937291e145ab9f731b09462785e805d069e5844b
+EBUILD zfs-kmod-0.6.3.ebuild 3720 SHA256 a8de939f0785a5724fbbb45c0ce866306a17840d1a96327e78e7ae498f01abab SHA512 32748806a3aa21ec2166f1168f24156b8a899c48d5ff0d39fdbe01d31afcbf9b1a248dd027bdd691eb43d90ebceb0bb1aecb5671cacb0238c58e82a2c928788d WHIRLPOOL 4aad366c945daf94c448c440a33dc79ab358d77623d20155cf3d3e098c0738073ebc0fc7420cf1cd5e4f670a86a9ec2cd7c1bfb81983a148e884f8a9a2e90952
+EBUILD zfs-kmod-9999.ebuild 3720 SHA256 e433c34b596456810f533722adcc6bb723df9d43fb04c23ed1d8d4b0eb774b6c SHA512 d58c55cb4c9b36513ff63fbef60d8cbac7949c6bf28f24fc5795ffd3afb7c7bad32ad7f783edd47cf40ffbeacbb59734e9fe37a51a5262f925e9c7a63473f579 WHIRLPOOL c4cc00b7b7445d54830fab2a8ebcc51b3a50e8b310e9a5f0232985a7021de2523722ceafd395633fdc3c7c1578ecd56c12a423f33d49b58fc2da333816050fba
+MISC ChangeLog 15033 SHA256 d7cf195e7b9142c439c2651d84c86e0534e52a24cdcc946cd79e473589139c1f SHA512 86533ad65fbd005081663ac7dd3e2eb1fb192188e98312c404f5991c9d0b353c194500a4cd5a95d0a600e387656f7419ca70dd4638cc5ac3dda78e79f0a0d7cf WHIRLPOOL a2f986676adfaeb63f42f18fcff2255d76f2b172c98c3462a47bcb522014ce2ac9d91b35f574c41aa32e600a8b5f1241975f38af9cc64a031967368d1cf8a31d
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT48Q0AAoJECDuEZm+6ExkL64P/3wordHiGqL+aZix4yXMt4R7
-ihAiQIBiZQALG9hkYT5mKgcqEDczqH7Ogx7fSOShGnZgOZsj/UMJBhi9sgg471iS
-tcY9G5KWG4xPJbzoVSd0oV51/VwvSCDZ5+9vHU+YpEU4Z/K96sbaClNDv4LuShkE
-+TLOFIpl6JML84QU/tPvQWLwRFtVIjDfbVrRscp3oGB32J3wVI1YImCKZ619OhqE
-8DXwPL+E3PICiTNSYzHCd8CU9JDOz68qALYjHJZeozl2O5kfb5SjHEv4NU7KWu3d
-5GNZ/+xlfgvf6cxbMCdcEg9hQqXjZzEOCMEpgkP68+LgR0QXxOTjp2mQpnuUh6l/
-ru5WTh7hPeAJbLu31tSsdvqwte6QQ6Kn0SrcqJxq2Lp+c4kx03SZRRko2MiHFmvE
-LpfBg/+aOYW/PZFmFotKBsIaKFCM3sk/sMrXnqSik9DXZm18GnTWE7K6WOMOhRY+
-GjopG/bRzQEEDIlFQGocQzWHhmww2rRn26T/ZiT2VYRURjNyBm6BU8qet5Mq1FUD
-0f1iVidWZ9udPzJzylpGF4GYThYqB+QQEWnerjrXKT25c6QINNg6PCh9H4xhuvZg
-GVZroP5jmlac5gf1su5OqrwBBj5tDCYWA/SKKdbpFAhVQNW2T61Ej+smlkBirkLd
-7DRS482IV+xwBED7V7vx
-=4THl
+iQIcBAEBCAAGBQJUCf+tAAoJECDuEZm+6Exkm50QAI7Ze2lbFk1okyqTNaZuTVFC
+eJTLDIMHwShn0uAL6kXKh2L0vu50jXFjNOTMJmWlo914qn4USZQWhPaYqHCJn6+w
+NLBhMqPRCBRi6fPotyhYfR5Pw4NgTapXREzcj6tk74o6NyFMhAwZkKIpnRUUxJst
+q2jCuKw019rRi9jFg4mc/RviL2uNMJSPtziPBbnI/hFbJmBWtlyduympp54KiV1T
+zWr3XTrI4K9Be/8rS8Zs0ckocCEyC+I5NfKrCWbBntanACY3Zy4CIOFgbcrhDsFV
+dH8XnMjhe1PF/7AvDthXt8omMORwyf6NscQXiSTMv+eeft+6rzzT+mA4xOTVQeUQ
+ZOd2AdRUmHdt13g5OY5Z7pgKvPZpDldfK/csHTTP6rujxZCiumfMWzGcz7UrMSxV
+L3Idmslo6LjoaIArU49n9xwaD2OKz64SBoEDgjjcwCpWgHp1hiShLc3UhcOCBEeu
+IeoR1rg4VlnDLfTeNCzoQN8jGutv3dLhAI9wXUHhrp3IXmuKyaG61+btShoXZdr7
+BMT9iwXhA4CG1+0TmQ9W35okMSt0hC3zwXNs+P+XkuU4DzA8xnNOi5ZmxQ4Eo25x
+JHl81nxlf5Ro0VrUFwNwyQkrQzb8r36OyMRX4DEDfp3zfcKSkKPABkx8tWUCKAJg
+fhKtNXF6ZmUG6pHXzD/t
+=LrkE
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
index cce3053a4795..2a376d683d20 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v 1.2 2014/08/07 18:23:45 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v 1.3 2014/09/05 18:23:36 ryao Exp $
 
 EAPI="4"
 
@@ -8,12 +8,12 @@ AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
 	MY_PV=9999
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
@@ -55,6 +55,7 @@ pkg_setup() {
 	use debug && CONFIG_CHECK="${CONFIG_CHECK}
 		FRAME_POINTER
 		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
 	"
 
 	use rootfs && \
@@ -76,7 +77,8 @@ src_prepare() {
 	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
 
 	# Set module revision number
-	sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
 
 	autotools-utils_src_prepare
 }
@@ -86,7 +88,7 @@ src_configure() {
 	filter-ldflags -Wl,*
 
 	set_arch_to_kernel
-	local myeconfargs=(
+	local myeconfargs=(${myeconfargs}
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=kernel
@@ -94,11 +96,16 @@ src_configure() {
 		--with-linux-obj="${KV_OUT_DIR}"
 		$(use_enable debug)
 	)
+
+	SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \
+			myeconfargs="${myeconfargs} --with-spl=${EROOT}usr/src/${SPL_PATH} \
+							--with-spl-obj=${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+
 	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT}
 	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index fe9291daa170..750427e9606d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.24 2014/07/09 01:29:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.25 2014/09/05 18:23:36 ryao Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ AT_M4DIR="config"
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-2
@@ -67,7 +67,7 @@ pkg_setup() {
 	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."; }
+		{ kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -76,6 +76,10 @@ src_prepare() {
 	# Remove GPLv2-licensed ZPIOS unless we are debugging
 	use debug || sed -e 's/^subdir-m += zpios$//' -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
 }
 
@@ -84,7 +88,7 @@ src_configure() {
 	filter-ldflags -Wl,*
 
 	set_arch_to_kernel
-	local myeconfargs=(
+	local myeconfargs=(${myeconfargs}
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=kernel
@@ -92,11 +96,16 @@ src_configure() {
 		--with-linux-obj="${KV_OUT_DIR}"
 		$(use_enable debug)
 	)
+
+	SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \
+			myeconfargs="${myeconfargs} --with-spl=${EROOT}usr/src/${SPL_PATH} \
+							--with-spl-obj=${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+
 	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT}
 	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
 }