summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/pcmcia-cs')
-rw-r--r--sys-apps/pcmcia-cs/ChangeLog6
-rw-r--r--sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild10
-rw-r--r--sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild10
3 files changed, 11 insertions, 15 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 4c0f55d6cd88..c5c6a530ac34 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/pcmcia-cs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.118 2010/01/10 01:19:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.119 2010/05/26 10:26:37 bangert Exp $
+
+ 26 May 2010; Thilo Bangert <bangert@gentoo.org> pcmcia-cs-3.2.8-r2.ebuild,
+ pcmcia-cs-3.2.9_pre20050614.ebuild:
+ add deprecation notice (#301991, #301228)
10 Jan 2010; Robin H. Johnson <robbat2@gentoo.org>
pcmcia-cs-3.2.8-r2.ebuild, pcmcia-cs-3.2.9_pre20050614.ebuild:
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 60275709c3ea..3ee8e6140dfa 100644
--- 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-2010 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.18 2010/01/10 01:19:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.19 2010/05/26 10:26:37 bangert Exp $
inherit eutils flag-o-matic toolchain-funcs linux-mod
@@ -36,12 +36,8 @@ pkg_setup() {
ewarn "CONFIG_PCMCIA in the kernel and use the drivers from"
ewarn "sys-apps/pcmcia-cs-modules."
ewarn
- elif kernel_is gt 2 4 && ! (linux_chkconfig_present PCMCIA || linux_chkconfig_present PCCARD); then
- eerror
- eerror "The package requires the in-kernel PCMCIA drivers to be enabled"
- eerror "for kernel 2.6.x."
- eerror
- die "linux-${KV_FULL} without PCMCIA support detected"
+ elif kernel_is gt 2 5; then
+ die "Use sys-apps/pcmciautils with 2.6.x kernels"
fi
}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild
index 10f0967426b2..773493f0dcbb 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.9_pre20050614.ebuild,v 1.6 2010/01/10 01:19:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild,v 1.7 2010/05/26 10:26:37 bangert Exp $
inherit eutils toolchain-funcs linux-mod
@@ -41,12 +41,8 @@ pkg_setup() {
ewarn "CONFIG_PCMCIA in the kernel and use the drivers from"
ewarn "sys-apps/pcmcia-cs-modules."
ewarn
- elif kernel_is gt 2 4 && ! (linux_chkconfig_present PCMCIA || linux_chkconfig_present PCCARD); then
- eerror
- eerror "The package requires the in-kernel PCMCIA drivers to be enabled"
- eerror "for kernel 2.6.x."
- eerror
- die "linux-${KV_FULL} without PCMCIA support detected"
+ elif kernel_is gt 2 5; then
+ die "Use sys-apps/pcmciautils with 2.6.x kernels"
fi
}