net-wireless/mac80211: Bail out on kernels which have MAC80211 already built-in

svn path=/sunrise/; revision=4161

diff --git a/net-wireless/mac80211/ChangeLog b/net-wireless/mac80211/ChangeLog
index e0f7fa4d0683361d258f7594975b1df86a919527..dc6fd20e0135dc6525bb4909f29d50db90efe465 100644 (file)
--- a/net-wireless/mac80211/ChangeLog
+++ b/net-wireless/mac80211/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jul 2007; Jakub Moc <jakub@gentoo.org> mac80211-8.0.1.ebuild:
+  Bail out on kernels which have MAC80211 already built-in
+
   10 Jun 2007; Stefan Schweizer <genstef@gentoo.org>
   -files/digest-mac80211-8.0.1:
   remove filesdir and superfluous digest

diff --git a/net-wireless/mac80211/Manifest b/net-wireless/mac80211/Manifest
index cd45b0d07750103278350753c54e97bb16e5e8bc..8c516fb558133265f01d7ea9694abcae5231da88 100644 (file)
--- a/net-wireless/mac80211/Manifest
+++ b/net-wireless/mac80211/Manifest
@@ -1,4 +1,4 @@
 DIST mac80211-8.0.1.tgz 185791 RMD160 3c4d13a9933b3b1a9da8b1ed19bf542cd6561d22 SHA1 28d4af62e918e976a7af41ad32f7e18309215edf SHA256 42e745d514524213992720cd21d685ee9d74c20bfad3d3877c280181156c51d2
-EBUILD mac80211-8.0.1.ebuild 1307 RMD160 5caf75f2549c3a20bbabcc0079a636fd6fab7611 SHA1 a74bce9012466f288fa03c72e40875f9f66e4768 SHA256 9690c294a15478c5a26370f551aefee30aa921efafd47c966224fa1381560903
-MISC ChangeLog 1344 RMD160 d17a958221cf5a9b128bdf66d689156615a0f893 SHA1 a08d4020bd50057f01482c32fcddb7af420fad25 SHA256 6ea8d22fe84115dce5463108540ffa5706d90a7bd4078351f8d25e7ed90a26e4
+EBUILD mac80211-8.0.1.ebuild 1478 RMD160 ba72f2736242f231e4b73ab753eacb741b9fb973 SHA1 853d6ceb278479b54099a87d51f164d74aae93b9 SHA256 f039d6a6ee0439d5ed53807adddfc7e34dcbcdc95bedc3e7129aaa83ed2574d9
+MISC ChangeLog 1471 RMD160 282f116086f8e99793a5a12f11cf0b9f1167c1e2 SHA1 3430a9c6ef01ce7fdacc9722c3c50d5eed06e95d SHA256 c2c06a38de2027cda3f50cd026460f2024a0d924d1e129ed79e2c6a94b45134a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-wireless/mac80211/mac80211-8.0.1.ebuild b/net-wireless/mac80211/mac80211-8.0.1.ebuild
index 48251756a699362a9152e973baa0cdcbde503a80..30820cf00ace740a4225c57c2257685cedd2f415 100644 (file)
--- a/net-wireless/mac80211/mac80211-8.0.1.ebuild
+++ b/net-wireless/mac80211/mac80211-8.0.1.ebuild
@@ -26,6 +26,11 @@ BUILD_TARGETS="modules"
 CONFIG_CHECK="NET_SCHED WIRELESS_EXT LEDS_TRIGGERS"
 
 pkg_setup() {
+       if kernel_is ge 2 6 22 ; then
+               CONFIG_CHECK="${CONFIG_CHECK} !MAC80211"
+               ERROR_MAC80211="MAC80211 support already enabled in kernel. You do not need this ebuild."
+       fi
+
        linux-mod_pkg_setup
        BUILD_PARAMS="CONFIG_MAC80211_LEDS=y CONFIG_MAC80211=m CONFIG_CFG80211=m
                -C ${KV_DIR} M=\${PWD}"