Depend on virtual/awk instead of sys-apps/gawk (bug \#455684), fix path to parted for regression test suite, fix libpool function relocations (thanks DH for testing).

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

9 files changed, 112 insertions, 44 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index a29365ab2d03..f3d47e8dd974 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,23 @@
 # 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.60 2013/02/04 17:31:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.61 2013/02/06 01:48:50 ryao Exp $
+
+*zfs-0.6.0_rc12-r3 (06 Feb 2013)
+*zfs-0.6.0_rc14-r1 (06 Feb 2013)
+*zfs-0.6.0_rc10-r4 (06 Feb 2013)
+*zfs-0.6.0_rc13-r2 (06 Feb 2013)
+*zfs-0.6.0_rc11-r3 (06 Feb 2013)
+
+  06 Feb 2013; Richard Yao <ryao@gentoo.org>
+  +files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch,
+  +zfs-0.6.0_rc10-r4.ebuild, +zfs-0.6.0_rc11-r3.ebuild,
+  +zfs-0.6.0_rc12-r3.ebuild, +zfs-0.6.0_rc13-r2.ebuild,
+  +zfs-0.6.0_rc14-r1.ebuild, -zfs-0.6.0_rc10-r3.ebuild,
+  -zfs-0.6.0_rc11-r2.ebuild, -zfs-0.6.0_rc12-r2.ebuild,
+  -zfs-0.6.0_rc13-r1.ebuild, -zfs-0.6.0_rc14.ebuild, zfs-9999.ebuild:
+  Depend on virtual/awk instead of sys-apps/gawk (bug \#455684), fix path to
+  parted for regression test suite, fix libpool function relocations (thanks DH
+  for testing).
 
   04 Feb 2013; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc14.ebuild,
   zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 049e725b6e3c..aa1565629f4b 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,14 +1,15 @@
 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
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
 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-r3.ebuild 2467 SHA256 d7f870e42e5176a46f881879ef6e125ce3ded2d388fcd35acdbfbf12ecb19c3a SHA512 5969552979dee690aab05e2d938b7f0966c7b296c06dcdccb4c694cacda3aa263bdb440e11e050dcd6bc1c915235ae64f3681d8ba14bc4e99c3880d7b43fbcac WHIRLPOOL de0286ce2e2b3667fb2677fa018119995d484f521dd8762a14a3d24749c13cc2886c0d889dc57a6ba72695e2b500d9f7fdc05215d66ce337612ad428ee3c6f9e
-EBUILD zfs-0.6.0_rc11-r2.ebuild 2467 SHA256 7056cd5086c08bb7fd7b2b1b573ae1e5535ba4f37564ff43dfdee8c2b533a8c2 SHA512 5474b8d3ff1d9a8116a4659e0739f46f16d71cfb90ccd04507471a00223c42940ea7f44084b8d318488862ae5f86e2d07cbfe74665b0bd720593593a4492097d WHIRLPOOL 3d42751fb60873ec2b78023c85e296dc6beaea5c231586d59f9315a600bf17815893df10a7f1fd6a1e0bd902cb2b83b0b2b4beddf8f0c3d3fc7e7fa7eceecfee
-EBUILD zfs-0.6.0_rc12-r2.ebuild 2467 SHA256 9c93b75f2cf728c527a21db81e6b4dd9a6c1e9fc7a74f33f8a599423aaffb6e6 SHA512 394b109689887030331b4a6a729be9a6f8265cfebb247a48e072ff211e8022d255127f251ca33522f7679c2aa0a84b635f1bf8ebda680c5e4158fb9746e503a1 WHIRLPOOL 138b65decb7a8f4f6fd420ab8477d37b473ea4a7be15256c93fb0003147fa35c2a722847eba867ca8a9efbd171574b690e6370f446b8dc570e4478736af90ab1
-EBUILD zfs-0.6.0_rc13-r1.ebuild 2796 SHA256 a920b0a307abab65ee7143a0fa8cff8651a0893c1729d4dba19b4c5062d07895 SHA512 64116e2ec6515a8e4c6dcc53ff1e32b6f269249b02639afb380cd511d63f91aa0d30dbd2d2d70a27e7129433355d7705c8e9c3d4b7676c0940a44643135a27ad WHIRLPOOL 666f153409fa24faae8943925c14c7b0be5c2ecea9978ebcad6f654aa38bdec95a1deea45721c8eea370989850b946395370c29ab7fec38e4d23b029af3d49f1
-EBUILD zfs-0.6.0_rc14.ebuild 2821 SHA256 f0001aed76130a36677470d54d6d40c1a1346c3270f86678701b307b8dc477d5 SHA512 241be132a539e1988dc638315da6c98354b3b4ad8b245eb6f3a44cb7999d2abfd8331b6b0309ce2483144833a994f5e7b1050aca292fd57412022b475e0d8c88 WHIRLPOOL 373b9f9f0772d78de0d3d9c1626a895dfc399f1d41439e43305b1e121f5467e6a08e5fd6d5404bc0c38c089ac6368371162c70f472da573f3186241eb32bf36e
-EBUILD zfs-9999.ebuild 2816 SHA256 63e893810a9730073635aef13333534485734c13c1926e2efb8f88ee90c3dc4d SHA512 5a7d183255197147b0d3a8878717da563a41507900984d6ea6498462726e815b62591772426150dd9f630bfa16669190e316e2c7f1d454634ddaf803bae94a37 WHIRLPOOL 91e0c0b18d5c54e5846c687cbc7376c76f6a7227cae97fd7e32a727aae7bb07d8c89c23984e62758c830ddf9930380300d6932fcb9395c733275def98918fa22
-MISC ChangeLog 11315 SHA256 d304d2596202ac89c213dc46edd6bec903f90299d5d3d96de45f590be26808aa SHA512 e195f3805b14fcf169e80f4dbcdfe3a772afe1318ba7e2756ae7ebe0d8e505757ca586b8ac9f348302e4a68448bf7c1b9b40d3d70861cb1db98c6322368d53e6 WHIRLPOOL 9e9d8c8f12bc89327a85c75fd71d21eebbf34f6fc19c58cac4a7bf453a52fbe4813cbb25e9a201255df840a464623406e3949eb266324c8063685c69e2de734e
+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
+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-9999.ebuild 2890 SHA256 58335fa7bb966fcdafa0d770ba91b24de7ec8994dc6e355c64eb8fdfdd6cbe9b SHA512 e728d7e973cd30e561c6bf8af12a3c6fa51beac390ea22e318b960e76384b919c2e7d4ac98e43aa03ca3c999855ebfe0fe40e428921577b51d566de74bb70e82 WHIRLPOOL f26761c1f0bb6c6885ee296a748bfe2cc2d1fbae5c39a64f3b329b92b3250a42f8f29479b86fd7267a35516a1528d2211be1a2c7389423e85b066f6101547cca
+MISC ChangeLog 12059 SHA256 cb6b569e8a4b9783572933ee96fecd4e41b46803cb43d09ee8feb4a3dec8adec SHA512 27e0244747c55b63902f263811fdfe4ef5989c904689964fd9eded6175e2b070d5101a2dcbe52192e4dceac90e0f0acd3093f5961c9f49300ca2540377e2917f WHIRLPOOL c1fe7997c285258f93b29d75f751e7a857fd588e4a21f659b2ce1d592401c6059ed83e18137f83427f21543b72c14fd17b69e7a912eaf3985b173ed8ab65ef69
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch b/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch
new file mode 100644
index 000000000000..b493424a1e77
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0_rc14-fix-libzpool-function-relocations.patch
@@ -0,0 +1,34 @@
+From 399f60c8b47f7513d078a7c181ff132e2cafdd15 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@cs.stonybrook.edu>
+Date: Tue, 5 Feb 2013 18:14:30 -0500
+Subject: [PATCH] Fix function relocations in libzpool
+
+binutils 2.23.1 fails in situations that generate function relocations
+on PowerPC and possibly other architectures. This causes linking of
+libzpool to fail because it depends on libnvpair. We add a dependency on
+libnvpair to lib/libzpool/Makefile.am to correct that.
+
+Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #1267
+---
+ lib/libzpool/Makefile.am |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
+index 3e62de6..cbba388 100644
+--- a/lib/libzpool/Makefile.am
++++ b/lib/libzpool/Makefile.am
+@@ -94,7 +94,8 @@ libzpool_la_SOURCES = \
+ 
+ libzpool_la_LIBADD = \
+ 	$(top_builddir)/lib/libunicode/libunicode.la \
+-	$(top_builddir)/lib/libuutil/libuutil.la
++	$(top_builddir)/lib/libuutil/libuutil.la \
++	$(top_builddir)/lib/libnvpair/libnvpair.la
+ 
+ libzpool_la_LDFLAGS = -pthread -version-info 1:1:0
+ 
+-- 
+1.7.10
+
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r4.ebuild
index 2dbff4613bed..b791feabc494 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r3.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-r3.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
+# $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 $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	test-suite? (
-		sys-apps/gawk
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
@@ -59,10 +59,11 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+	# 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
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc11-r3.ebuild
index fbff131b2432..caecdbb4e5c9 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc11-r2.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-r2.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
+# $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 $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	test-suite? (
-		sys-apps/gawk
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
@@ -59,10 +59,11 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+	# 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
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12-r3.ebuild
index 81c4c4bb5a1c..c22c174a7d67 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc12-r2.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-r2.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
+# $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 $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	test-suite? (
-		sys-apps/gawk
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
@@ -59,10 +59,11 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+	# 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
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild
index a39d74c87084..af7e4b95a203 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc13-r2.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_rc13-r1.ebuild,v 1.3 2013/01/23 14:20:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	test-suite? (
-		sys-apps/gawk
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
@@ -63,10 +63,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+	# 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
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild
index e912e4916ea3..bac233e1abd2 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc14.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc14-r1.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_rc14.ebuild,v 1.3 2013/02/04 17:31:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:48:50 ryao Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	test-suite? (
-		sys-apps/gawk
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
@@ -64,10 +64,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+	# 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
+
+	if [ ${PV} != "9999" ]
+	then
+		epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch"
+	fi
 
 	autotools-utils_src_prepare
 }
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 46918d1d8fb3..6711c511b9f5 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.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-9999.ebuild,v 1.43 2013/02/04 17:31:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.44 2013/02/06 01:48:50 ryao Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
 	test-suite? (
-		sys-apps/gawk
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
@@ -64,10 +64,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Workaround for hard coded path
-	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
-	# Workaround rename
-	sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
+	# 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
+
+	if [ ${PV} != "9999" ]
+	then
+		epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch"
+	fi
 
 	autotools-utils_src_prepare
 }