version bump from upstream

Package-Manager: portage-2.1.4

5 files changed, 131 insertions, 6 deletions

diff --git a/net-wireless/iwlwifi/ChangeLog b/net-wireless/iwlwifi/ChangeLog
index 9d6d2c93ba48..93d04e9dc73b 100644
--- a/net-wireless/iwlwifi/ChangeLog
+++ b/net-wireless/iwlwifi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/iwlwifi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/ChangeLog,v 1.16 2007/12/25 20:40:19 compnerd Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/ChangeLog,v 1.17 2008/01/22 05:08:58 compnerd Exp $
+
+  22 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/iwlwifi-1.2.23-revert-uncompatible.patch:
+  version bump from upstream
 
   25 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   iwlwifi-1.2.22.ebuild:
diff --git a/net-wireless/iwlwifi/Manifest b/net-wireless/iwlwifi/Manifest
index 97315e9b0965..0579ac0aa26a 100644
--- a/net-wireless/iwlwifi/Manifest
+++ b/net-wireless/iwlwifi/Manifest
@@ -2,8 +2,13 @@ AUX CVE-2007-5938.patch 728 RMD160 f703f7082e13aa035c590438afc0d1fb0b4267e8 SHA1
 MD5 d9a8bd65b5a3283f192a31885ac9f901 files/CVE-2007-5938.patch 728
 RMD160 f703f7082e13aa035c590438afc0d1fb0b4267e8 files/CVE-2007-5938.patch 728
 SHA256 78e690257ffa6ef5068e7fa70ab8ae1bd758ad75f7bc9cd61f77ba715c153216 files/CVE-2007-5938.patch 728
+AUX iwlwifi-1.2.23-revert-uncompatible.patch 1340 RMD160 82c4a69e5f5c3aef0e74e6630578abc5dadd67d5 SHA1 0847914e1ade6f399f85a53676eff3216d7775c2 SHA256 67444845be0d9d7563376222a1dd7bf723522955564e49df948ee41d20c866e4
+MD5 28c534f267b3fbcf1acf6e1f7b7bf8dc files/iwlwifi-1.2.23-revert-uncompatible.patch 1340
+RMD160 82c4a69e5f5c3aef0e74e6630578abc5dadd67d5 files/iwlwifi-1.2.23-revert-uncompatible.patch 1340
+SHA256 67444845be0d9d7563376222a1dd7bf723522955564e49df948ee41d20c866e4 files/iwlwifi-1.2.23-revert-uncompatible.patch 1340
 DIST iwlwifi-1.1.21.tgz 325264 RMD160 94a364204f468568d55050ea79e691d98bbb4db2 SHA1 654fddef16a474c008062e04b4e33b1fe60a4500 SHA256 d353eec27da2396203510e48024cf6df29e80cb7ab1b6538457d67493739eef7
 DIST iwlwifi-1.2.22.tgz 360780 RMD160 9222cfe2e285f880b02212cbfd2f93ede1eba3b0 SHA1 62b3e6b47772adf441ea4300dca36f407caa807b SHA256 4f2117739c7d2c02143d330ac6c99483fa1f7f918ae927a1b9c03444457e38d7
+DIST iwlwifi-1.2.23.tgz 363312 RMD160 d2b901514de785f2371124c3ed32461ffa3ff4f8 SHA1 207e1922850cb0e628e30597c5fddb768687ee14 SHA256 3746af8a6a6c575b07cf945f5ef835f08692149e8a16d4159152acf29efc9a28
 EBUILD iwlwifi-1.1.21-r1.ebuild 2253 RMD160 f98b2d0f453cca7614a4c1aaf93705c92aad00c5 SHA1 5c15fe9e9c38b643d9769620451d4676b0d96944 SHA256 e2285467fc3d995c90204bf771ea46f972a42db62092b998a5eb2f58f99d12e2
 MD5 5dc9faa2b995a8ba07a0fb88283bb6c6 iwlwifi-1.1.21-r1.ebuild 2253
 RMD160 f98b2d0f453cca7614a4c1aaf93705c92aad00c5 iwlwifi-1.1.21-r1.ebuild 2253
@@ -12,10 +17,14 @@ EBUILD iwlwifi-1.2.22.ebuild 2022 RMD160 63554a915e627a63c38b7e980a47d7cf2b0ac3b
 MD5 f66687a0d794e0bf61e656cafc65dc05 iwlwifi-1.2.22.ebuild 2022
 RMD160 63554a915e627a63c38b7e980a47d7cf2b0ac3b8 iwlwifi-1.2.22.ebuild 2022
 SHA256 cda6595e6f10bd23fbf4ac5cf4c45329472f1d1108fa60d90460136c2730cce7 iwlwifi-1.2.22.ebuild 2022
-MISC ChangeLog 2672 RMD160 bc65da707905635339f237d6cac8c8c97516bc0c SHA1 44bd08fd584bf295cb69a3747623b29bac22b4c1 SHA256 fd2e17c5458c3dadb41396a9933938103df7364ef0ec9050a096e2eae76ee1b1
-MD5 3b66fd7b709634eb6f492b7dc15cbbc6 ChangeLog 2672
-RMD160 bc65da707905635339f237d6cac8c8c97516bc0c ChangeLog 2672
-SHA256 fd2e17c5458c3dadb41396a9933938103df7364ef0ec9050a096e2eae76ee1b1 ChangeLog 2672
+EBUILD iwlwifi-1.2.23.ebuild 2126 RMD160 db438cb03940ae04587c6aa377f3f2cb7fe55811 SHA1 e80f8f5957cdd4a55e514f22ed3bd4ea3cb67fd6 SHA256 9be0baf63462c83a1ee36c3d43baac0f58b7148e883c9c20e6248a24cb3de7b3
+MD5 006f2e818f315c070f584314d6223419 iwlwifi-1.2.23.ebuild 2126
+RMD160 db438cb03940ae04587c6aa377f3f2cb7fe55811 iwlwifi-1.2.23.ebuild 2126
+SHA256 9be0baf63462c83a1ee36c3d43baac0f58b7148e883c9c20e6248a24cb3de7b3 iwlwifi-1.2.23.ebuild 2126
+MISC ChangeLog 2809 RMD160 0b4e87da47b7cfaecfb0946295cd300223e549f0 SHA1 66f5c944291615e5e950e244b83ec01220aa0154 SHA256 2f74c80d68eac937d918d53878e671347342c83beeaabdab83b08f81d5be02ba
+MD5 af99a1afb1406c3f85d18b9ac4d2b1ab ChangeLog 2809
+RMD160 0b4e87da47b7cfaecfb0946295cd300223e549f0 ChangeLog 2809
+SHA256 2f74c80d68eac937d918d53878e671347342c83beeaabdab83b08f81d5be02ba ChangeLog 2809
 MISC metadata.xml 338 RMD160 f28d4a7f5ccd035df52a995309e4ff02380b07d2 SHA1 181e864f24e214038a9ee39507d7b2e5b192fce0 SHA256 fe5e9cb3ac5fa7eb1df76b8089a111c3980565c2b64aa36004138b72a2e1a93d
 MD5 341ed6f1014710a58a658da6c08e9ba8 metadata.xml 338
 RMD160 f28d4a7f5ccd035df52a995309e4ff02380b07d2 metadata.xml 338
@@ -26,3 +35,6 @@ SHA256 90184077c24bf36522f1e45a926e238e7acc4dc9952d677f9ab3d6e30064050b files/di
 MD5 99e82d69c0ceeb1d55067a008874c49c files/digest-iwlwifi-1.2.22 235
 RMD160 e833082bd041d247e26f555e623ba34e611987cc files/digest-iwlwifi-1.2.22 235
 SHA256 c4d60a4fe76564961af671e1b0357611d32f0bc761bcc429b8731d861de49379 files/digest-iwlwifi-1.2.22 235
+MD5 c73a640e756c51fa84debdf4194891e0 files/digest-iwlwifi-1.2.23 235
+RMD160 807a20f5a20c2f32124afda2773c61faaf8f5e3d files/digest-iwlwifi-1.2.23 235
+SHA256 bb58bacb8cdbb2f7e5cab01b4e2396ab09c3783b125fb4a14028a13c2b28ca92 files/digest-iwlwifi-1.2.23 235
diff --git a/net-wireless/iwlwifi/files/digest-iwlwifi-1.2.23 b/net-wireless/iwlwifi/files/digest-iwlwifi-1.2.23
new file mode 100644
index 000000000000..4de39022c400
--- /dev/null
+++ b/net-wireless/iwlwifi/files/digest-iwlwifi-1.2.23
@@ -0,0 +1,3 @@
+MD5 0a6ae714ba5cb22d55f6b6fd2e29dc2d iwlwifi-1.2.23.tgz 363312
+RMD160 d2b901514de785f2371124c3ed32461ffa3ff4f8 iwlwifi-1.2.23.tgz 363312
+SHA256 3746af8a6a6c575b07cf945f5ef835f08692149e8a16d4159152acf29efc9a28 iwlwifi-1.2.23.tgz 363312
diff --git a/net-wireless/iwlwifi/files/iwlwifi-1.2.23-revert-uncompatible.patch b/net-wireless/iwlwifi/files/iwlwifi-1.2.23-revert-uncompatible.patch
new file mode 100644
index 000000000000..eacbab9a31a5
--- /dev/null
+++ b/net-wireless/iwlwifi/files/iwlwifi-1.2.23-revert-uncompatible.patch
@@ -0,0 +1,32 @@
+--- iwlwifi-1.2.23/Makefile	2007-12-16 19:00:43.000000000 -0800
++++ iwlwifi-1.2.22/Makefile	2007-11-28 00:27:09.000000000 -0800
+@@ -13,8 +13,8 @@
+ export CONFIG_IWL4965_SPECTRUM_MEASUREMENT ?= y
+ export CONFIG_IWL3945_DEBUG ?= y
+ export CONFIG_IWL4965_DEBUG ?= y
+-export CONFIG_IWL4965_HT ?= y
+-export CONFIG_IWL4965_HT_AGG ?= y
++export CONFIG_IWL4965_HT ?= n
++export CONFIG_IWL4965_HT_AGG ?= n
+ export CONFIG_IWL4965_SENSITIVITY ?= y
+ export CONFIG_IWL3945_QOS  ?= y
+ export CONFIG_IWL4965_QOS ?= y
+@@ -146,15 +146,15 @@
+ 
+ sparse: check_inc source
+ 	@echo "Warning: Compiling in Check Mode!!!"
+-	$(MAKE) C=2 CF="-Wall -D__CHECK_ENDIAN__" -C $(KSRC) O=$(KSRC_OUTPUT) M=$(shell pwd)/${DIR} modules
++	$(MAKE) C=2 CF="-Wall -D__CHECK_ENDIAN__" -C $(KSRC) O=$(KSRC_OUTPUT) M=$(PWD)/${DIR} modules
+ 
+ ifeq ($(DEVMODE),y)
+ modules:
+ 	@echo "Warning: In DEVMODE: No compatability checks are performed!!!"
+-	$(MAKE) -C $(KSRC) O=$(KSRC_OUTPUT) M=$(shell pwd)/${DIR} EXTRA_CFLAGS="$(EXTRA_CFLAGS)" modules
++	$(MAKE) -C $(KSRC) O=$(KSRC_OUTPUT) M=$(PWD)/${DIR} EXTRA_CFLAGS="$(EXTRA_CFLAGS)" modules
+ else
+ modules: check_inc source
+-	$(MAKE) -C $(KSRC) O=$(KSRC_OUTPUT) M=$(shell pwd)/${DIR} EXTRA_CFLAGS="$(EXTRA_CFLAGS)" modules
++	$(MAKE) -C $(KSRC) O=$(KSRC_OUTPUT) M=$(PWD)/${DIR} EXTRA_CFLAGS="$(EXTRA_CFLAGS)" modules
+ endif
+ 
+ patch_kernel:
diff --git a/net-wireless/iwlwifi/iwlwifi-1.2.23.ebuild b/net-wireless/iwlwifi/iwlwifi-1.2.23.ebuild
new file mode 100644
index 000000000000..8b0b029fd56d
--- /dev/null
+++ b/net-wireless/iwlwifi/iwlwifi-1.2.23.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/iwlwifi-1.2.23.ebuild,v 1.1 2008/01/22 05:08:58 compnerd Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Intel (R) PRO/Wireless Network Drivers"
+HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
+SRC_URI="http://intellinuxwireless.org/${PN}/downloads/${P//_p/-}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipw3945 ipw4965"
+
+DEPEND="|| ( =virtual/linux-sources-2.6.22* =virtual/linux-sources-2.6.23* )"
+RDEPEND="ipw3945? ( =net-wireless/iwl3945-ucode-2.14.1.5 )
+		 ipw4965? ( =net-wireless/iwl4965-ucode-4.44.1* )
+		 !ipw3945? ( !ipw4965? ( =net-wireless/iwl3945-ucode-2.14.1.5 =net-wireless/iwl4965-ucode-4.44.1* ) )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	if kernel_is lt 2 6 22 ; then
+		eerror "iwlwifi requires a kernel >=2.6.22."
+		eerror "Please set your /usr/src/linux symlink accordingly."
+		die "invalid /usr/src/linux symlink"
+	else
+		CONFIG_CHECK="MAC80211 FW_LOADER"
+	fi
+
+	if kernel_is gt 2 6 23 ; then
+		eerror "iwlwifi is included in 2.6.24, this ebuild is not guaranteed to"
+		eerror "build against the newer kernel."
+		die "invalid /usr/src/linux symlink"
+	fi
+
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KSRC=${KV_DIR} M=${S}"
+
+	linux-mod_pkg_setup
+
+	if use ipw3945 ; then
+		MODULE_NAMES="iwl3945(net/wireless:${S}/compatible)"
+		if ! use ipw4965 ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL4965=n"
+		fi
+	fi
+
+	if use ipw4965 ; then
+		MODULE_NAMES="${MODULE_NAMES} iwl4965(net/wireless:${S}/compatible)"
+		if ! use ipw3945 ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL3945=n"
+		fi
+	fi
+
+	if ! use ipw3945 && ! use ipw4965 ; then
+		einfo "Wireless card not selected, building all modules"
+		MODULE_NAMES="iwl3945(net/wireless:${S}/compatible) iwl4965(net/wireless:${S}/compatible)"
+		BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL3945=m CONFIG_IWL4965=m"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.2.23-revert-uncompatible.patch"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc CHANGES ISSUES README.iwlwifi
+}