net-wireless/iwlwifi: changed ebuild and added useflags iwl3945 and iwl4965 to support both

svn path=/sunrise/; revision=4184

4 files changed, 50 insertions, 7 deletions

diff --git a/net-wireless/iwlwifi/ChangeLog b/net-wireless/iwlwifi/ChangeLog
index 2e581c1b2..9a90f7185 100644
--- a/net-wireless/iwlwifi/ChangeLog
+++ b/net-wireless/iwlwifi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jul 2007; Florian Manschwetus <florianmanschwetus@gmx.de>
+  -iwlwifi-0.0.35.ebuild, +iwlwifi-0.0.35-r1.ebuild:
+  changed ebuild and added useflags iwl3945 and iwl4965 to support both
+
   06 Jul 2007; Jakub Moc <jakub@gentoo.org> -iwlwifi-0.0.34-r1.ebuild:
   Nuke old
 
diff --git a/net-wireless/iwlwifi/Manifest b/net-wireless/iwlwifi/Manifest
index a29c06c6e..c80cb7a18 100644
--- a/net-wireless/iwlwifi/Manifest
+++ b/net-wireless/iwlwifi/Manifest
@@ -1,4 +1,16 @@
 DIST iwlwifi-0.0.35.tgz 210176 RMD160 bc37bf37103ba54bbee2cf0548e71eef921dda1d SHA1 b5c1abe81638fb277de936501ed20e0462ff70f5 SHA256 e418bab09d7bf248e678b667ec35f22d459604da3189f1d7b5375b39f3a89005
-EBUILD iwlwifi-0.0.35.ebuild 1837 RMD160 57464598d732302f149f3ca9aa4aeee7bb4e4df1 SHA1 88dd0eb01b304fd904afc0ba9133e7fdf089d7f0 SHA256 670c4dc6249ab928b9365da3bf17f4ef1b668a8e58f215ae02f4d662dc9e8ee1
-MISC ChangeLog 2248 RMD160 8819f900130124af77fd7fe3a670460ede1c51e8 SHA1 9dd91eda2fbe5e9ab6a31e7d3d29b0a7a60db981 SHA256 ce64a7475445511f7a6e0c0b6ce2d958ae1b076aca33adcc32e25bc9f9551da8
+EBUILD iwlwifi-0.0.35-r1.ebuild 2595 RMD160 876fdd5f24f8ae8fa8f2d4f82ba98b096f40ad80 SHA1 3b1fa1d2bf4f3ba9b37349bf2b4e63749a0c44e7 SHA256 6761a7ba31a417cd9904c4f51c10c4a619f49c7f7ed179a6999540ecf41c8b07
+MD5 914ca6271a70ab9f1a80cce22095540f iwlwifi-0.0.35-r1.ebuild 2595
+RMD160 876fdd5f24f8ae8fa8f2d4f82ba98b096f40ad80 iwlwifi-0.0.35-r1.ebuild 2595
+SHA256 6761a7ba31a417cd9904c4f51c10c4a619f49c7f7ed179a6999540ecf41c8b07 iwlwifi-0.0.35-r1.ebuild 2595
+MISC ChangeLog 2437 RMD160 0a85b98a02f28ddafa7543723ae5cc433a5e8dac SHA1 41c5b1474d5de8a4edacc31144bc13cdb57ed514 SHA256 44aadaa16834c9600812dd9a17e3ee926a82e05c9d9f80c4c58f33cd6c0ba3c7
+MD5 cb3c13740616ae3a3a01e671bd40d71f ChangeLog 2437
+RMD160 0a85b98a02f28ddafa7543723ae5cc433a5e8dac ChangeLog 2437
+SHA256 44aadaa16834c9600812dd9a17e3ee926a82e05c9d9f80c4c58f33cd6c0ba3c7 ChangeLog 2437
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
+RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
+SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
+MD5 a1356abfc42c00ba89750e714546ba81 files/digest-iwlwifi-0.0.35-r1 235
+RMD160 2118cd0d343979fceead95abdc01659dc34df049 files/digest-iwlwifi-0.0.35-r1 235
+SHA256 d7b5a5d8d545b44d42274a4db9367d156cd5ad80ef26c11d7a3c4942fde237d1 files/digest-iwlwifi-0.0.35-r1 235
diff --git a/net-wireless/iwlwifi/files/digest-iwlwifi-0.0.35-r1 b/net-wireless/iwlwifi/files/digest-iwlwifi-0.0.35-r1
new file mode 100644
index 000000000..097e11c0e
--- /dev/null
+++ b/net-wireless/iwlwifi/files/digest-iwlwifi-0.0.35-r1
@@ -0,0 +1,3 @@
+MD5 5a7cf5635a842e7e2e442739eb3c76d7 iwlwifi-0.0.35.tgz 210176
+RMD160 bc37bf37103ba54bbee2cf0548e71eef921dda1d iwlwifi-0.0.35.tgz 210176
+SHA256 e418bab09d7bf248e678b667ec35f22d459604da3189f1d7b5375b39f3a89005 iwlwifi-0.0.35.tgz 210176
diff --git a/net-wireless/iwlwifi/iwlwifi-0.0.35.ebuild b/net-wireless/iwlwifi/iwlwifi-0.0.35-r1.ebuild
index 90c4a2c2f..48a68182e 100644
--- a/net-wireless/iwlwifi/iwlwifi-0.0.35.ebuild
+++ b/net-wireless/iwlwifi/iwlwifi-0.0.35-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 DESCRIPTION="Intel (R) PRO/Wireless 3945ABG Network Connection"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
@@ -11,14 +11,16 @@ SRC_URI="http://intellinuxwireless.org/${PN}/downloads/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="iwl3945 iwl4965"
 
 DEPEND="|| ( >=virtual/linux-sources-2.6.22_rc1 net-wireless/mac80211 )"
-RDEPEND="net-wireless/iwlwifi-ucode"
+RDEPEND="iwl3945? ( net-wireless/iwlwifi3945-ucode )
+	iwl4965? ( net-wireless/iwlwifi4965-ucode )
+	!iwl3945? ( !iwl4965? ( net-wireless/iwlwifi3945-ucode net-wireless/iwlwifi4965-ucode ) )"
 
 S="${WORKDIR}/${P}/compatible"
 
-MODULE_NAMES="iwl3945(net/wireless)"
+#MODULE_NAMES="iwl3945(net/wireless)"
 BUILD_TARGETS="modules"
 
 pkg_setup() {
@@ -42,8 +44,30 @@ pkg_setup() {
 			die "Set your /usr/src/linux symlink accordingly."
 	fi
 
+	MODULE_NAMES=""
+	if use iwl3945; then
+		MODULE_NAMES="iwl3945(net/wireless)"
+	fi
+	if use iwl4965; then
+		MODULE_NAMES="${MODULE_NAMES} iwl4965(net/wireless)"
+	fi
+	if ! use iwl3945 && ! use iwl4965; then
+		MODULE_NAMES="iwl3945(net/wireless) iwl4965(net/wireless)"
+	fi
+	echo ${MODULE_NAMES}
+
 	linux-mod_pkg_setup
-	BUILD_PARAMS="-C ${KV_DIR} M=${S} CONFIG_IWL3945=m"
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	if use iwl3945; then
+		BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL3945=m"
+        fi
+        if use iwl4965; then
+		BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL4965=m"
+        fi
+	if ! use iwl3945 && ! use iwl4965; then
+		BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IWL3945=m CONFIG_IWL4965=m"
+	fi
+	echo ${BUILD_PARAMS}
 }
 
 src_unpack() {