version bump from upstream

(Portage version: 2.1.4)

4 files changed, 115 insertions, 2 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/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
+}