Slotted 15.28.2.8 since it's useful to have both ucodes installed at the same time. Added warnings about kernel compatibilities, thank PaX Team and Robert Förster for help in bug #246045.

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

3 files changed, 29 insertions, 4 deletions

diff --git a/net-wireless/iwl3945-ucode/ChangeLog b/net-wireless/iwl3945-ucode/ChangeLog
index 7c2012dbb78f..c46f7645d6ea 100644
--- a/net-wireless/iwl3945-ucode/ChangeLog
+++ b/net-wireless/iwl3945-ucode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/iwl3945-ucode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl3945-ucode/ChangeLog,v 1.7 2009/01/22 10:45:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl3945-ucode/ChangeLog,v 1.8 2009/01/22 18:03:17 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@gentoo.org> iwl3945-ucode-15.28.1.8.ebuild,
+  iwl3945-ucode-15.28.2.8.ebuild:
+  Slotted 15.28.2.8 since it's useful to have both ucodes installed at the
+  same time. Added warnings about kernel compatibilities, thank PaX Team and
+  Robert Förster for help in bug #246045.
 
 *iwl3945-ucode-15.28.2.8 (22 Jan 2009)
 *iwl3945-ucode-15.28.1.8 (22 Jan 2009)
diff --git a/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.1.8.ebuild b/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.1.8.ebuild
index 0b6dc34ef309..a3f8a00131b3 100644
--- a/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.1.8.ebuild
+++ b/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.1.8.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/iwl3945-ucode/iwl3945-ucode-15.28.1.8.ebuild,v 1.1 2009/01/22 10:45:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.1.8.ebuild,v 1.2 2009/01/22 18:03:17 pva Exp $
 
 MY_P="iwlwifi-3945-ucode-${PV}"
 
@@ -27,3 +27,12 @@ src_install() {
 	doins iwlwifi-3945-1.ucode || die
 	dodoc README*
 }
+
+pkg_postinst() {
+	elog
+	elog "This version of ucode works only with kernels <2.6.28. For newer"
+	elog "kernels use newer ucode:"
+	elog "emerge ${CATEGORY}/${PN}:1"
+	elog "For more information take a look at bugs.gentoo.org/246045"
+	elog
+}
diff --git a/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.2.8.ebuild b/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.2.8.ebuild
index 1c1b1abcdb43..01038b4da985 100644
--- a/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.2.8.ebuild
+++ b/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.2.8.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/iwl3945-ucode/iwl3945-ucode-15.28.2.8.ebuild,v 1.1 2009/01/22 10:45:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl3945-ucode/iwl3945-ucode-15.28.2.8.ebuild,v 1.2 2009/01/22 18:03:17 pva Exp $
 
 MY_P="iwlwifi-3945-ucode-${PV}"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
 SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
 
 LICENSE="Intel"
-SLOT="0"
+SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
@@ -27,3 +27,13 @@ src_install() {
 	doins iwlwifi-3945-2.ucode || die
 	dodoc README*
 }
+
+pkg_postinst() {
+	elog
+	elog "Due to ucode API change this version of ucode works only with kernels"
+	elog ">=2.6.28. If you have to use older kernels please install ucode"
+	elog "with older API:"
+	elog "emerge ${CATEGORY}/${PN}:0"
+	elog "For more information take a look at bugs.gentoo.org/246045"
+	elog
+}