Version bump to 0.6.1; up date older ebuilds to use mirror://

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

6 files changed, 163 insertions, 11 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index b643dc8ace7e..5d2fa64a558d 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.62 2013/02/06 01:49:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.63 2013/03/28 22:19:57 ryao Exp $
+
+*zfs-0.6.1 (28 Mar 2013)
+
+  28 Mar 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.1.ebuild,
+  zfs-0.6.0_rc10-r4.ebuild, zfs-0.6.0_rc11-r3.ebuild, zfs-0.6.0_rc12-r3.ebuild:
+  Version bump to 0.6.1; up date older ebuilds to use mirror://
 
 *zfs-0.6.0_rc12-r3 (06 Feb 2013)
 *zfs-0.6.0_rc14-r1 (06 Feb 2013)
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 05da18db408c..6f2f6a4e6321 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
 AUX zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch 1159 SHA256 bd40a60408772cfe789bd0f055906cd2aebf43761adb2cb19ca6219c92c5f996 SHA512 aba0ee09e0070ee7472ffeb0274fdac1870e6a11390c110e9febd7240eb8465351355ce6b735d3f0a6ce2ce5bd167a4239ececc3dae33899df3b4f72c162f037 WHIRLPOOL 72635866ef46b592d257071d4902d36b95855850e40de0b6a6afc6ad416460ebdc5b2ece67d011a052895ab6ae9135d77622f7fb15f4cc0f3a6b96df6c2581d2
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
@@ -5,11 +8,30 @@ DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de44310
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
 DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
-EBUILD zfs-0.6.0_rc10-r4.ebuild 2438 SHA256 ade71ed056c0095481a5e57af269ef2e0738d157de67913484e783f5b7aa92dc SHA512 49c00ddfb64a8edac1b36aa5895f4949f0d12fe85ff84bd3a2f8b55618cdf42a65207fd005949175891555609b7ce90e860afe81d0151ccd799f4a9827d3a407 WHIRLPOOL 84116d7336c60a2a796e79cc0b50ec5e6e30dfd97e811490919fe0e21a7ba389a1a4d3f9def8821957cb341055d1ad0446b9ea6e6640461c17485bb3b76afeac
-EBUILD zfs-0.6.0_rc11-r3.ebuild 2438 SHA256 003206fa294a44fda0bf6ab1c0ab2fa1b102e72b081921dfd83358f07e1f7ec1 SHA512 a085411aee562db7d0c2cb48937c2430a5126ff4c5b69d2fa5beddabe2638d61446184286a2a1b313f93353ecd5bd6d2eee0f90f53cea392242c52b3f8dd2e16 WHIRLPOOL e9d4f42f21b72687f7bbdf1afccb00d32d3195fe5bc800a98036643b9489c3642fe3457353d6505389ae610b7e4a1240abef3f1fb4c0f890cc064fdcd0f4af33
-EBUILD zfs-0.6.0_rc12-r3.ebuild 2438 SHA256 705455e7f7f6b69e0361f2b8683ea1595eb83fa0ad605c59ba5ce04cbeaf49ae SHA512 e82e9f0d0a20e06e7d6cc49f56435621a1c8172161670c34084e279c56a2d6d6fac053f3669dd48d657d2ad2d79d92205d2ee8f2057342e01e0ca46cc3449153 WHIRLPOOL 3f7da35714c671e9016198618b890d929e5daffb32c8e29a36d8bb663b28d718e32d984d8eda10e0280a300c7a7bc3ef97a3ab4aed3eabe53bc9330bf1bfd648
+DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
+EBUILD zfs-0.6.0_rc10-r4.ebuild 2425 SHA256 43d49734f34c11cf4bb7f52ed60238f472a9d44f8571ecf5da5e3d0de866cbe3 SHA512 922b9e5a920da0cee6a3f02d55cfa2462f9f7d9d7783930075c642bebe981d3cbeaa7d510bff8867afdc63c9c089e598828688317c3d603f5580dc802c543a77 WHIRLPOOL f7451202156bef5884c7cf25e61bade72f4c1213e7aa95d1b455257bf421ca4e07a8130d4a9dad409def546f4c422ffd370d7b442a2561f2a60e7ad7d5c05894
+EBUILD zfs-0.6.0_rc11-r3.ebuild 2425 SHA256 91c81e66eb4cb7362810bc748d1cb05b2d515e6cf670fd9547761997bba71064 SHA512 1708af9529f0a7cc72c2d4f27ff7176d14842a5d7b5761ed9176fada6816a6f2d686c5997708f41a5ad634237aa5ecb68374045ad869848127a1ad0cdf2db93d WHIRLPOOL 86ef757aa5aac1d24eeb38d16eb87f5a4e34db02bdb3df74f5e884126fc90be2b4bb36c5cb5954908afa45d1d53d6c4857aed2c04e14f378c962586d458eb8f0
+EBUILD zfs-0.6.0_rc12-r3.ebuild 2425 SHA256 7ae28e9025453f623fdfddccbaba6d4f56448da1837df30fd4102babe853ae3c SHA512 d33c48ab59528413ffdba58aaaed0022d19a33cd402731c32ddf89ec043fb1552d57cc5a74d2c4efdc9bc2aa25140846c3ee1c80cf3b9d9f098cb54816d0e3ae WHIRLPOOL 59634e47aa9824b1397ea374433309928a71074d1cc7b415ff1fd125696cc8404e15e1f59091ec74acdab749a2a48b86cd0c3ff053dc70a12c6998b21c789eff
 EBUILD zfs-0.6.0_rc13-r2.ebuild 2767 SHA256 a01f304e92fd0fdb0c2d61d2924948a8184a31d6ff300d0b95cf10fdde20c4b7 SHA512 0c5280577004b38eab50beaa86d621e06eac648e7b5f9ba0af7e3522c9ea1ea9e12cb0ab4cf0a918c59bf919c9596ea23716be639a86a6bbc4ce3151d3cef744 WHIRLPOOL af66f26c293b926e52f729ef11fd5ac218c8a6ef78a73525a945fc843f9de2735ac65032a9a0c1a7b35f6d5bd083751c52e3301949212c2e284f67ef1afa33b7
 EBUILD zfs-0.6.0_rc14-r1.ebuild 2898 SHA256 94eec2441edd8094dad6bb73a576198fcb5c3221de9e4cff13193f86906897a3 SHA512 e948a46ab4560754896044411fb51b1188e601dca4cd9de56022b72ee6d8c942329813e71a9dadb9c9665d203c5d8dd04c1f9071472950eaead78898ed5826f1 WHIRLPOOL 84080714d51b18a663812115c16eb734f71ab2f02d5138a30dcc660a361caa198021ae46b744c35edd8b78edfcc3f9a2b5ece8fdf68b2ac26dae199eb76028a3
+EBUILD zfs-0.6.1.ebuild 2787 SHA256 0d14acc8d1e636d2ef2135f49c48699a906767518402c5b899e61fcb8c06f77e SHA512 f32c75e8f29597015bb84c9b86e4afc59050fdd864dadcf73f7e033748bfe1fd8d571082688ae842d580bcdf61806c4a7896b22e8ccc035ac1caba1ff24fdc7d WHIRLPOOL fb20aa638bae357562c01e6aef319ccea970753c9148a36a484a5c252e9b1c905db10461a0e9d1ef217a6ac9f2989dcc090814359f593cc4f7d8e8228de1baa5
 EBUILD zfs-9999.ebuild 2890 SHA256 58335fa7bb966fcdafa0d770ba91b24de7ec8994dc6e355c64eb8fdfdd6cbe9b SHA512 e728d7e973cd30e561c6bf8af12a3c6fa51beac390ea22e318b960e76384b919c2e7d4ac98e43aa03ca3c999855ebfe0fe40e428921577b51d566de74bb70e82 WHIRLPOOL f26761c1f0bb6c6885ee296a748bfe2cc2d1fbae5c39a64f3b329b92b3250a42f8f29479b86fd7267a35516a1528d2211be1a2c7389423e85b066f6101547cca
-MISC ChangeLog 12060 SHA256 e366fe31cc327a76c0329952f315ed1d984cfcd063373cc93198abbe6b9f1240 SHA512 fb147e3e42aae0ec8ee36fae82365f249328a2df96e8fd90837170d62f50faa2a766d3117b045eabc1a7ff08fcb51f070e7a6649e6f624c6da1173c77bc5c895 WHIRLPOOL 324e3ac18b758e0a4dacf7bec19fffd8ea520805294fa02a68c1383543cf74a626ffed5432636abac02eb0f0e919627fae5d278e4552059cdd670ccc94345ae6
+MISC ChangeLog 12295 SHA256 edc6aca6c3d59ae49afdb32d454e27f15e1a3d212c0543d620927521127788e6 SHA512 08e65b73428c941c276bceaff4d84057ff722fad2eeb4afa04f5063499b0280882c65717caf5004e8ed13c38e84204b0714e90d3029b3f9bf78d565692e53dda WHIRLPOOL 6361734b9c9c3e62c825ad03df90bf0698e6b7d593e9ba0aec82a3571d8093f2bc5a28b2ed17b8c1c7ec447bdc5110c13de4dbbf3fcdfedf22bfa21e7f819ad5
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRVMH6AAoJECDuEZm+6ExkPxEP/28sJ6VkNTmb+20lfubSpvW0
+Ygz6oGyObxoIcQZk2JqhnxCVM7PGojUarNh9mRwazhnVRJcPo0c5+Fvsn9s8Xh8v
+D5g0DwcwHo4lOXTydIfZg82vcKTFSn6HVB4miBspNJRRXRzAHLhbnlY/EE7vaJHc
+E0aaWnp5ni+XuuTT9OG4TSavKx7W1Y7SEq0gVIbwt9UFtkXkw7UR1zlNpmGD+2/O
+nrP7VqAwd4OhPOvAfS4Of2PLp/GFvJWNuhEx7daaZgw3fgPUirCKwD3P/KHuYKRb
+71eVSGxeYRa6MUjf3VzGxuJrOC5aDiRiR6dIh0u5MXIl3rXYhrUYCf8vwCWEpvlK
+i5u33WPXAPaonqP0QhtasVp772O2exJGyu9keh2XI0yI2oZNupo+nzBh+BqQkKiI
+qcDWNK+j78xpi3jSaa0xpNpQZNyZYzDbFGewhMw9eBW32L8D24s2LO21iX192p6V
+lLL7HBep5p565JbsfKZteJxxgwDfGBPvgDt8iJhg8yHVN8NuHyAhTXqPY+766JLs
+4z+/0tRKQF30Opix0rHIXxKZlskgrd9AnnpSNg3jRrbPr5X0O0S1sAI2tGvTEAQy
+Few6WfQu9FOjXUMcP6wmopfVthQQLoLY5v42QSBKL6/mQtQvICeOluUle2gFiBWH
+KjdbveW8GL9Gl+tHVlRP
+=C3nu
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild
index b791feabc494..d42ab0191d81 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild,v 1.2 2013/03/28 22:19:57 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
diff --git a/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild
index caecdbb4e5c9..489f8459fac5 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild,v 1.2 2013/03/28 22:19:57 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild
index c22c174a7d67..f9b2b23e20f7 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild,v 1.2 2013/03/28 22:19:57 ryao Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	inherit eutils versionator
 	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
+	SRC_URI="mirror://github/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 	KEYWORDS="~amd64"
 fi
diff --git a/sys-fs/zfs/zfs-0.6.1.ebuild b/sys-fs/zfs/zfs-0.6.1.ebuild
new file mode 100644
index 000000000000..8beaa09e191c
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.1.ebuild,v 1.1 2013/03/28 22:19:57 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2 linux-mod
+	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
+
+inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		)
+"
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(udev_get_udevdir)"
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs
+	rm -rf "${ED}usr/share/dracut"
+	use test-suite || rm -rf "${ED}usr/libexec"
+
+	newbashcomp "${FILESDIR}/bash-completion" zfs
+
+}
+
+pkg_postinst() {
+
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
+		|| ewarn 'You should add zfs to the boot runlevel.'
+
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
+		remove_moduledb
+	fi
+}