Took maintainance. Added warning in stable ebuild and check kernel version in unstable for bug #235007. Thank Oisin O Malley for report and R Bar-On for solution.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

5 files changed, 45 insertions, 17 deletions

diff --git a/net-wireless/iwl4965-ucode/ChangeLog b/net-wireless/iwl4965-ucode/ChangeLog
index 38d9ba20f1c9..3037e2f4404d 100644
--- a/net-wireless/iwl4965-ucode/ChangeLog
+++ b/net-wireless/iwl4965-ucode/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2009/01/15 22:07:37 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwl4965-ucode/ChangeLog,v 1.14 2009/01/22 11:57:51 pva Exp $
+
+  22 Jan 2009; Peter Volkov <pva@gentoo.org> metadata.xml,
+  iwl4965-ucode-228.57.2.21.ebuild, iwl4965-ucode-228.57.2.23.ebuild:
+  Took maintainance. Added warning in stable ebuild and check kernel version
+  in unstable for bug #235007. Thank Oisin O Malley for report and R Bar-On
+  for solution.
 
   15 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
   Compnerd retired.
@@ -14,7 +20,8 @@
 
   06 Jan 2009; <chainsaw@gentoo.org> +iwl4965-ucode-228.57.2.23.ebuild:
   ABI 2 microcode version bump, as requested by Ari Entlich
-  <lmage11@twcny.rr.com> in bug #252642.
+  <lmage11@twcny.rr.com> in bug #252642. Upstream announcement:
+  http://tinyurl.com/arkfxg
 
   01 Jan 2009; <chainsaw@gentoo.org> iwl4965-ucode-228.57.2.21.ebuild:
   Mark firmware ABI-2 stable on AMD64 for 2.6.27 as requested by Thomas Pani
diff --git a/net-wireless/iwl4965-ucode/Manifest b/net-wireless/iwl4965-ucode/Manifest
index 9f38341e208e..3defe2e3d27a 100644
--- a/net-wireless/iwl4965-ucode/Manifest
+++ b/net-wireless/iwl4965-ucode/Manifest
@@ -4,9 +4,9 @@ DIST iwlwifi-4965-ucode-228.57.2.23.tgz 81128 RMD160 f8338fd61dd3f6ef03c2fe7b148
 DIST iwlwifi-4965-ucode-4.44.1.18.tgz 83797 RMD160 089912a5dfe2c6e9b2d77a779564a2a910c6dc4c SHA1 01bf0264cfc4f60957a7242264050a81c56858bf SHA256 6c1c870562c259af3df33756a811967e7e5ae6176e5ebdfc3d74a1fdc5f86d8d
 DIST iwlwifi-4965-ucode-4.44.1.20.tgz 80030 RMD160 775d4379f99ef8f731f596fc5a28a73b63a05fe7 SHA1 34731f1855ea69751f5e357e95b51019430816b3 SHA256 093771caf99c7094cb18057721109c6119e395a57f3e67a4b463f9703efb4c7b
 EBUILD iwl4965-ucode-228.57.1.21.ebuild 747 RMD160 fede6c9f490e5c31f06f7ef3c4d372e13f2990b9 SHA1 2412cbf24115a950a4b475a75d2a7a5d58a8fe83 SHA256 a2cae904f554768fb0553d0fc6c616e78708585b6cda5f14d7209ddfd5b39f51
-EBUILD iwl4965-ucode-228.57.2.21.ebuild 748 RMD160 4f66f3fe5a57329d5f67da8ec28384f94833f754 SHA1 0f536e458914f77d67433ab6651595c4b058cfe7 SHA256 d3270c91829f83eaaf51ef2b3db60c0bda749b46d8c3b7cb46596819ab6b2721
-EBUILD iwl4965-ucode-228.57.2.23.ebuild 750 RMD160 3904d110cceb0ecbe5c69b0133855f32819fbd84 SHA1 055777d6f3f3066fa2a160b968d898405890f3e4 SHA256 1c060efb519e83e40d07cb0a59aab134839c7743c1c7dc88eb3cf9c47b26b6ca
+EBUILD iwl4965-ucode-228.57.2.21.ebuild 974 RMD160 c6146c44bd3e7bc2ef60640306def5259656944b SHA1 43f52398fe71f119c4c29c5968136690ff22e88c SHA256 a100212ad5c4dc7f25dca51c8813f858ebd877df45d552f30c66bb126902581b
+EBUILD iwl4965-ucode-228.57.2.23.ebuild 1127 RMD160 b5f0596434c67802efda2d70af5414e784e8a0c2 SHA1 8bde77c6d94b9bc1aa85002a2b250375a522a1fa SHA256 1a43919e8b37dab4fd79e8d6405cecb5f50c1f23c0b46cd7c84c7a506ebddfe9
 EBUILD iwl4965-ucode-4.44.1.18.ebuild 730 RMD160 03f3d75bd4a18174e5daf3e126c672078c617158 SHA1 cccc3c234030ed016b08bf204e1b1c8d5e6fcdac SHA256 b4b97a671abaee3105df618a88cee88b71f05887a9d68fc85b6bf778233d5fac
 EBUILD iwl4965-ucode-4.44.1.20.ebuild 745 RMD160 8c996fd78d6ed2f643bf3b53f5655e1a86e1adb2 SHA1 64fe41f308ed7c962ae28a97f55a15f42439588f SHA256 d30799c65815b93459a01515875832286b769613ca9f9703e7327c1eda553874
-MISC ChangeLog 2575 RMD160 f2f1bb7e9ca005a779270b62b916aeb277dc7728 SHA1 4c659cfb624c98e795dd2e6f762baacffb963f88 SHA256 c612e0b45b13d846d79d60941990f165284c36cbfef334c257efa9cae17852a0
-MISC metadata.xml 271 RMD160 7dbc1957b7e5105f598a3ad432827b3cfe1ed845 SHA1 cafde5851224a2a5d8e31fc9490bb61bdf5ef9cb SHA256 16d540c3c4d6c4efa5eff6855f03865c609b0ca066641abca4d7ad58051529ff
+MISC ChangeLog 2920 RMD160 8e17f62bce226ba4b5ecb68e935bbf7726936330 SHA1 7bf912cb38d300b1ef3b12691d50331d50ca4b53 SHA256 c5cac1e441a91ab39c9f2bb0465ab7cb66e7803ad44a925e5b1b96b384b0c44b
+MISC metadata.xml 360 RMD160 72dafa3f45b3bb99897147c9b0995a217a6a5944 SHA1 ebf17e757a554735b00fbd685562497382c203a1 SHA256 411e22f80c132356308af4c181c62ad140a6bf967daa16784c327cd21c6539b5
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 ef065bcf929a..76a10e6779b4 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.3 2009/01/10 16:34:54 chainsaw Exp $
+# $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 $
 
 MY_PN="iwlwifi-4965-ucode"
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_PN}-${PV}
 
 src_compile() {
 	true;
@@ -23,7 +23,12 @@ src_compile() {
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-4965-2.ucode"
-
+	doins iwlwifi-4965-2.ucode || die
 	dodoc README* || die "dodoc failed"
 }
+
+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"
+}
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 853c8dd48361..aab8cb37e284 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,12 +1,14 @@
 # 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.1 2009/01/06 11:20:52 chainsaw Exp $
+# $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 $
 
-MY_PN="iwlwifi-4965-ucode"
+inherit linux-info
+
+MY_P=iwlwifi-4965-ucode-${PV}
 
 DESCRIPTION="Intel (R) Wireless WiFi Link 4965AGN ucode"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${PV}.tgz"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_P}.tgz"
 
 LICENSE="Intel"
 SLOT="1"
@@ -14,8 +16,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="|| ( >=sys-fs/udev-096 >=sys-apps/hotplug-20040923 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
+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;
@@ -23,7 +36,6 @@ src_compile() {
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-4965-2.ucode"
-
+	doins iwlwifi-4965-2.ucode || die
 	dodoc README* || die "dodoc failed"
 }
diff --git a/net-wireless/iwl4965-ucode/metadata.xml b/net-wireless/iwl4965-ucode/metadata.xml
index 91ae39101032..f0a897fc2ef8 100644
--- a/net-wireless/iwl4965-ucode/metadata.xml
+++ b/net-wireless/iwl4965-ucode/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mobile</herd>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 	<longdescription lang="en">
 		Firmware image for Intel Wirless 4965 series network cards
 	</longdescription>