Version bump. Fixes bug #28130, bug #60291, bug #61356, bug #67722, bug #69293, bug #72551, bug #78276, bug #86109 and bug #88959.

Package-Manager: portage-2.0.51.20-r4

14 files changed, 527 insertions, 2 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 3b54aa578d52..202809519464 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.81 2005/04/15 14:19:33 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.82 2005/04/25 12:09:18 brix Exp $
+
+*pcmcia-cs-3.2.8 (25 Apr 2005)
+
+  25 Apr 2005; <brix@gentoo.org> +files/pcmcia-cs-3.2.8-conf.d,
+  +files/pcmcia-cs-3.2.8-includes.patch, +files/pcmcia-cs-3.2.8-init.d,
+  +files/pcmcia-cs-3.2.8-ldflags.patch,
+  +files/pcmcia-cs-3.2.8-man-pages.patch,
+  +files/pcmcia-cs-3.2.8-move-pnp-ids.patch, +files/pcmcia-cs-3.2.8-network,
+  +files/pcmcia-cs-3.2.8-ppc.config.opts,
+  +files/pcmcia-cs-3.2.8-tools-only.patch, +files/pcmcia-cs-3.2.8-x11.patch,
+  +pcmcia-cs-3.2.8.ebuild:
+  Version bump. Fixes bug #28130, bug #60291, bug #61356, bug #67722, bug
+  #69293, bug #72551, bug #78276, bug #86109 and bug #88959.
 
   15 Apr 2005; <brix@gentoo.org> -pcmcia-cs-3.2.5.ebuild,
   -pcmcia-cs-3.2.5-r1.ebuild, -pcmcia-cs-3.2.7.ebuild,
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 18b6ed3d7f8c..c0c97167169d 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,16 +1,28 @@
 MD5 cf93b43a7c6f6d4987fbbe331073f39b pcmcia-cs-3.2.5-r2.ebuild 4452
 MD5 bd45772ec06d2e6c5df4922ee1b65d28 pcmcia-cs-3.2.7-r3.ebuild 4900
+MD5 d87c70ad8b997d37c2a32d4f9043f822 pcmcia-cs-3.2.8.ebuild 3450
 MD5 9c24e6836b1acf3a9ed1830e6f5d505a pcmcia-cs-3.2.5-r3.ebuild 5269
-MD5 875edcf974fe8aefe2503ad16fe87f2e ChangeLog 17362
+MD5 5c02c2e388fb4ee0d07e4039330c969e ChangeLog 17971
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 338830e2d0514d080a684e34404424a7 pcmcia-cs-3.2.7-r4.ebuild 4946
 MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5-r2 150
 MD5 157ac5bc22e938e1c2268c1f2610420c files/digest-pcmcia-cs-3.2.5-r3 379
 MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r3 287
 MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r4 287
+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 41828d310f105853882f147692c88e60 files/pcmcia-cs-3.2.8-man-pages.patch 424
+MD5 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
+MD5 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.8-conf.d 524
 MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
+MD5 29a080ad739a275eeb1337526a40e6b4 files/pcmcia-cs-3.2.8-init.d 2216
+MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-3.2.8 68
 MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
 MD5 fb59203b176eea34b5969d465efb85a9 files/ppc.config.opts 1687
+MD5 fb59203b176eea34b5969d465efb85a9 files/pcmcia-cs-3.2.8-ppc.config.opts 1687
 MD5 e4879f03bbdbfbdc094c1f1b6486846b files/pcmcia.conf 549
+MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.8-tools-only.patch 1230
 MD5 ec6d7ed3b83d1af45933e3e8af41796a files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch 1436
+MD5 33d296f61d4e7689c1b9b7e1c09f3bf9 files/pcmcia-cs-3.2.8-includes.patch 594
 MD5 0f50b04b5efd5cad60974dc51c6ce470 files/cardinfo-install-3.2.7.patch 857
+MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8
new file mode 100644
index 000000000000..5cc9da5c0ea4
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.8
@@ -0,0 +1 @@
+MD5 0d6d65be8896eff081aee996049afaa5 pcmcia-cs-3.2.8.tar.gz 1271846
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-conf.d b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-conf.d
new file mode 100644
index 000000000000..8949e090774b
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-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.8-includes.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-includes.patch
new file mode 100644
index 000000000000..c30eabe8aa83
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-includes.patch
@@ -0,0 +1,12 @@
+diff -ur pcmcia-cs-3.2.8/Configure pcmcia-cs-3.2.8-includes/Configure
+--- pcmcia-cs-3.2.8/Configure	2004-07-13 09:33:31.000000000 +0200
++++ pcmcia-cs-3.2.8-includes/Configure	2005-04-13 01:18:55.000000000 +0200
+@@ -853,7 +853,7 @@
+ 
+ if [ "$CONFIG_PCMCIA" = "y" ] ; then
+     # Use our kernel config, then kernel headers, then our headers
+-    CPPFLAGS="-I../include/static -I\$(LINUX)/include -I../include"
++    CPPFLAGS="-I../include/static -I../include -I\$(LINUX)/include"
+ else
+     # Use our kernel config and headers, then kernel headers
+     CPPFLAGS="-I../include -I\$(LINUX)/include"
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d
new file mode 100644
index 000000000000..966dcee8b66d
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d
@@ -0,0 +1,92 @@
+#!/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.8-init.d,v 1.1 2005/04/25 12:09:18 brix Exp $
+
+RUN=/var/run
+SCHEME_FILE=${RUN}/pcmcia-scheme
+
+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.8-ldflags.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ldflags.patch
new file mode 100644
index 000000000000..b29e2a74c981
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ldflags.patch
@@ -0,0 +1,28 @@
+diff -ur pcmcia-cs-3.2.8/cardmgr/Makefile pcmcia-cs-3.2.8-ldflags/cardmgr/Makefile
+--- pcmcia-cs-3.2.8/cardmgr/Makefile	2003-11-22 09:54:13.000000000 +0100
++++ pcmcia-cs-3.2.8-ldflags/cardmgr/Makefile	2005-04-13 01:36:37.000000000 +0200
+@@ -73,21 +73,21 @@
+ 	@mkdir -p .depfiles ; mv $*.d .depfiles
+ 
+ cardinfo: cardinfo.o
+-	$(CC) $< -o $@ $(FLIBS)
++	$(CC) $< -o $@ $(LDFLAGS) $(FLIBS)
+ 
+ xcardinfo.o: xcardinfo.c
+ 	$(CC) $(CFLAGS) -MD $(CPPFLAGS) $(XCPPFLAGS) -c $<
+ 	@mkdir -p .depfiles ; mv $*.d .depfiles
+ 
+ xcardinfo: xcardinfo.o
+-	$(CC) $< -o $@ -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXaw
++	$(CC) $< -o $@ $(LDFLAGS) -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXaw
+ 
+ gpccard.o: gpccard.c
+ 	$(CC) -O -Wall -MD $(CPPFLAGS) $(GTK_CFLAGS) -c $<
+ 	@mkdir -p .depfiles ; mv $*.d .depfiles
+ 
+ gpccard: gpccard.o
+-	$(CC) $< -o $@ $(GTK_LIBS)
++	$(CC) $< -o $@ $(LDFLAGS) $(GTK_LIBS)
+ 
+ install-cardinfo: cardinfo
+ 	@mkdir -p $(PREFIX)/usr/X11R6/bin
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-man-pages.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-man-pages.patch
new file mode 100644
index 000000000000..d4618711daaa
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-man-pages.patch
@@ -0,0 +1,14 @@
+diff -urp pcmcia-cs-3.2.8/man/Makefile pcmcia-cs-3.2.8-man-pages/man/Makefile
+--- pcmcia-cs-3.2.8/man/Makefile	2003-09-15 07:14:41.000000000 +0200
++++ pcmcia-cs-3.2.8-man-pages/man/Makefile	2005-04-25 11:34:56.000000000 +0200
+@@ -33,8 +33,10 @@ ifdef HAS_FORMS
+ endif
+ 
+ install-man4: $(MAN4)
++ifdef CONFIG_PCMCIA
+ 	@mkdir -p $(MANDIR)/man4
+ 	cp *.4 $(MANDIR)/man4
++endif
+ 
+ install-man5: $(MAN5)
+ 	@mkdir -p $(MANDIR)/man5
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-move-pnp-ids.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-move-pnp-ids.patch
new file mode 100644
index 000000000000..2913be2ac090
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-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.8-network b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-network
new file mode 100644
index 000000000000..21453e79c14d
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-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.8-ppc.config.opts b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ppc.config.opts
new file mode 100644
index 000000000000..9c835b7704bc
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ppc.config.opts
@@ -0,0 +1,58 @@
+#
+# 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 0x1000-0x10ff
+#include port 0x1400-0x14ff
+#include memory 0x80000000-0x80ffffff
+
+
+# all other modules should be kernel modules on ppc
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-tools-only.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-tools-only.patch
new file mode 100644
index 000000000000..9419998eec93
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-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.8-x11.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-x11.patch
new file mode 100644
index 000000000000..d996700d841f
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-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.8.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
new file mode 100644
index 000000000000..c01543f354af
--- /dev/null
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
@@ -0,0 +1,141 @@
+# 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.ebuild,v 1.1 2005/04/25 12:09:18 brix Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+DESCRIPTION="PCMCIA tools for Linux"
+HOMEPAGE="http://pcmcia-cs.sourceforge.net"
+SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="gtk gtk2 trusted X xforms"
+DEPEND="virtual/linux-sources
+		>=sys-apps/sed-4"
+RDEPEND="X? ( virtual/x11
+			gtk? ( gtk2? ( =x11-libs/gtk+-2*
+						   dev-util/pkgconfig )
+				    !gtk2? ( =x11-libs/gtk+-1* ))
+			xforms? ( x11-libs/xforms ))"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-includes.patch
+	epatch ${FILESDIR}/${P}-ldflags.patch
+	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
+}
+
+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
+
+	# cardctl, cardinfo and xcardinfo are setUID
+	append-ldflags -Wl,-z,now
+
+	${S}/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}
+
+			if use gtk2; then
+				echo "GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0)" >> ${CONFIG_FILE}
+				echo "GTK_LIBS=$(pkg-config --libs gtk+-2.0)" >> ${CONFIG_FILE}
+			else
+				echo "GTK_CFLAGS=$(gtk-config --cflags)" >> ${CONFIG_FILE}
+				echo "GTK_LIBS=$(gtk-config --libs)" >> ${CONFIG_FILE}
+			fi
+		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
+
+	# Gentoo specific network script
+	exeinto /etc/pcmcia
+	newexe ${FILESDIR}/${P}-network network
+
+	# 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/*
+}
+
+pkg_postinst() {
+	if kernel_is lt 2 5; then
+		einfo
+		einfo "The recommended configuration for linux-2.4.x is to disable"
+		einfo "CONFIG_PCMCIA in the kernel and use the drivers from"
+		einfo "sys-apps/pcmcia-cs-modules."
+		einfo
+	else
+		einfo
+		einfo "The recommended configuration for linux-2.6.x is to use"
+		einfo "the in-kernel PCMCIA drivers."
+		einfo
+	fi
+}