cleanup

21 files changed, 8 insertions, 1629 deletions

diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 4a372ba47ee8..93a3c60580b9 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,35 +1,15 @@
-MD5 41bbb5b4921c05f4476903cf977ed184 pcmcia-cs-3.2.4.ebuild 4029
-MD5 2e27752157c688260591d1932da0797e pcmcia-cs-3.1.34-r8.ebuild 4136
-MD5 d35bd47deb54e2d35ac4f3ca43690a6e pcmcia-cs-3.2.3-r1.ebuild 4709
-MD5 362a997b2f6e77a55b39056bed46d92b pcmcia-cs-3.2.1.ebuild 4079
-MD5 01ac1d06326d1b3a783644fe8533effe pcmcia-cs-3.2.1-r2.ebuild 4545
-MD5 aae4ddfbddc6942af41c0027952f779b pcmcia-cs-3.2.3.ebuild 3902
-MD5 8fa881eb68d0863794b346cd466d84a1 pcmcia-cs-3.2.1-r4.ebuild 4638
-MD5 d5a9c74e9663903d54d40130cecdaf47 pcmcia-cs-3.2.5.ebuild 4399
-MD5 09778e65d2d7dfd817b20bd91185f939 pcmcia-cs-3.2.0.ebuild 4079
-MD5 a13380cbcf7e44cb62da8d02f6d5e6b1 pcmcia-cs-3.2.1-r1.ebuild 4359
-MD5 946bc338bd45c58f05c757b733549147 pcmcia-cs-3.2.3-r2.ebuild 4626
 MD5 748d65235ebcef0c5fe3505d8410c8a9 ChangeLog 11660
-MD5 65f0eb65d75bd69dd0d0f4590ffb6ff0 pcmcia-cs-3.2.2.ebuild 4542
-MD5 79a4a1c7df41ec21b7b068729bf1ddac pcmcia-cs-3.2.1-r3.ebuild 4485
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1-r1 132
-MD5 d6511afd8683d5f7bfd4a3f4b5d92fa0 files/digest-pcmcia-cs-3.2.1-r2 210
-MD5 f83cae6f8b822bdde4ed6e0018b222f4 files/digest-pcmcia-cs-3.2.1-r3 200
-MD5 be9bc60b3b2c6dee9e06cff4ba860255 files/digest-pcmcia-cs-3.2.1-r4 202
-MD5 cab820e565fbda87760dbb0aa7ed968e files/digest-pcmcia-cs-3.2.3-r1 264
-MD5 961919138ced08c289989b20bdc22038 files/digest-pcmcia-cs-3.2.3-r2 202
-MD5 398d67e8e892182884b962c8ff2fca2e files/pcmcia.rc 1795
-MD5 645c48ec1ab21e1ff5abd7c3da0e6c49 files/digest-pcmcia-cs-3.2.0 132
-MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1 132
-MD5 ad2ff65ddeee3b4191866e70ddc75005 files/digest-pcmcia-cs-3.2.2 210
-MD5 166988c95effd8177790227bd751ccf5 files/digest-pcmcia-cs-3.2.3 132
+MD5 2e27752157c688260591d1932da0797e pcmcia-cs-3.1.34-r8.ebuild 4136
+MD5 41bbb5b4921c05f4476903cf977ed184 pcmcia-cs-3.2.4.ebuild 4029
+MD5 d5a9c74e9663903d54d40130cecdaf47 pcmcia-cs-3.2.5.ebuild 4399
+MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
 MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652
 MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
-MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
 MD5 8621a69779c0a084e6092f495ac08cde files/gentoo-pcmcia-cs-3.1.34.patch 589
+MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
 MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
-MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
+MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
 MD5 83977336aa2077a799ca633a6504aabd files/pcmcia.conf 363
-MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
-MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
+MD5 398d67e8e892182884b962c8ff2fca2e files/pcmcia.rc 1795
+MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.0 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.0
deleted file mode 100644
index 6d103c93c7b2..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 570b64017c377a3e84b0c61fa432f10a pcmcia-cs-3.2.0.tar.gz 1248100
-MD5 c2e545a8358edcd0ecec1be1685fac71 orinoco-0.12b.tar.gz 62958
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1
deleted file mode 100644
index 87ed8bc0fbf2..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 c2e545a8358edcd0ecec1be1685fac71 orinoco-0.12b.tar.gz 62958
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r1 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r1
deleted file mode 100644
index 87ed8bc0fbf2..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 c2e545a8358edcd0ecec1be1685fac71 orinoco-0.12b.tar.gz 62958
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r2 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r2
deleted file mode 100644
index 32c49c3edcc1..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 984c592992ca4db86ae510444711aba5 pcmcia-cs-3.2.1-orinoco-patch.diff 24897
-MD5 c2e545a8358edcd0ecec1be1685fac71 orinoco-0.12b.tar.gz 62958
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r3 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r3
deleted file mode 100644
index 77069badb763..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 d6e2c158abb585d31f70a6e1aa0d8d21 orinoco-0.11b-patch.diff 24511
-MD5 a60b5e7742d50ba83e4399f577a6c094 orinoco-0.11b.tar.gz 61923
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r4 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r4
deleted file mode 100644
index a7f5d9639ae2..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.1-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
-MD5 f880ed8e941655bd3da5c533668f4349 orinoco-0.13b-patched.diff 24386
-MD5 0ac2c1e31670e5dbce50133f9eacdb95 orinoco-0.13b.tar.gz 64068
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.2 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.2
deleted file mode 100644
index 5e8324ede75a..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 47d46e58a57ccbcaf61ed0549b2b8ed4 pcmcia-cs-3.2.2.tar.gz 1254958
-MD5 984c592992ca4db86ae510444711aba5 pcmcia-cs-3.2.1-orinoco-patch.diff 24897
-MD5 e7dbdef7e17448e51fded6a24dffbfe1 orinoco-0.13a.tar.gz 63089
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3
deleted file mode 100644
index 62abe4e41c82..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
-MD5 e7dbdef7e17448e51fded6a24dffbfe1 orinoco-0.13a.tar.gz 63089
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3-r1 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3-r1
deleted file mode 100644
index 8b577a95625e..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
-MD5 d6e2c158abb585d31f70a6e1aa0d8d21 orinoco-0.11b-patch.diff 24511
-MD5 a60b5e7742d50ba83e4399f577a6c094 orinoco-0.11b.tar.gz 61923
-MD5 e7dbdef7e17448e51fded6a24dffbfe1 orinoco-0.13a.tar.gz 63089
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3-r2 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3-r2
deleted file mode 100644
index 41287062e38b..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 581749071efdfc8056ed05f0373d5b79 pcmcia-cs-3.2.3.tar.gz 1255022
-MD5 f880ed8e941655bd3da5c533668f4349 orinoco-0.13b-patched.diff 24386
-MD5 0ac2c1e31670e5dbce50133f9eacdb95 orinoco-0.13b.tar.gz 64068
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild
deleted file mode 100644
index ea0a7a54eb26..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.0.ebuild,v 1.6 2003/09/07 00:42:02 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.12b.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-	unpack orinoco-0.12b.tar.gz
-	cd ${S}
-	mv ../orinoco-0.12b/hermes*.{c,h} \
-		../orinoco-0.12b/orinoco*.{c,h} \
-		../orinoco-0.12b/ieee802_11.h wireless/
-
-	fi
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild
deleted file mode 100644
index 9cae056633d4..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r1.ebuild,v 1.6 2003/09/07 00:42:03 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.12b.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-	unpack orinoco-0.12b.tar.gz
-	cd ${S}
-	mv ../orinoco-0.12b/hermes*.{c,h} \
-		../orinoco-0.12b/orinoco*.{c,h} \
-		../orinoco-0.12b/ieee802_11.h wireless/
-
-	fi
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild
deleted file mode 100644
index bff93e526fcb..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r2.ebuild,v 1.6 2003/09/07 00:42:03 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://airsnort.shmoo.com/pcmcia-cs-3.2.1-orinoco-patch.diff
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.12b.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# apply the patch for airsnort
-	ln -s ${P} ${P}-patched
-	pushd ${P}
-	patch -p0 < ${DISTDIR}/${P}-orinoco-patch.diff
-	popd
-
-	if [ -z "`use wavelan`" ] ; then
-
-	unpack orinoco-0.12b.tar.gz
-	cd ${S}
-	mv ../orinoco-0.12b/hermes*.{c,h} \
-		../orinoco-0.12b/orinoco*.{c,h} \
-		../orinoco-0.12b/ieee802_11.h wireless/
-
-	fi
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild
deleted file mode 100644
index 441360a4ce47..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r3.ebuild,v 1.4 2003/09/07 00:42:03 msterret Exp $
-
-NOCO_VERSION="0.11b"
-
-S=${WORKDIR}/${P}
-OV="orinoco-${NOCO_VERSION}"
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://airsnort.shmoo.com/${OV}-patch.diff
-	http://ozlabs.org/people/dgibson/dldwd/${OV}.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-		unpack ${OV}.tar.gz
-		cd ${WORKDIR}/${OV}
-		patch -p1 < ${DISTDIR}/${OV}-patch.diff
-
-		cd ${S}
-		mv ../${OV}/hermes*.{c,h} \
-			../${OV}/orinoco*.{c,h} \
-			../${OV}/ieee802_11.h wireless/
-	fi
-
-
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild
deleted file mode 100644
index b5299580f6ce..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1-r4.ebuild,v 1.8 2003/09/07 00:42:03 msterret Exp $
-
-NOCO_VERSION="0.13b"
-
-S=${WORKDIR}/${P}
-OV="orinoco-${NOCO_VERSION}"
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	!wavelan? ( http://airsnort.shmoo.com/${OV}-patched.diff )
-	!wavelan? ( http://ozlabs.org/people/dgibson/dldwd/${OV}.tar.gz )"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-		unpack ${OV}.tar.gz
-		cd ${WORKDIR}/${OV}
-		patch -p1 < ${DISTDIR}/${OV}-patched.diff
-
-		cd ${S}
-		/bin/chmod ug+w ${S}/wireless/*
-		mv -f ../${OV}/hermes*.{c,h} \
-			../${OV}/orinoco*.{c,h} \
-			../${OV}/ieee802_11.h wireless/
-	fi
-
-
-
-	cd ${S}
-	mv Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	chmod ug+x Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	mv etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-	if [ -n "`use build`" ] ; then
-		myconf="$myconf --force"
-	fi
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild
deleted file mode 100644
index 6e369cc2173b..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.1.ebuild,v 1.6 2003/09/07 00:42:03 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.12b.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-	unpack orinoco-0.12b.tar.gz
-	cd ${S}
-	mv ../orinoco-0.12b/hermes*.{c,h} \
-		../orinoco-0.12b/orinoco*.{c,h} \
-		../orinoco-0.12b/ieee802_11.h wireless/
-
-	fi
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild
deleted file mode 100644
index 4bd3c74e7e0f..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.2.ebuild,v 1.5 2003/09/07 00:42:03 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://airsnort.shmoo.com/pcmcia-cs-3.2.1-orinoco-patch.diff
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13a.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# apply the patch for airsnort
-	ln -s ${P} ${P}-patched
-	pushd ${P}
-	patch -p0 < ${DISTDIR}/${P}-orinoco-patch.diff
-	popd
-
-	if [ -z "`use wavelan`" ] ; then
-
-	unpack orinoco-0.13a.tar.gz
-	cd ${S}
-	mv ../orinoco-0.13a/hermes*.{c,h} \
-		../orinoco-0.13a/orinoco*.{c,h} \
-		../orinoco-0.13a/ieee802_11.h wireless/
-
-	fi
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild
deleted file mode 100644
index b3a0e427bec8..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r1.ebuild,v 1.4 2003/09/07 00:42:03 msterret Exp $
-
-# Hack for monitor patch
-OLD_NOCO_VERSION="0.11b"
-NEW_NOCO_VERSION="0.13a"
-
-S=${WORKDIR}/${P}
-OOV="orinoco-${OLD_NOCO_VERSION}"
-NOV="orinoco-${NEW_NOCO_VERSION}"
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://airsnort.shmoo.com/${OOV}-patch.diff
-	http://ozlabs.org/people/dgibson/dldwd/${OOV}.tar.gz
-	http://ozlabs.org/people/dgibson/dldwd/${NOV}.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-		if use monitor ; then
-			unpack ${OOV}.tar.gz
-			cd ${WORKDIR}/${OOV}
-			patch -p1 < ${DISTDIR}/${OOV}-patch.diff
-		else
-			unpack ${NOV}.tar.gz
-		fi
-
-		cd ${S}
-		mv ../orinoco*/hermes*.{c,h} \
-			../orinoco*/orinoco*.{c,h} \
-			../orinoco*/ieee802_11.h wireless/
-	fi
-
-
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	cp etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild
deleted file mode 100644
index 43dfae09e004..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3-r2.ebuild,v 1.6 2003/09/07 00:42:03 msterret Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-OV="orinoco-0.13b"
-
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://airsnort.shmoo.com/${OV}-patched.diff
-	http://ozlabs.org/people/dgibson/dldwd/${OV}.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-IUSE="trusted build apm pnp nocardbus wavelan"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if [ -z "`use wavelan`" ] ; then
-
-		unpack ${OV}.tar.gz
-		cd ${WORKDIR}/${OV}
-		epatch ${DISTDIR}/${OV}-patched.diff
-		#patch -p1 < ${DISTDIR}/${OV}-patched.diff
-
-		cd ${S}
-		/bin/chmod ug+w ${S}/wireless/*
-		mv ../orinoco*/hermes*.{c,h} \
-			../orinoco*/orinoco*.{c,h} \
-			../orinoco*/ieee802_11.h wireless/
-	fi
-
-
-
-	cd ${S}
-	mv Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	chmod ug+x Configure
-	#man pages will now install into /usr/share/man
-
-	cd ${S}
-	### As per the SourceForge web site reqs and bug #3400
-	# We'll replace all ide_cs with ide-cs
-	mv etc/config etc/config.orig
-	sed -e 's:ide_cs:ide-cs:g' etc/config.orig > etc/config
-	rm -f etc/config.orig
-
-
-}
-
-src_compile() {
-	local myconf
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
-	else
-		myconf="--notrust"
-	fi
-
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
-	else
-		myconf="$myconf --noapm"
-	fi
-
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
-	else
-		myconf="$myconf --nopnp"
-	fi
-
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
-	else
-		myconf="$myconf --cardbus"
-	fi
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are nstalled, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-	einfo ""
-	einfo "If you *don't* want to use Orinoco drivers or if they don't work for you, add +wavelan to USE"
-}
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild
deleted file mode 100644
index 080ed904c46b..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.3.ebuild,v 1.4 2003/06/21 21:19:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-	http://ozlabs.org/people/dgibson/dldwd/orinoco-0.13a.tar.gz"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-DEPEND="sys-kernel/linux-headers"
-RDEPEND=""
-SLOT="0"
-IUSE="trusted apm pnp nocardbus build"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
-
-# Note: To use this ebuild, you should have the usr/src/linux symlink to
-# the kernel directory that pcmcia-cs should use for configuration.
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	unpack orinoco-0.13a.tar.gz
-	mv orinoco-0.13a/hermes*.{c,h} \
-	   orinoco-0.13a/orinoco*.{c,h} \
-	   orinoco-0.13a/ieee802_11.h \
-	   ${P}/wireless/
-
-	cd ${S}
-	cp Configure Configure.orig
-	sed -e 's:usr/man:usr/share/man:g' Configure.orig > Configure
-	#man pages will now install into /usr/share/man
-}
-
-src_compile() {
-	local myconf
-	use trusted && myconf="--trust" || myconf="--notrust"
-	use apm && myconf="$myconf --apm" || myconf="$myconf --noapm"
-	use pnp && myconf="$myconf --pnp" || myconf="$myconf --nopnp"
-	use nocardbus &&  myconf="$myconf --nocardbus" || myconf="$myconf --cardbus"
-
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=/usr/src/linux \
-		--arch="${MY_ARCH}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-	$myconf || die "failed configuring"
-	# nopnp and noapm are important, because without them the pcmcia-cs
-	# tools will require a kernel with ISA PnP and/or APM support,
-	# which cannot be guaranteed.  We need to make sure the tools
-	# work *all* the time, not just some of the time.
-
-	# The --srctree option tells pcmcia-cs to configure for the kernel in /usr/src/linux
-	# rather than the currently-running kernel.  It's Gentoo Linux policy to configure for
-	# the kernel in /usr/src/linux
-
-	sed -e "/^HAS_FORMS/d" config.out > config.out.sed
-	sed -e "/^HAS_FORMS/d" config.mk > config.mk.sed
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.out.sed > config.out
-	sed -e "s/^FLIBS=\".*\"/FLIBS=\"\"/" config.mk.sed > config.mk
-	rm -f config.out.sed
-	rm -f config.mk.sed
-
-	emake all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
-	# remove X
-	# this is simply much easier than patching configure or the makefiles
-	# not to build them in the first place
-	rm -rf usr/X11R6
-	# todo: if they are installed, move them to /usr
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/pcmcia.conf pcmcia
-
-	exeinto /etc/pcmcia
-	doexe ${FILESDIR}/network
-
-	# install our own init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	else
-		rm -rf ${D}/usr/share/man
-	fi
-	rm -f ${D}/etc/modules.conf
-	rm -rf ${D}/var/lib/pcmcia
-
-	# if on ppc set the ppc revised config.opts
-	if [ ${ARCH} = "ppc" ] ; then
-		insinto /etc/pcmcia
-		newins ${FILESDIR}/ppc.config.opts config.opts
-	fi
-}
-
-pkg_postinst() {
-	einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the PCMCIA support in the kernel."
-	einfo "(Otherwise, you might experience CardServices version mismatch errors)"
-	einfo ""
-	einfo "Proper kernel config for this package is that PCMCIA/CardBus under General Setup is off and"
-	einfo "Wireless LAN (non-ham radio) is on but no modules or drivers turned on under Network Device Support"
-	einfo "if you have wireless."
-}