add deprecation notice (#301991, #301228)

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 14 insertions, 18 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/Manifest b/sys-apps/pcmcia-cs/Manifest
index 6f8833a0a302..40b030240109 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -17,7 +17,7 @@ AUX pcmcia-cs-3.2.9_pre20050614-tools-only.patch 1230 RMD160 accf35a2c2859480f0e
 AUX pcmcia-cs-3.2.9_pre20050614-x11.patch 874 RMD160 ac4f74c8c230d875ed6cf7e8e1385d1db4d7cbc2 SHA1 4c738cf3f199ace4e7ba6f7d66df433dea191512 SHA256 e3870edc464a2e5f6a932353f38e84b5c97a083654a5d1e804dc1196a93381c0
 DIST pcmcia-cs-3.2.8.tar.gz 1271846 RMD160 e4511524852f86f002164227f39d1415861a7860 SHA1 38ce295c2a6baed05d792141f60a01fe6770350e SHA256 ef93921e8555862df4c24b1c357430ff3d5ba1d3b6b7e324862ea37b511270c0
 DIST pcmcia-cs.14-Jun-05.tar.gz 1272805 RMD160 11414eb21087fe19cb05cc7ba6cd0ec7c06abe2f SHA1 7582fb2a0b48f8a908406a540386c63f21196009 SHA256 a3ee1032cc4a6a1586327462296a8744f25595e57df6e4dca0710380ff0e27ab
-EBUILD pcmcia-cs-3.2.8-r2.ebuild 3938 RMD160 6b269476d1920ba4fd6d6364d89b07a77ac767ac SHA1 7fdb40c1247d4bc09211dd5543f2783bf2165e75 SHA256 9543cbc12b9418fca30cb1cbf3f947b025f5c914aadeb4f72928cf66e51580b1
-EBUILD pcmcia-cs-3.2.9_pre20050614.ebuild 3963 RMD160 d49311278de640590ba24e47a4543442ccd5e44b SHA1 16a75a28369bc2de4f572e37a0451578a592c4ac SHA256 ec84005220f5dc8024003212c81eea2d1a3d8396ae17e66e29f215c5ae239ae0
-MISC ChangeLog 23635 RMD160 1b5b3b98009d1ab7b98e1cc790c5c228c2a7f9e6 SHA1 cf46faba64bd69bb1136c45ac29f8f339e24b0c6 SHA256 2e6df045a97b16e0b85bf7a7265dd86ba93a1d3cfdb9b1c8f9b4bff4894e5311
+EBUILD pcmcia-cs-3.2.8-r2.ebuild 3739 RMD160 eacbb9b48def13335b8bbadbad955252de4fe140 SHA1 fccdc90cab1f30f19943ab15a0e00b3a7a178e7e SHA256 9806f971602bb64b85a1295b689e6c9f62589257296bd798eb528e9fa62c2f6d
+EBUILD pcmcia-cs-3.2.9_pre20050614.ebuild 3764 RMD160 31a4072e1ddd851c5d50676c2c1389f761d4b3cf SHA1 f8bffcf1c2b928bef1f7bcc3c9a114a5b2108bcc SHA256 df2e5a09d767e0a1d95387d9a35bfd63f0f60af63b94d3f8c9a3469c39085c00
+MISC ChangeLog 23795 RMD160 3ccc5cb0c9afb6ad738bd4f215438ba5757e3d6b SHA1 f88b9578aacf4a9ef04df7653c282ea1f5ec22a2 SHA256 45918224245d9dcfc496320736d06d53610fcb5505237bb281101a2bb9282179
 MISC metadata.xml 341 RMD160 64561fbe666b41ddffeeb33131326958580b12ad SHA1 1cec8d7a1bdafee158ebcd50ea328dfb8c925fd1 SHA256 981a713f16972b297ca983018fcbfcd26b7ad52d895d51340bc15eb1034f604d
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
 }