Linux-3.0 changes.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 18 insertions, 14 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 0be11b8d020b..01322feae6b2 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openswan
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.75 2010/11/27 12:32:18 mrness Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.76 2011/06/06 06:18:52 robbat2 Exp $
+
+  06 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> openswan-2.4.15-r2.ebuild,
+  openswan-2.6.29.ebuild, openswan-2.6.31.ebuild:
+  Linux-3.0 changes.
 
 *openswan-2.6.31 (27 Nov 2010)
 
diff --git a/net-misc/openswan/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild
index 5e6613557170..a75bd9c50380 100644
--- a/net-misc/openswan/openswan-2.4.15-r2.ebuild
+++ b/net-misc/openswan/openswan-2.4.15-r2.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/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.2 2010/08/15 20:45:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.3 2011/06/06 06:18:52 robbat2 Exp $
 
 EAPI="2"
 
@@ -30,7 +30,7 @@ RDEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	linux-info_pkg_setup
 
-	if kernel_is 2 6; then
+	if kernel_is -ge 2 6; then
 		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
 		einfo "KLIPS will not be compiled/installed."
 		MYMAKE="programs"
@@ -124,7 +124,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if kernel_is 2 6; then
+	if kernel_is -ge 2 6; then
 		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
 		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
 		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
diff --git a/net-misc/openswan/openswan-2.6.29.ebuild b/net-misc/openswan/openswan-2.6.29.ebuild
index eeebc5856c56..d844f102f67c 100644
--- a/net-misc/openswan/openswan-2.6.29.ebuild
+++ b/net-misc/openswan/openswan-2.6.29.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/net-misc/openswan/openswan-2.6.29.ebuild,v 1.1 2010/09/29 22:54:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.29.ebuild,v 1.2 2011/06/06 06:18:52 robbat2 Exp $
 
 EAPI="2"
 
@@ -39,7 +39,7 @@ pkg_setup() {
 
 	linux-info_pkg_setup
 
-	if kernel_is 2 6; then
+	if kernel_is -ge 2 6; then
 		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
 		einfo "KLIPS will not be compiled/installed."
 		MYMAKE="programs"
@@ -180,7 +180,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if kernel_is 2 6; then
+	if kernel_is -ge 2 6; then
 		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
 		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
 		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
diff --git a/net-misc/openswan/openswan-2.6.31.ebuild b/net-misc/openswan/openswan-2.6.31.ebuild
index 5328ad540647..8203dc698bd6 100644
--- a/net-misc/openswan/openswan-2.6.31.ebuild
+++ b/net-misc/openswan/openswan-2.6.31.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/net-misc/openswan/openswan-2.6.31.ebuild,v 1.1 2010/11/27 12:32:18 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.31.ebuild,v 1.2 2011/06/06 06:18:52 robbat2 Exp $
 
 EAPI="2"
 
@@ -39,7 +39,7 @@ pkg_setup() {
 
 	linux-info_pkg_setup
 
-	if kernel_is 2 6; then
+	if kernel_is -ge 2 6; then
 		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
 		einfo "KLIPS will not be compiled/installed."
 		MYMAKE="programs"
@@ -181,7 +181,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if kernel_is 2 6; then
+	if kernel_is -ge 2 6; then
 		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
 		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
 		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"