sys-block/open-iscsi: Fix version check for Linux 3 (bug #340425

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

7 files changed, 26 insertions, 20 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index d74772811710..a449e6e3894e 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.32 2011/06/07 14:32:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.33 2011/06/13 01:47:26 sping Exp $
+
+  13 Jun 2011; Sebastian Pipping <sping@gentoo.org>
+  open-iscsi-2.0.870.3-r1.ebuild, open-iscsi-2.0.871.ebuild,
+  open-iscsi-2.0.871-r1.ebuild, open-iscsi-2.0.871.3.ebuild,
+  open-iscsi-2.0.872.ebuild:
+  Fix version check for Linux 3
 
 *open-iscsi-2.0.872 (07 Jun 2011)
 
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 4b8d0b42db45..86192e916328 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -15,10 +15,10 @@ DIST open-iscsi-2.0-870.3.tar.gz 301242 RMD160 f3be0aeaa7b2988a794983bc6d8851102
 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
 DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961fa7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f
 DIST open-iscsi-2.0.871.3.tar.gz 331617 RMD160 496c25c10bfd6da5d363b9f2b9b28eeb53906109 SHA1 a21a0cec752466e631469eb7d73ac72b427bda6d SHA256 2aefded8bcc854acaa7d9df9455408484d894e2bed407ebfeb95bb07773fab53
-EBUILD open-iscsi-2.0.870.3-r1.ebuild 3061 RMD160 bc0bcc1a767592bb76131e1291a2ec72baae5219 SHA1 54567b78da6d986ff715a2fe75c225fa0a18ddb2 SHA256 37891a79096f0c889abdfe8888d061d066490017ea8026868933f402411ba55f
-EBUILD open-iscsi-2.0.871-r1.ebuild 2578 RMD160 0a1d8eabc21be85e189c3d8844bc9254d02fb379 SHA1 a4b14ee9a3c9b753fa5762040d24ea1e631dc2c3 SHA256 fb378d858070ecc6610da7db4e342ab7f52da132f7a40457f5406b58a61ed7fe
-EBUILD open-iscsi-2.0.871.3.ebuild 2568 RMD160 9bee710c03a84cd00f43607b6d022949bd69f271 SHA1 f8198b1fc3a5fd5774e9a024ebecfc4635430bcb SHA256 b01e4a67eb5e1dfa06f5e6a368ecac22ff1af2a64f0ab0739089f0900288cc0b
-EBUILD open-iscsi-2.0.871.ebuild 3149 RMD160 1999c962be1a5c8ac5da72703ba206faa30bda1e SHA1 d4742fd50339c3e62c06e67edb058dfa5f9bbd33 SHA256 00f70a8e3f1efeb0db97ec5a0e12ef42fe59e6c92ea0a7478107b7f72e75f644
-EBUILD open-iscsi-2.0.872.ebuild 2891 RMD160 fb700fcdceb34e2479d69aab4a203e1c706e4f36 SHA1 3a1f295488b89922dd4136941d3adfd9fb027cd6 SHA256 a8cdc6b53b25774fdf1a2af7fb42b639acc907eaa36713f78faa222822bedbae
-MISC ChangeLog 7414 RMD160 4a0edba345f3a4e68485db47d4445520aff20fe3 SHA1 9598aa6c595636c1122062670438ae69588fc640 SHA256 376d42c9276adc558c1c32587b03f2e8729ee901db11d436580ae788d9553ea8
+EBUILD open-iscsi-2.0.870.3-r1.ebuild 3063 RMD160 1d359925cb33027b1be5ab7aaddb7f522a158642 SHA1 3ec14c3d8c60cfed296535d5c2ba2ad29384da08 SHA256 f5bc308471b4b448f12fc4e6f671a310d59ea8f49a4c62fa7332558158837afd
+EBUILD open-iscsi-2.0.871-r1.ebuild 2576 RMD160 c900469b37ba184112f57eda1636a74543fbdf56 SHA1 4ea5608b8ba26a000f6b759291bd446fd37d541e SHA256 a21e5dcc2cf6fcf38f34aeef831c34c6c95459cdf0e1b9159b9527def3b80c2f
+EBUILD open-iscsi-2.0.871.3.ebuild 2564 RMD160 3761365b441f4fb057f9da7fcf259ff26dc72ea9 SHA1 9b351d518ed8796a95910ae54533fdace0623e8d SHA256 4b7f837d04d5c4be71aabc46f5f1466ffeef5a267810db745a5616268c3706cf
+EBUILD open-iscsi-2.0.871.ebuild 3144 RMD160 e56e024a32d81b2ce186222632cdc23ee1f6a530 SHA1 386baa14c31de5665cf9eb616cc36aa72c8ff169 SHA256 04f8d126af91a85ce16fd6aacff99643c08335be03f86cc379d2854b4856e1f6
+EBUILD open-iscsi-2.0.872.ebuild 2891 RMD160 467e9afe9e8c6399d872e77152c4c7f4f9999e7d SHA1 3c3a5ea8b4499addf01a8e1949682574173681d4 SHA256 b49e4526d0e3804326ea6a3cd369dbf0de568096e3d38f8af2f6ac23378d2d0e
+MISC ChangeLog 7650 RMD160 5c61b622ddd4160974763ed81f1c831f89218e1c SHA1 60c39d3f3215d685e7e8fd93d88a96fb3e8e4523 SHA256 6de80c40a54bf22a5c97f1e6a8f0ad0c66bb0e9b61f4e49da2c45729238ca6ed
 MISC metadata.xml 366 RMD160 e6901bcc9954fa2e7ebdc201be3f117f2769d11e SHA1 2f12a23a3bd4a33409183a32a99708dc4ce236e4 SHA256 023a201ecaa94699b402156f02c08c416e6eed0584f2096152605f3bef5df31a
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
index 0abe849f6a8b..cbed463b5c0d 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild,v 1.2 2011/04/24 21:04:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.870.3-r1.ebuild,v 1.3 2011/06/13 01:47:26 sping Exp $
 
 inherit versionator linux-mod eutils flag-o-matic
 
@@ -28,7 +28,7 @@ ERROR_CFG="open-iscsi needs CRC32C support in your kernel."
 src_unpack() {
 	unpack ${A}
 	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 15 ]; then
+	if kernel_is -lt 2 6 16; then
 		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
 	fi
 	epatch "${FILESDIR}"/CVE-2009-1297.patch
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild
index faf03a6c6bbb..5a09c82ca48f 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild,v 1.6 2010/03/31 23:19:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871-r1.ebuild,v 1.7 2011/06/13 01:47:26 sping Exp $
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PV}"
 pkg_setup() {
 	linux-info_pkg_setup
 
-	if [ $KV_PATCH -lt 15 ]; then
+	if kernel_is -lt 2 6 16; then
 		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
 	fi
 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
index 953611fcf31e..0df0607ec5b2 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild,v 1.3 2010/08/24 13:48:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.3.ebuild,v 1.4 2011/06/13 01:47:26 sping Exp $
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}
 pkg_setup() {
 	linux-info_pkg_setup
 
-	if [ $KV_PATCH -lt 15 ]; then
+	if kernel_is -lt 2 6 16; then
 		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
 	fi
 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild
index ef63365d35e9..2c2e17941b52 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild,v 1.2 2009/10/28 16:49:50 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.871.ebuild,v 1.3 2011/06/13 01:47:26 sping Exp $
 
 inherit versionator linux-mod eutils flag-o-matic
 
@@ -43,7 +43,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	export EPATCH_OPTS="-d${S}"
-	if [ $KV_PATCH -lt 15 ]; then
+	if kernel_is -lt 2 6 16; then
 		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
 	fi
 	epatch "${FILESDIR}"/CVE-2009-1297.patch
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
index df4a71864fce..8b548e46b393 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.1 2011/06/07 14:32:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.2 2011/06/13 01:47:26 sping Exp $
 
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PV}"
 pkg_setup() {
 	linux-info_pkg_setup
 
-	if [ $KV_PATCH -lt 15 ]; then
+	if kernel_is -lt 2 6 16; then
 		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
 	fi