Output a warning in pkg_pretend if the kernel is too old, bug 384125.

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

diff --git a/net-wireless/iwl1000-ucode/ChangeLog b/net-wireless/iwl1000-ucode/ChangeLog
index 7ccc37b5f5d5750473a5edfb0a13ec99dad01d05..226efb601ebacbf532e70bada7a0d39abe221e14 100644 (file)
--- a/net-wireless/iwl1000-ucode/ChangeLog
+++ b/net-wireless/iwl1000-ucode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/iwl1000-ucode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl1000-ucode/ChangeLog,v 1.9 2011/09/23 07:00:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl1000-ucode/ChangeLog,v 1.10 2011/09/24 13:46:13 ulm Exp $
+
+  24 Sep 2011; Ulrich Mueller <ulm@gentoo.org> iwl1000-ucode-39.31.5.1.ebuild:
+  Output a warning in pkg_pretend if the kernel is too old, bug 384125.
 
   23 Sep 2011; Ulrich Mueller <ulm@gentoo.org>
   +iwl1000-ucode-128.50.3.1.ebuild:

diff --git a/net-wireless/iwl1000-ucode/Manifest b/net-wireless/iwl1000-ucode/Manifest
index ae169635a6aa5973e48fc7444045fd2a918efc7b..d638f2c4e56e156bb46f1073b353b92f653c6aa9 100644 (file)
--- a/net-wireless/iwl1000-ucode/Manifest
+++ b/net-wireless/iwl1000-ucode/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST iwlwifi-1000-ucode-128.50.3.1.tgz 175772 RMD160 69f21ace2ab8c7c90e85b4a5d7f6768494e7bf71 SHA1 e0cd78b199b671f0775decaf99b62f1553cd2077 SHA256 7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d
 DIST iwlwifi-1000-ucode-39.31.5.1.tgz 180879 RMD160 648f0797e05901babc05b413de9c0640d2edd3f9 SHA1 6b2d9e0fe18ffa98c8335f989833ef12a2f4604b SHA256 ed0f1fbc2571c8da9a0cd9410fa8883494a9e1ac469d5000bc2c9dceaf83c970
 EBUILD iwl1000-ucode-128.50.3.1.ebuild 696 RMD160 c54703336777a5b14b1297d5c098c8bd6401f35b SHA1 d93233cd8f1751fc31aaae723ae5ed5dfa14f513 SHA256 cf3b26d3de2e7fdc6647212c40109e63af931a4ae5c39487ed9903314a11851a
-EBUILD iwl1000-ucode-39.31.5.1.ebuild 707 RMD160 f45603d9c63160ce541db0a9a2e23a677308b5fc SHA1 0e9ed2183f966cf0794f28da947810778651ece7 SHA256 e393a8b01b2a2ba5a17a4cee9beefb4d4e0e037c4387f1a0624204dd8535fed5
-MISC ChangeLog 1497 RMD160 a5f65e7ff19b3e0e4aeed2ed7719d89c111d072c SHA1 09a764a7c3b2879fc24c72ecc29aae5444ea8488 SHA256 5451b5056c40bbcaeb819d90c15e91eb3eaead9c8860a590f950f894a82c2e64
+EBUILD iwl1000-ucode-39.31.5.1.ebuild 1022 RMD160 d229f2ca6f9520ffabd1ce4b82f663336967d976 SHA1 bbb8aa780493aa8c8d45b841c883c1da611c2a48 SHA256 274b3afc4e9d82e4613d59ebd0bd86cc6a0ccac9773edea338c84a6ab2de9a97
+MISC ChangeLog 1650 RMD160 38652006c3d8f1ddf6587334820766d2fd30d416 SHA1 333ba3be4152e2bbdb5c744321bc791f3cab9c31 SHA256 f457451023428feba92288a616b84f763e6224e1ea3db181e7b890f4545b315a
 MISC metadata.xml 358 RMD160 52962abc1d9ca367b7fe043346637582427f1850 SHA1 7fb16fb2f46e6df75fb125c9c83cd99c456e8f9b SHA256 47e6b330bddcbecea7b95a39001a8709e32038c9906f9408e850129d559ca83a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk58MDcACgkQOeoy/oIi7uxcFQCeKxKi/rD873W0PONqd1XhR5nP
-NSgAn2esUZDFYcMsdHmTtSvWZYw/HMJr
-=UERw
+iEYEARECAAYFAk594NIACgkQOeoy/oIi7ux/nQCePxp1wzgaBM1OQ3VwqkRz/3ao
+gYsAnRO4+lg3EcBPzkQsLdyZCa7Hq35i
+=tDSS
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild b/net-wireless/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild
index f32fbe437fbbb3f3811e32848480d301346da84e..0469346f32c48044f10dcb7ccd37b78f91acd9b1 100644 (file)
--- a/net-wireless/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild
+++ b/net-wireless/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild,v 1.3 2011/09/18 21:41:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl1000-ucode/iwl1000-ucode-39.31.5.1.ebuild,v 1.4 2011/09/24 13:46:13 ulm Exp $
 
 EAPI=4
-MY_P="iwlwifi-1000-ucode-${PV}"
 
+inherit linux-info
+
+MY_P="iwlwifi-1000-ucode-${PV}"
 DESCRIPTION="Intel (R) Wireless WiFi Link 1000BGN ucode"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
 SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
@@ -18,6 +20,15 @@ RDEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_pretend() {
+       if kernel_is lt 2 6 39; then
+               ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+               ewarn "This microcode image requires a kernel >= 2.6.39."
+               ewarn "For kernel versions < 2.6.39, you may unmask and install"
+               ewarn "${CATEGORY}/${PN}-128.50.3.1 instead."
+       fi
+}
+
 src_install() {
        insinto /lib/firmware
        doins iwlwifi-1000-5.ucode