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).

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

8 files changed, 104 insertions, 37 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/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
 }