diff options
Diffstat (limited to 'net-wireless/iwlwifi')
| -rw-r--r-- | net-wireless/iwlwifi/ChangeLog | 3 | ||||
| -rw-r--r-- | net-wireless/iwlwifi/Manifest | 4 | ||||
| -rw-r--r-- | net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild | 35 |
3 files changed, 30 insertions, 12 deletions
diff --git a/net-wireless/iwlwifi/ChangeLog b/net-wireless/iwlwifi/ChangeLog index e8c0b32a8..45358440e 100644 --- a/net-wireless/iwlwifi/ChangeLog +++ b/net-wireless/iwlwifi/ChangeLog @@ -3,6 +3,9 @@ # $Header: $ 05 Jul 2007; Jakub Moc <jakub@gentoo.org> iwlwifi-0.0.34-r1.ebuild: + Another attempt on solving the built-it/external MAC80211 mess + + 05 Jul 2007; Jakub Moc <jakub@gentoo.org> iwlwifi-0.0.34-r1.ebuild: Remove kernel_is check and metadata cache breaking dependencies hack from global scope. Do not ever do this again!!! diff --git a/net-wireless/iwlwifi/Manifest b/net-wireless/iwlwifi/Manifest index ed5ae8843..2158513f0 100644 --- a/net-wireless/iwlwifi/Manifest +++ b/net-wireless/iwlwifi/Manifest @@ -1,4 +1,4 @@ DIST iwlwifi-0.0.34.tgz 210172 RMD160 c74e39439a946bc032fc60cbc4e3e441fe106b47 SHA1 3250e93351c845658a231ae1decca6fac25dabd6 SHA256 e459741edfbb544e076b68c0cc9c228f4498a445475d6a9e521cfa62fe06d191 -EBUILD iwlwifi-0.0.34-r1.ebuild 1408 RMD160 67f7a1d14801a8072dd70a38586035315c5d4784 SHA1 fd92c1eb09bb70c07c8b828fa84b9145f700e5f0 SHA256 f5ccde6264b872406f480fdc1a109707514e0e0ec38a2101b5473180353ba65d -MISC ChangeLog 1913 RMD160 3624972c43878bbe58e3143aa058ce356bf2850c SHA1 4c076b6f18621687ec0db1bc8b249883f2374f4d SHA256 327fc02105aab7194139207a939d19f69350d58623b1cbed623dbcdfcfe6e287 +EBUILD iwlwifi-0.0.34-r1.ebuild 2132 RMD160 aad8a9fa7985e0310746e4f997b040f14c67badc SHA1 5a27f5ae88fa6289966f1671402d13b435675c2e SHA256 adfc655d0757fbd1890d1558b3c22ce25af1eab4644d02104a06bce061e62a2d +MISC ChangeLog 2049 RMD160 59aaae03731bd2badc92584772e2e8a8f06d1a02 SHA1 a26c6a6f8e961d8d70dbd0309b9c3b1764c7a202 SHA256 71662d07956c24b9349861f5b1d4c5158dc7b208578767425931b9afe3186077 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild b/net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild index 5d1314f12..aa14c3e5a 100644 --- a/net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild +++ b/net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild @@ -22,13 +22,26 @@ MODULE_NAMES="iwl3945(net/wireless)" BUILD_TARGETS="modules" pkg_setup() { - if kernel_is ge 2 6 22; then - CONFIG_CHECK="MAC80211" - MY_INCLUDE="/usr/src/linux/" - MY_HEADERS="" + if kernel_is ge 2 6 22 ; then + if has_version net-wireless/mac80211 ; then + CONFIG_CHECK="!MAC80211" + ERROR_MAC80211="MAC80211 support already enabled in kernel. Unmerge net-wireless/mac80211 or disable MAC80211 in kernel." + MY_INCLUDE="/usr/include/mac80211" + MY_HEADERS="MAC80211_INC=/usr/include/mac80211/net/" + else + CONFIG_CHECK="MAC80211" + ERROR_MAC80211="MAC80211 support disabled in kernel. Emerge net-wireless/mac80211 or enable MAC80211 in kernel." + MY_INCLUDE="/usr/src/linux/" + MY_HEADERS="" + fi + elif kernel_is lt 2 6 22 ; then + if has_version net-wireless/mac80211 ; then + MY_INCLUDE="/usr/include/mac80211" + MY_HEADERS="MAC80211_INC=/usr/include/mac80211/net/" + fi else - MY_INCLUDE="/usr/include/mac80211" - MY_HEADERS="MAC80211_INC=/usr/include/mac80211/net/" + eerror "This ebuild requires kernel >=2.6.22_rc1." + die "Set your /usr/src/linux symlink accordingly." fi linux-mod_pkg_setup @@ -48,8 +61,10 @@ src_unpack() { pkg_postinst() { linux-mod_pkg_postinst - elog - elog "As for kernel version 2.6.22, iwlwifi uses the in-kernel" - elog "version of mac80211" - elog + if has_version net-wireless/mac80211 && has_version >=virtual/linux-sources-2.6.22_rc1 ; then + elog + elog "As of kernel version 2.6.22, iwlwifi can use the in-kernel" + elog "version of mac80211" + elog + fi } |