Add DEPEND=virtual/awk, properly cast constant for 32-bit systems

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

12 files changed, 80 insertions, 17 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index 67421059ca70..ebfe6f5acc1f 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.17 2013/02/03 22:43:08 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.18 2013/02/06 01:46:26 ryao Exp $
+
+*zfs-kmod-0.6.0_rc14-r1 (06 Feb 2013)
+
+  06 Feb 2013; Richard Yao <ryao@gentoo.org>
+  +files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch,
+  +zfs-kmod-0.6.0_rc14-r1.ebuild, -zfs-kmod-0.6.0_rc14.ebuild,
+  zfs-kmod-0.6.0_rc10.ebuild, zfs-kmod-0.6.0_rc11-r1.ebuild,
+  zfs-kmod-0.6.0_rc11.ebuild, zfs-kmod-0.6.0_rc12-r1.ebuild,
+  zfs-kmod-0.6.0_rc12.ebuild, zfs-kmod-0.6.0_rc13-r1.ebuild,
+  zfs-kmod-0.6.0_rc13-r2.ebuild, zfs-kmod-0.6.0_rc13.ebuild,
+  zfs-kmod-9999.ebuild:
+  Add DEPEND=virtual/awk, properly cast constant for 32-bit systems
 
   03 Feb 2013; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.0_rc14.ebuild:
   Correct typo in pkg_postinst()
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch
new file mode 100644
index 000000000000..13189244c69a
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-cast-const-for-32bit-compatibility.patch
@@ -0,0 +1,36 @@
+From dd26aa535b395735ca61ea2a3e618aded45eb05e Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Mon, 4 Feb 2013 16:35:54 -0800
+Subject: [PATCH] Cast 'zfs bad bloc' to ULL for x86
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Explicitly case this value to an unsigned long long for 32-bit
+systems to inform the compiler that a long type should not be
+used.  Otherwise we get the following compiler error:
+
+  dmu_send.c:376: error: integer constant is too large for
+  ‘long’ type
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+---
+ module/zfs/dmu_send.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
+index 0cf3c4a..921c3d7 100644
+--- a/module/zfs/dmu_send.c
++++ b/module/zfs/dmu_send.c
+@@ -373,7 +373,7 @@
+ 				for (ptr = abuf->b_data;
+ 				    (char *)ptr < (char *)abuf->b_data + blksz;
+ 				    ptr++)
+-					*ptr = 0x2f5baddb10c;
++					*ptr = 0x2f5baddb10cULL;
+ 			} else {
+ 				return (EIO);
+ 			}
+-- 
+1.7.10
+
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
index 862eafcac912..f6cf83536912 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.0_rc10.ebuild,v 1.6 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild,v 1.7 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild
index 817922745fc2..3911ca9c4ed8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.0_rc11-r1.ebuild,v 1.2 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
index 325d5ba73415..3369d4e9cd68 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.0_rc11.ebuild,v 1.2 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild
index 66fc86270b28..b0934e129fa8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.0_rc12-r1.ebuild,v 1.1 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
index 21c15f46827d..b5b07cf94f3a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.0_rc12.ebuild,v 1.2 2012/12/11 19:43:44 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild
index 028bc059059b..2479d9f723b8 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-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-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild,v 1.2 2013/01/14 21:11:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild
index 226ebb56ae3d..e02d5c64772c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-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-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild,v 1.1 2013/01/16 08:57:38 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
index f39156fcf50d..867b8060a78f 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.0_rc13.ebuild,v 1.1 2012/12/23 05:44:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild
index c1348454a2ba..90facf83aee5 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-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-kmod/zfs-kmod-0.6.0_rc14.ebuild,v 1.2 2013/02/03 22:43:08 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}
@@ -61,6 +62,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	if [ ${PV} != "9999" ]
+	then
+		# Cast constant for 32-bit compatibility
+		epatch "${FILESDIR}/${P}-cast-const-for-32bit-compatibility.patch"
+	fi
 	autotools-utils_src_prepare
 }
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index c38cc854efa7..c152342dddbc 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-2013 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.8 2013/01/16 09:01:09 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.9 2013/02/06 01:46:26 ryao Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	=sys-kernel/spl-${PV}*
+	virtual/awk
 "
 
 RDEPEND="${DEPEND}