diff options
| author |   Jakub Moc <jakub@gentoo.org> | 2007-07-05 19:53:09 +0000 |
|---|---|---|
| committer | Jakub Moc <jakub@gentoo.org> | 2007-07-05 19:53:09 +0000 |
| commit | 3ec988cbf46e655e76c64b492c25c4e0d008c6e3 (patch) | |
| tree | 50047b83cac4eb4b0fd332bc07125f53da87044b /net-wireless | |
| parent | games-fps/uhexen2-cvs: Version bump (and removed old) (diff) | |
| download | sunrise-3ec988cbf46e655e76c64b492c25c4e0d008c6e3.tar.gz sunrise-3ec988cbf46e655e76c64b492c25c4e0d008c6e3.tar.bz2 sunrise-3ec988cbf46e655e76c64b492c25c4e0d008c6e3.zip | |
net-wireless/iwlwifi: Remove kernel_is check and metadata cache breaking dependencies hack from global scope. Do not ever do this again!!!
svn path=/sunrise/; revision=4159
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/iwlwifi/ChangeLog | 4 | ||||
| -rw-r--r-- | net-wireless/iwlwifi/Manifest | 4 | ||||
| -rw-r--r-- | net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/net-wireless/iwlwifi/ChangeLog b/net-wireless/iwlwifi/ChangeLog index da46aee43..e8c0b32a8 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: $ + 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!!! + 05 Jul 2007; Stefan Schweizer <genstef@gentoo.org> -iwlwifi-0.0.34.ebuild, iwlwifi-0.0.34-r1.ebuild: minor fixes, remove old diff --git a/net-wireless/iwlwifi/Manifest b/net-wireless/iwlwifi/Manifest index c68bff656..ed5ae8843 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 1404 RMD160 6e1619678af8baed4f03a61e9e5d6926dfecbff8 SHA1 6b8294a88e0cbe6e1543503289190d22adc45df3 SHA256 5eae1244ce414fe62130607893c91f6424efdd64d0341ab9df0aaf90b13ee2e0 -MISC ChangeLog 1721 RMD160 545e37c96064f8cd5a4ede7b8265c8af63f2d0be SHA1 ba64e7226ec6201ec7aed50273b9e054eaf838f0 SHA256 23e084329eae13a724bfb3ec564e8b22b50e02fd049ba6f6ba10acc4b07fcf84 +EBUILD iwlwifi-0.0.34-r1.ebuild 1408 RMD160 67f7a1d14801a8072dd70a38586035315c5d4784 SHA1 fd92c1eb09bb70c07c8b828fa84b9145f700e5f0 SHA256 f5ccde6264b872406f480fdc1a109707514e0e0ec38a2101b5473180353ba65d +MISC ChangeLog 1913 RMD160 3624972c43878bbe58e3143aa058ce356bf2850c SHA1 4c076b6f18621687ec0db1bc8b249883f2374f4d SHA256 327fc02105aab7194139207a939d19f69350d58623b1cbed623dbcdfcfe6e287 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 67650ad69..5d1314f12 100644 --- a/net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild +++ b/net-wireless/iwlwifi/iwlwifi-0.0.34-r1.ebuild @@ -13,12 +13,7 @@ SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" -if kernel_is lt 2 6 22; then - DEPEND="net-wireless/mac80211" -else - CONFIG_CHECK="MAC80211" -fi - +DEPEND="|| ( >=virtual/linux-sources-2.6.22_rc1 net-wireless/mac80211 )" RDEPEND="net-wireless/iwlwifi-ucode" S="${WORKDIR}/${P}/compatible" @@ -27,16 +22,17 @@ MODULE_NAMES="iwl3945(net/wireless)" BUILD_TARGETS="modules" pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="-C '${KV_DIR}' M='${S}' CONFIG_IWL3945=m" - - if kernel_is lt 2 6 22; then - MY_INCLUDE="/usr/include/mac80211" - MY_HEADERS="MAC80211_INC=/usr/include/mac80211/net/" - else + if kernel_is ge 2 6 22; then + CONFIG_CHECK="MAC80211" MY_INCLUDE="/usr/src/linux/" MY_HEADERS="" + else + MY_INCLUDE="/usr/include/mac80211" + MY_HEADERS="MAC80211_INC=/usr/include/mac80211/net/" fi + + linux-mod_pkg_setup + BUILD_PARAMS="-C '${KV_DIR}' M='${S}' CONFIG_IWL3945=m" } src_unpack() { |