Only build CardBus support if CONFIG_PCI is enabled, bug #110929.

Package-Manager: portage-2.0.51.22-r3

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 738e92631dfba71e2db77132b6472be20739f076..e4ba8e4f2c4804c317973775a71eec89d5d777e6 100644 (file)
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.102 2005/11/08 22:55:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.103 2005/11/15 12:52:24 brix Exp $
+
+  15 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  pcmcia-cs-3.2.8-r2.ebuild:
+  Only build CardBus support if CONFIG_PCI is enabled, bug #110929.
 
   09 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   pcmcia-cs-3.2.8-r2.ebuild:

diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 3164e41a5bb05fe1ab272945f79ca421b7bb4562..ff51bea0ba0d3746b2c99e60c45df125feb05521 100644 (file)
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,20 +1,20 @@
-MD5 041a94f068cf868c61415e8e0dd7175c ChangeLog 20979
+MD5 0bfee4ba21dccf419e0b31c05c27c5f7 pcmcia-cs-3.2.7-r3.ebuild 4953
+MD5 31c8d881e07b845e8e2db2180e80860c pcmcia-cs-3.2.8-r2.ebuild 4052
+MD5 dfbe65ddd83b325405598203171e2eea ChangeLog 21127
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r3 287
 MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-3.2.8-r2 68
-MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
-MD5 4aff8abc0109d71184f648e2cc87eb51 files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch 1402
+MD5 8df7f8fac6931504e84e1c13acfe92e6 files/pcmcia-cs-3.2.8-x11.patch 874
+MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.8-move-pnp-ids.patch 1648
+MD5 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
 MD5 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.8-conf.d 524
-MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
+MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
 MD5 2303a317f3ab3ae698cd51fadaa7d998 files/pcmcia-cs-3.2.8-init.d 2244
-MD5 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
-MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.8-move-pnp-ids.patch 1648
-MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784
+MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
+MD5 fb59203b176eea34b5969d465efb85a9 files/ppc.config.opts 1687
 MD5 8938df25626d18aa4493d26dea7e00eb files/pcmcia-cs-3.2.8-ppc.config.opts 1657
-MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.8-tools-only.patch 1230
-MD5 8df7f8fac6931504e84e1c13acfe92e6 files/pcmcia-cs-3.2.8-x11.patch 874
+MD5 4aff8abc0109d71184f648e2cc87eb51 files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch 1402
 MD5 e4879f03bbdbfbdc094c1f1b6486846b files/pcmcia.conf 549
-MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
-MD5 fb59203b176eea34b5969d465efb85a9 files/ppc.config.opts 1687
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 0bfee4ba21dccf419e0b31c05c27c5f7 pcmcia-cs-3.2.7-r3.ebuild 4953
-MD5 1275790139f43857e15323f7967b9a76 pcmcia-cs-3.2.8-r2.ebuild 3874
+MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
+MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.8-tools-only.patch 1230
+MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784

diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
index ae0b2fed99c6228b40c8f36916732a9e72a6bca1..75f66b89a7f27cb9300de498b12cf7b98f1f0334 100644 (file)
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.6 2005/11/08 22:55:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.7 2005/11/15 12:52:24 brix Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -84,6 +84,14 @@ src_compile() {
                config="${config} --nopnp"
        fi
 
+       if linux_chkconfig_present PCI; then
+               einfo "CardBus support enabled"
+               config="${config} --cardbus"
+       else
+               einfo "CardBus support disabled"
+               config="${config} --nocardbus"
+       fi
+
        # cardctl, cardinfo and xcardinfo are setUID
        append-ldflags -Wl,-z,now