Add 3.2.9 pre-release. Only contains updates to user-space tools.

Package-Manager: portage-2.0.53

11 files changed, 494 insertions, 2 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 3d697cf0a7cb..b1773db669b6 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.109 2006/01/19 17:38:51 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.110 2006/01/20 18:16:08 brix Exp $
+
+*pcmcia-cs-3.2.9_pre20050614 (20 Jan 2006)
+
+  20 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/pcmcia-cs-3.2.9_pre20050614-conf.d,
+  +files/pcmcia-cs-3.2.9_pre20050614-init.d,
+  +files/pcmcia-cs-3.2.9_pre20050614-move-pnp-ids.patch,
+  +files/pcmcia-cs-3.2.9_pre20050614-network,
+  +files/pcmcia-cs-3.2.9_pre20050614-ppc.config.opts,
+  +files/pcmcia-cs-3.2.9_pre20050614-tools-only.patch,
+  +files/pcmcia-cs-3.2.9_pre20050614-x11.patch,
+  +pcmcia-cs-3.2.9_pre20050614.ebuild:
+  Add 3.2.9 pre-release. Only contains updates to user-space tools.
 
   19 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
   pcmcia-cs-3.2.8-r2.ebuild:
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 558f4ddcd0e3..bf9ecc244a1e 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,5 +1,6 @@
-MD5 3cefb8e660ed2bf31ea5c3f1e7fa0755 ChangeLog 21934
+MD5 6a5bfe6fad0289928b9f17e2bed22515 ChangeLog 22490
 MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-3.2.8-r2 68
+MD5 0f9347f004806b0d20202adf32050265 files/digest-pcmcia-cs-3.2.9_pre20050614 72
 MD5 4aff8abc0109d71184f648e2cc87eb51 files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch 1402
 MD5 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.8-conf.d 524
 MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
@@ -10,5 +11,13 @@ MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784
 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 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.9_pre20050614-conf.d 524
+MD5 f925c348a1288624e28b98aba0c87bef files/pcmcia-cs-3.2.9_pre20050614-init.d 2256
+MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.9_pre20050614-move-pnp-ids.patch 1648
+MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.9_pre20050614-network 784
+MD5 8938df25626d18aa4493d26dea7e00eb files/pcmcia-cs-3.2.9_pre20050614-ppc.config.opts 1657
+MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.9_pre20050614-tools-only.patch 1230
+MD5 8df7f8fac6931504e84e1c13acfe92e6 files/pcmcia-cs-3.2.9_pre20050614-x11.patch 874
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 b7f684fe0ec7d6c297017cad3b7bb0ae pcmcia-cs-3.2.8-r2.ebuild 4071
+MD5 36c82145c523fae6b73973efb63a5319 pcmcia-cs-3.2.9_pre20050614.ebuild 4075
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.9_pre20050614 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.9_pre20050614
new file mode 100644
index 000000000000..371855f08178
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.9_pre20050614
@@ -0,0 +1 @@
+MD5 619ce065e7aef403838ab57d4b0c0403 pcmcia-cs.14-Jun-05.tar.gz 1272805
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-conf.d b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-conf.d
new file mode 100644
index 000000000000..8949e090774b
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-conf.d
@@ -0,0 +1,21 @@
+# Options for the 'cardmgr' daemon
+CARDMGR_OPTS="-f"
+
+# Default PCMCIA scheme
+SCHEME="home"
+
+# If using kernel PCMCIA drivers, PCIC should be "yenta_socket". If
+# using the pcmcia-cs drivers, PCIC should be either "i82365" or
+# "tcic", depending on your hardware.  If using non-modular kernel
+# drivers, set PCIC to ""
+
+PCIC="yenta_socket"
+# Options for the PCIC module
+PCIC_OPTS=""
+
+# Alternative PCIC driver to use if PCIC driver fails
+PCIC_ALT="i82365"
+PCIC_ALT_OPTS=""
+
+# Options for the pcmcia_core module
+CORE_OPTS=""
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-init.d b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-init.d
new file mode 100644
index 000000000000..72a61aa0089d
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-init.d
@@ -0,0 +1,96 @@
+#!/sbin/runscript
+# 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/files/pcmcia-cs-3.2.9_pre20050614-init.d,v 1.1 2006/01/20 18:16:08 brix Exp $
+
+RUN=/var/run
+SCHEME_FILE=${RUN}/pcmcia-scheme
+
+depend() {
+	use coldplug
+}
+
+cleanup() {
+	while read SN CLASS MOD INST DEV EXTRA; do
+		if [[ "${SN}" != "Socket" ]]; then
+			/etc/pcmcia/${CLASS} stop ${DEV} 2> /dev/null
+		fi
+	done
+}
+
+pcmcia_probe() {
+	/sbin/modprobe ${1} ${2} 2> /dev/null
+	return ${?}
+}
+
+start() {
+	local retval
+
+	# Scheme is set for the /etc/pcmcia/shared script
+	if [[ -n "${SCHEME}" ]]; then
+		umask 022
+		echo ${SCHEME} > ${SCHEME_FILE}
+	else
+		umask 022
+		touch ${SCHEME_FILE}
+	fi
+
+	# clean up any old interfaces
+	if [[ -r ${RUN}/stab ]]; then
+		cat ${RUN}/stab | cleanup
+	fi
+
+	# if /var/lib/pcmcia exists (and sometimes it gets created
+	# accidentally if you run pcmcia-cs apps without the proper
+	# flags), then it will really confuse the process
+	if [[ -d /var/lib/pcmcia ]]; then
+		rm -rf /var/lib/pcmcia
+	fi
+
+	if [[ -e /proc/bus/pccard ]]; then
+		einfo "PCMCIA support detected"
+	else
+		pcmcia_probe pcmcia_core ${CORE_OPTS}
+		if [[ -n "${PCIC}" ]]; then
+			if ! pcmcia_probe ${PCIC} ${PCIC_OPTS}; then
+				ewarn "'modprobe ${PCIC}' failed"
+				ewarn "Trying alternative PCIC driver: ${PCIC_ALT}"
+				pcmcia_probe ${PCIC_ALT} ${PCIC_ALT_OPTS}
+			fi
+		fi
+		pcmcia_probe ds
+	fi
+
+	ebegin "Starting pcmcia"
+	start-stop-daemon --start --quiet --exec /sbin/cardmgr -- \
+		-s ${RUN}/stab ${CARDMGR_OPTS}
+	retval=${?}
+
+	if [[ ${retval} -gt 0 ]]; then
+		einfo "cardmgr failed to start.  Make sure that you have PCMCIA"
+		einfo "modules built or support compiled into the kernel"
+	fi
+
+	eend ${retval}
+}
+
+stop() {
+	local retval
+
+	ebegin "Stopping pcmcia"
+
+	[[ -w ${SCHEME_FILE} ]] && rm -f ${SCHEME_FILE}
+	start-stop-daemon --stop --quiet --pidfile /var/run/cardmgr.pid --retry 5
+	retval=${?}
+
+	if [[ -e /proc/modules && -n $(fgrep "ds " /proc/modules | head -n1 | cut -c1) ]]; then
+		/sbin/rmmod ds 2> /dev/null
+		/sbin/rmmod ${PCIC} 2> /dev/null
+		/sbin/rmmod ${PCIC_ALT} 2> /dev/null
+		/sbin/rmmod pcmcia 2> /dev/null
+		/sbin/rmmod pcmcia_core 2> /dev/null
+	fi
+
+	eend ${retval}
+}
+
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-move-pnp-ids.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-move-pnp-ids.patch
new file mode 100644
index 000000000000..2913be2ac090
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-move-pnp-ids.patch
@@ -0,0 +1,40 @@
+diff -urp pcmcia-cs-3.2.8/debug-tools/lspnp.c pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/lspnp.c
+--- pcmcia-cs-3.2.8/debug-tools/lspnp.c	2002-02-13 06:45:01.000000000 +0100
++++ pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/lspnp.c	2005-04-13 00:21:58.000000000 +0200
+@@ -154,7 +154,7 @@ static void load_ids(void)
+     char s[133], *t;
+     int n;
+     struct eisa_id *id;
+-    FILE *f = fopen("/usr/share/pnp.ids", "r");
++    FILE *f = fopen("/usr/share/misc/pnp.ids", "r");
+     
+     if (f == NULL)
+ 	return;
+diff -urp pcmcia-cs-3.2.8/debug-tools/Makefile pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/Makefile
+--- pcmcia-cs-3.2.8/debug-tools/Makefile	2002-12-21 09:23:22.000000000 +0100
++++ pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/Makefile	2005-04-13 00:21:37.000000000 +0200
+@@ -65,8 +65,8 @@ install: $(TOOLS)
+ 	cp -f dump_cis pack_cis $(PREFIX)/sbin
+ ifdef CONFIG_PNP_BIOS
+ 	cp -f lspnp setpnp $(PREFIX)/sbin
+-	@mkdir -p $(PREFIX)/usr/share
+-	cp -f pnp.ids $(PREFIX)/usr/share
++	@mkdir -p $(PREFIX)/usr/share/misc
++	cp -f pnp.ids $(PREFIX)/usr/share/misc
+ endif
+ 
+ include ../rules.mk
+diff -urp pcmcia-cs-3.2.8/man/lspnp.8 pcmcia-cs-3.2.8-move-pnp-ids/man/lspnp.8
+--- pcmcia-cs-3.2.8/man/lspnp.8	2000-06-12 23:24:49.000000000 +0200
++++ pcmcia-cs-3.2.8-move-pnp-ids/man/lspnp.8	2005-04-13 00:22:35.000000000 +0200
+@@ -36,8 +36,8 @@ boot (as opposed to current resource inf
+ .B \-v
+ Selects more verbose output.  Can be used more than once.
+ .SH FILES
+-.TP \w'/usr/share/pnp.ids\ \ \ \ |\|'u
+-/usr/share/pnp.ids
++.TP \w'/usr/share/misc/pnp.ids\ \ \ \ |\|'u
++/usr/share/misc/pnp.ids
+ A database of known Plug and Play device ID's.
+ .TP
+ /proc/bus/pnp/...
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-network b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-network
new file mode 100644
index 000000000000..21453e79c14d
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-network
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if [ -r ./shared ] ; then . ./shared ; else . /etc/pcmcia/shared ; fi
+
+# Get device attributes
+get_info $DEVICE
+HWADDR=`/sbin/ifconfig $DEVICE | sed -ne 's/.*\(..:..:..:..:..:..\).*/\1/p'`
+
+# Load site-specific settings
+ADDRESS="$SCHEME,$SOCKET,$INSTANCE,$HWADDR"
+
+RESOLV=/etc/resolv.conf
+
+# Now, run the specific script for Wireless LAN interfaces
+# Note : we need the wireless parameters to be set up before IP parameters,
+# so that we can perform DHCP over the Wireless link if needed. Jean II
+O_INFO=$INFO ; INFO=
+if [ -x ./wireless ] ; then
+    . ./wireless
+else
+    . /etc/pcmcia/wireless
+fi
+INFO=$O_INFO
+
+
+case "${ACTION}" in
+	"start" | "resume" )
+		/etc/init.d/net.$DEVICE --quiet start
+		;;
+	"stop")
+		/etc/init.d/net.$DEVICE --quiet stop
+		;;
+	"check")
+		;;
+esac
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-ppc.config.opts b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-ppc.config.opts
new file mode 100644
index 000000000000..a89546adb8d2
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-ppc.config.opts
@@ -0,0 +1,57 @@
+#
+# Local PCMCIA Configuration File
+#
+#----------------------------------------------------------------------
+#
+#
+include port 0x1000-0x1fff
+include memory 0x90000000-0x9003ffff
+#
+# As noted in the howto (bug #27753)
+#
+# include port 0x100-0x4ff, port 0x1000-0x17ff
+# include memory 0x80000000-0x80ffffff
+
+
+#Powerbook G4 867
+#http://www.staikos.net/~staikos/tibook/
+#include memory 0xa0003000-0xa0ffffff
+#include port 0x9100-0x9fff
+
+#Powerbook G3
+#http://homepage.mac.com/pauljlucas/personal/powerbook/wireless.html
+#include memory 0x80000000-0x80ffffff
+#include port 0x100-0x1ff
+
+#G4 Powerbook?
+#http://lists.samba.org/archive/linux/2002-April/003044.html
+#include port 0x100-0x4ff, port 0x1000-0x17ff
+#include memory 0xa7000000-0xa7ffffff
+
+#G3 Powerbook Pismo
+#http://pcmcia-cs.sourceforge.net/cgi-bin/HyperNews/get/pcmcia/ports/10/1.html?nogifs
+#include port 0x1000-0x1fff
+#include memory 0x90000000-0x90ffffff
+
+#Powerbook defaults in pcmcia-cs
+#http://pcmcia-cs.sourceforge.net/ftp/doc/PCMCIA-HOWTO-2.html
+#include port 0x100-0x4ff, port 0x1000-0x17ff
+#include memory 0x80000000-0x80ffffff
+
+#Powerbook G3 Wallstreet, Lombard and Pismo
+#http://www.mpifr-bonn.mpg.de/div/iri/Archiv/LinuxPPC/PCMCIA.html
+#include port 0x1000-0x1fff
+#include memory 0x90000000-0x9003ffff
+
+#Powerbook G4 TiBook
+#http://www.yellowdoglinux.com/support/solutions/ydl_general/pcmcia-nic.shtml
+#include memory 0x80000000-0x80ffffff
+#include port 0x100-0x4ff, port 0x1000-0x17ff
+
+#Powerbook G4 AlBook
+#http://lists.debian.org/debian-powerpc/2004/01/msg00248.html
+#include port 0x800-0x8ff
+#include memory 0x80080000-0x80ffffff
+
+
+# all other modules should be kernel modules on ppc
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-tools-only.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-tools-only.patch
new file mode 100644
index 000000000000..9419998eec93
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-tools-only.patch
@@ -0,0 +1,34 @@
+diff -urp pcmcia-cs-3.2.8/Makefile pcmcia-cs-3.2.8-tools-only/Makefile
+--- pcmcia-cs-3.2.8/Makefile	2003-05-16 07:59:44.000000000 +0200
++++ pcmcia-cs-3.2.8-tools-only/Makefile	2005-04-25 11:37:42.000000000 +0200
+@@ -8,9 +8,6 @@ endif
+ 
+ ALL  = modules clients wireless cardmgr flash debug-tools man etc
+ DIRS = cardmgr flash debug-tools man etc
+-ifndef CONFIG_PCMCIA
+-DIRS := modules clients wireless $(DIRS)
+-endif
+ 
+ help:
+ 	@echo "Pick one of the following targets:"
+diff -urp pcmcia-cs-3.2.8/man/Makefile pcmcia-cs-3.2.8-tools-only/man/Makefile
+--- pcmcia-cs-3.2.8/man/Makefile	2003-09-15 07:14:41.000000000 +0200
++++ pcmcia-cs-3.2.8-tools-only/man/Makefile	2005-04-25 11:38:52.000000000 +0200
+@@ -20,7 +20,7 @@ MAN8 = cardmgr.8 cardctl.8 ftl_format.8 
+ 	ifport.8 ifuser.8 ide_info.8 pcinitrd.8 pack_cis.8 dump_cis.8 \
+ 	lspnp.8 setpnp.8 pcic_probe.8
+ 
+-all: $(MAN1_X11) $(MAN4) $(MAN5) $(MAN8)
++all: $(MAN1_X11) $(MAN5) $(MAN8)
+ 
+ dep:
+ 
+@@ -44,7 +44,7 @@ install-man8: $(MAN8)
+ 	@mkdir -p $(MANDIR)/man8
+ 	cp *.8 $(MANDIR)/man8
+ 
+-install: install-man1-x11 install-man4 install-man5 install-man8
++install: install-man1-x11 install-man5 install-man8
+ 
+ man2html: $(MAN1) $(MAN4) $(MAN5) $(MAN8)
+ 	for f in *.[1458] ; do				\
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-x11.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-x11.patch
new file mode 100644
index 000000000000..d996700d841f
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.9_pre20050614-x11.patch
@@ -0,0 +1,24 @@
+diff -urp pcmcia-cs-3.2.8/cardmgr/Makefile pcmcia-cs-3.2.8-x11/cardmgr/Makefile
+--- pcmcia-cs-3.2.8/cardmgr/Makefile	2003-11-22 09:54:13.000000000 +0100
++++ pcmcia-cs-3.2.8-x11/cardmgr/Makefile	2005-04-13 00:38:24.000000000 +0200
+@@ -90,14 +90,14 @@ gpccard: gpccard.o
+ 	$(CC) $< -o $@ $(GTK_LIBS)
+ 
+ install-cardinfo: cardinfo
+-	@mkdir -p $(PREFIX)/usr/X11R6/bin
+-	cp -f cardinfo $(PREFIX)/usr/X11R6/bin
+-	chmod u+s $(PREFIX)/usr/X11R6/bin/cardinfo
++	@mkdir -p $(PREFIX)/usr/bin
++	cp -f cardinfo $(PREFIX)/usr/bin
++	chmod u+s $(PREFIX)/usr/bin/cardinfo
+ 
+ install-xcardinfo: xcardinfo
+-	@mkdir -p $(PREFIX)/usr/X11R6/bin
+-	cp -f xcardinfo $(PREFIX)/usr/X11R6/bin
+-	chmod u+s $(PREFIX)/usr/X11R6/bin/xcardinfo
++	@mkdir -p $(PREFIX)/usr/bin
++	cp -f xcardinfo $(PREFIX)/usr/bin
++	chmod u+s $(PREFIX)/usr/bin/xcardinfo
+ 
+ install-gpccard: gpccard
+ 	@mkdir -p $(PREFIX)/usr/bin
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
new file mode 100644
index 000000000000..56f64f6c3a94
--- /dev/null
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.9_pre20050614.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2006 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.1 2006/01/20 18:16:08 brix Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+MY_P=${PN}.14-Jun-05
+S=${WORKDIR}/${PN}-${PV/_pre*/}
+
+DESCRIPTION="PCMCIA tools for Linux"
+HOMEPAGE="http://pcmcia-cs.sourceforge.net"
+#SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz"
+SRC_URI="http://pcmcia-cs.sourceforge.net/ftp/NEW/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+
+IUSE="gtk vanilla trusted X xforms"
+RDEPEND="!sys-apps/pcmcia-cs-cis
+		!sys-apps/pcmcia-cs-pnptools
+			X? ( || ( ( x11-libs/libX11
+						x11-libs/libXpm
+						x11-libs/libXaw )
+						virtual/x11 )
+				 gtk? ( =x11-libs/gtk+-2*
+				   		 dev-util/pkgconfig )
+				 xforms? ( x11-libs/xforms ) )"
+DEPEND="${RDEPEND}
+		virtual/linux-sources
+		>=sys-apps/sed-4"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 5 && linux_chkconfig_present PCMCIA; then
+		ewarn
+		ewarn "The recommended configuration for linux-2.4.x is to disable"
+		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"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-move-pnp-ids.patch
+	epatch ${FILESDIR}/${P}-x11.patch
+	epatch ${FILESDIR}/${P}-tools-only.patch
+
+	sed -i -e 's:usr/man:usr/share/man:g' ${S}/Configure
+}
+
+pcmcia_cs_configure() {
+	# output arguments to Configure to assist in debugging
+	echo "${S}/Configure $@"
+	${S}/Configure "$@" || die "Configure failed"
+	return ${?}
+}
+
+src_compile() {
+	local config CONFIG_FILE
+
+	if use trusted; then
+		ewarn "Unsafe user-space tools enabled"
+		config="${config} --trust"
+	else
+		einfo "Unsafe user-space tools disabled"
+		config="${config} --notrust"
+	fi
+
+	if linux_chkconfig_present PNP; then
+		einfo "Plug and Play support enabled"
+		config="${config} --pnp"
+	else
+		einfo "Plug and Play support disabled"
+		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 $(bindnow-flags)
+
+	pcmcia_cs_configure \
+		--noprompt \
+		--kernel=${KV_DIR} \
+		--target=${D} \
+		--arch=$(tc-arch-kernel) \
+		--ucc=$(tc-getCC) \
+		--kcc=$(tc-getCC) \
+		--ld=$(tc-getLD) \
+		--uflags="${CFLAGS}" \
+		--kflags="$(getfilevar HOSTCFLAGS ${KV_DIR}/Makefile)" \
+		--srctree \
+		--nox11 \
+		${config} \
+		|| die "Configure failed"
+
+	# config file to be altered
+	CONFIG_FILE="${S}/config.mk"
+
+	if use X; then
+		echo "HAS_XAW=y" >> ${CONFIG_FILE}
+
+		if use gtk; then
+			echo "HAS_GTK=y" >> ${CONFIG_FILE}
+			echo "GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0)" >> ${CONFIG_FILE}
+			echo "GTK_LIBS=$(pkg-config --libs gtk+-2.0)" >> ${CONFIG_FILE}
+		fi
+
+		if use xforms; then
+			echo "FLIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lforms -lX11 -lm -lXpm" >> ${CONFIG_FILE}
+			echo "HAS_FORMS=y" >> ${CONFIG_FILE}
+		fi
+	fi
+
+	emake all || die "emake all failed"
+}
+
+src_install () {
+	emake install || die "emake install failed"
+
+	# Gentoo specific rc-scripts
+	rm -rf ${D}/etc/rc*.d
+	newconfd ${FILESDIR}/${P}-conf.d pcmcia
+	newinitd ${FILESDIR}/${P}-init.d pcmcia
+
+	if ! use vanilla; then
+		# Gentoo specific network script
+		exeinto /etc/pcmcia
+		newexe ${FILESDIR}/${P}-network network
+	fi
+
+	# remove bogus modules.conf file
+	rm -f ${D}/etc/modules.conf
+
+	# remove empty directory structure
+	rm -rf ${D}/var
+
+	if [[ "${ARCH}" = "ppc" ]]; then
+		insinto /etc/pcmcia
+		newins ${FILESDIR}/${P}-ppc.config.opts config.opts
+	fi
+
+	dodoc BUGS CHANGES MAINTAINERS README README-2.4 \
+		SUPPORTED.CARDS doc/*
+}