As it was suggested by PaX Team in bug #246045 die was bad idea. So merely warn user instead.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 19 insertions, 18 deletions

diff --git a/net-wireless/iwl4965-ucode/ChangeLog b/net-wireless/iwl4965-ucode/ChangeLog
index 3037e2f4404d..3c5c380e3446 100644
--- a/net-wireless/iwl4965-ucode/ChangeLog
+++ b/net-wireless/iwl4965-ucode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/iwl4965-ucode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v 1.14 2009/01/22 11:57:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v 1.15 2009/01/22 18:20:25 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@gentoo.org>
+  iwl4965-ucode-228.57.2.21.ebuild, iwl4965-ucode-228.57.2.23.ebuild:
+  As it was suggested by PaX Team in bug #246045 die was bad idea. So merely
+  warn user instead.
 
   22 Jan 2009; Peter Volkov <pva@gentoo.org> metadata.xml,
   iwl4965-ucode-228.57.2.21.ebuild, iwl4965-ucode-228.57.2.23.ebuild:
diff --git a/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild b/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild
index 76a10e6779b4..a8bf6537f9b6 100644
--- a/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild
+++ b/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild,v 1.4 2009/01/22 11:57:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.21.ebuild,v 1.5 2009/01/22 18:20:25 pva Exp $
 
 MY_PN="iwlwifi-4965-ucode"
 
@@ -28,7 +28,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "This version ofucode works only with kernels >=2.6.27. In case you have"
-	elog "older kernel, please, mask net-wireless/iwl4965-unicode:1. For more"
-	elog "information take a look at bugs.gentoo.org/235007"
+	elog "Due to ucode API change this version of ucode works only with kernels"
+	elog ">=2.6.27. If you need ucode for older versions please install it with"
+	elog "emerge net-wireless/iwl4965-unicode:0"
+	elog "For more information take a look at bugs.gentoo.org/235007"
 }
diff --git a/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild b/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild
index aab8cb37e284..c85fdc5267ed 100644
--- a/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild
+++ b/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild,v 1.2 2009/01/22 11:57:51 pva Exp $
-
-inherit linux-info
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/iwl4965-ucode-228.57.2.23.ebuild,v 1.3 2009/01/22 18:20:25 pva Exp $
 
 MY_P=iwlwifi-4965-ucode-${PV}
 
@@ -20,16 +18,6 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	if kernel_is lt 2 6 27 ; then
-		eerror "Due to ucode API change this version of ucode works only with kernels"
-		eerror ">=2.6.27. Please either upgrade your kernel or mask"
-		eerror "net-wireless/iwl4965-unicode:1. For more information take a"
-		eerror "look at bugs.gentoo.org/235007"
-		die "${PN} requires at least kernel 2.6.27."
-	fi
-}
-
 src_compile() {
 	true;
 }
@@ -39,3 +27,10 @@ src_install() {
 	doins iwlwifi-4965-2.ucode || die
 	dodoc README* || die "dodoc failed"
 }
+
+pkg_postinst() {
+	elog "Due to ucode API change this version of ucode works only with kernels"
+	elog ">=2.6.27. If you need ucode for older versions please install it with"
+	elog "emerge net-wireless/iwl4965-unicode:0"
+	elog "For more information take a look at bugs.gentoo.org/235007"
+}