version bump from upstream

(Portage version: 2.1.3.11)

4 files changed, 27 insertions, 10 deletions

diff --git a/net-wireless/iwlwifi/ChangeLog b/net-wireless/iwlwifi/ChangeLog
index e668eb66ab68..c977eb4ca904 100644
--- a/net-wireless/iwlwifi/ChangeLog
+++ b/net-wireless/iwlwifi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2007/08/14 02:54:30 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/ChangeLog,v 1.8 2007/09/29 20:50:59 compnerd Exp $
+
+*iwlwifi-1.1.17 (29 Sep 2007)
+
+  29 Sep 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  -iwlwifi-0.0.39.ebuild, +iwlwifi-1.1.17.ebuild:
+  prune old revision, and bump to the new snapshot
 
 *iwlwifi-1.0.0_p1 (14 Aug 2007)
 
diff --git a/net-wireless/iwlwifi/files/digest-iwlwifi-0.0.39 b/net-wireless/iwlwifi/files/digest-iwlwifi-0.0.39
deleted file mode 100644
index 373059f5d222..000000000000
--- a/net-wireless/iwlwifi/files/digest-iwlwifi-0.0.39
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e3af121507978bd5cfc8545588930d6c iwlwifi-0.0.39.tgz 216088
-RMD160 1a069feb002afe65076a596fa0dfe937740d338a iwlwifi-0.0.39.tgz 216088
-SHA256 59ef7412118a4cd465e25142349927dfb4a864bbe735f82b71fc60ede64f8191 iwlwifi-0.0.39.tgz 216088
diff --git a/net-wireless/iwlwifi/files/digest-iwlwifi-1.1.17 b/net-wireless/iwlwifi/files/digest-iwlwifi-1.1.17
new file mode 100644
index 000000000000..2533b388d85a
--- /dev/null
+++ b/net-wireless/iwlwifi/files/digest-iwlwifi-1.1.17
@@ -0,0 +1,3 @@
+MD5 8c0ab70d569ae92315813855137d065f iwlwifi-1.1.17.tgz 290605
+RMD160 7d682e8a53bd529a165d9668806d3e095f25b478 iwlwifi-1.1.17.tgz 290605
+SHA256 193f9d7a56cd380039d3140c320614377eab83acc262b263e1a0da7e90fb4a4b iwlwifi-1.1.17.tgz 290605
diff --git a/net-wireless/iwlwifi/iwlwifi-0.0.39.ebuild b/net-wireless/iwlwifi/iwlwifi-1.1.17.ebuild
index 5802f57a6b15..4361766091ca 100644
--- a/net-wireless/iwlwifi/iwlwifi-0.0.39.ebuild
+++ b/net-wireless/iwlwifi/iwlwifi-1.1.17.ebuild
@@ -1,12 +1,12 @@
 # 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-0.0.39.ebuild,v 1.1 2007/07/17 01:54:23 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iwlwifi/iwlwifi-1.1.17.ebuild,v 1.1 2007/09/29 20:50:59 compnerd Exp $
 
 inherit eutils linux-mod
 
 DESCRIPTION="Intel (R) PRO/Wireless 3945ABG Network Drivers"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/${PN}/downloads/${P}.tgz"
+SRC_URI="http://intellinuxwireless.org/${PN}/downloads/${P//_p/-}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ipw3945 ipw4965"
 
 DEPEND=">=virtual/linux-sources-2.6.22"
-RDEPEND="ipw3945? ( net-wireless/iwl3945-ucode )
-		 ipw4965? ( net-wireless/iwl4965-ucode )
-		 !ipw3945? ( !ipw4965? ( net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode ) )"
+RDEPEND="ipw3945? ( =net-wireless/iwl3945-ucode-2.14.1.5 )
+		 ipw4965? ( =net-wireless/iwl4965-ucode-4.44.1.18 )
+		 !ipw3945? ( !ipw4965? ( =net-wireless/iwl3945-ucode-2.14.1.5 =net-wireless/iwl4965-ucode-4.44.1.18 ) )"
 
 pkg_setup() {
 	if kernel_is lt 2 6 22 ; then
@@ -27,7 +27,6 @@ pkg_setup() {
 		CONFIG_CHECK="MAC80211"
 	fi
 
-	BUILD_TARGETS="all"
 	BUILD_PARAMS="KSRC=${KV_DIR} M=${S}"
 
 	linux-mod_pkg_setup
@@ -51,7 +50,19 @@ pkg_setup() {
 
 	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_compile() {
+	if [[ ${ARCH} == "amd64" ]] ; then
+		ARCH="x86_64"
+	else
+		ARCH="i386"
+	fi
+
+	make # this will fail, but is responsible for making the compatible structure
+	make || die "compile failed"
+}