Removed old version.

Package-Manager: portage-2.0.51.22-r3

8 files changed, 15 insertions, 397 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 8b864e5d86e8..32061bf28b3f 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2005/11/28 11:58:23 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.105 2005/12/03 20:54:18 brix Exp $
+
+  03 Dec 2005; Henrik Brix Andersen <brix@gentoo.org> -files/network,
+  -files/pcmcia.conf, -files/pcmcia.rc, -files/ppc.config.opts,
+  -pcmcia-cs-3.2.7-r3.ebuild:
+  Removed old version.
 
   28 Nov 2005; Malcolm Lashley <malc@gentoo.org> pcmcia-cs-3.2.8-r2.ebuild:
   Stable on amd64 - per request from brix
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index d51f8a9ddea2..4f7169323db7 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,20 +1,14 @@
-MD5 874e1cb1dd9fd638f44407a3597375ad ChangeLog 21246
-MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r3 287
+MD5 623ea9617ed484219f354ffd471c1d55 pcmcia-cs-3.2.8-r2.ebuild 4051
+MD5 37f035c748956940e24570403bde6fc6 ChangeLog 21434
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-3.2.8-r2 68
-MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
-MD5 4aff8abc0109d71184f648e2cc87eb51 files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch 1402
+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 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
 MD5 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.8-conf.d 524
-MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
 MD5 2303a317f3ab3ae698cd51fadaa7d998 files/pcmcia-cs-3.2.8-init.d 2244
-MD5 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
-MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.8-move-pnp-ids.patch 1648
-MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784
 MD5 8938df25626d18aa4493d26dea7e00eb files/pcmcia-cs-3.2.8-ppc.config.opts 1657
+MD5 4aff8abc0109d71184f648e2cc87eb51 files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch 1402
+MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
 MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.8-tools-only.patch 1230
-MD5 8df7f8fac6931504e84e1c13acfe92e6 files/pcmcia-cs-3.2.8-x11.patch 874
-MD5 e4879f03bbdbfbdc094c1f1b6486846b files/pcmcia.conf 549
-MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
-MD5 fb59203b176eea34b5969d465efb85a9 files/ppc.config.opts 1687
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 0bfee4ba21dccf419e0b31c05c27c5f7 pcmcia-cs-3.2.7-r3.ebuild 4953
-MD5 623ea9617ed484219f354ffd471c1d55 pcmcia-cs-3.2.8-r2.ebuild 4051
+MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r3 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r3
deleted file mode 100644
index c3aa9a6290bf..000000000000
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 e8498bdbe8ec2dde41fbddcf65cd900a pcmcia-cs-3.2.7.tar.gz 1273963
-MD5 5d3bd937044d982271522b055a04ddc6 pcmcia-cs-3.2.7-module-init-tools.diff.gz 463
-MD5 92e42d6e70fce9f0c4d5e2c5b7d47279 pcmcia-cs-3.2.5-ppc-fix.diff.gz 323
-MD5 2ddaa8ff53be492b4cd3ef4483f7cf1b monitor-0.13e.patch 22530
diff --git a/sys-apps/pcmcia-cs/files/network b/sys-apps/pcmcia-cs/files/network
deleted file mode 100644
index 4cb4ceef1f28..000000000000
--- a/sys-apps/pcmcia-cs/files/network
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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 start
-		;;
-	"stop")
-		/etc/init.d/net.$DEVICE stop
-		;;
-	"check")
-		;;
-esac
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.conf b/sys-apps/pcmcia-cs/files/pcmcia.conf
deleted file mode 100644
index 87a40b809097..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Put cardmgr options here
-CARDMGR_OPTS="-f"
-# To set the PCMCIA scheme at startup...
-SCHEME="home"
-
-# If using kernel PCMCIA drivers, PCIC should be "yenta_socket". If 
-# using the pcmcia-cs drivers, this shhould be either "i82365" or "tcic",
-# depending on your pcmcia hardware.
-# If using kernel drivers not as modules, set PCIC to ""
-PCIC="yenta_socket"
-# Put socket driver timing parameters here
-PCIC_OPTS=""
-
-# Alternative PCIC driver to use if PCIC driver fails
-PCIC_ALT="i82365"
-PCIC_ALT_OPTS=""
-
-# Put pcmcia_core options here
-CORE_OPTS=""
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.rc b/sys-apps/pcmcia-cs/files/pcmcia.rc
deleted file mode 100644
index 7f76254adf24..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia.rc
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.rc,v 1.7 2004/07/15 00:46:44 agriffis Exp $
-
-RUN=/var/run
-SC=${RUN}/pcmcia-scheme
-
-cleanup()
-{
-	while read SN CLASS MOD INST DEV EXTRA ; do
-		if [ "x${SN}" != "xSocket" ] ; then
-			/etc/pcmcia/${CLASS} stop ${DEV} 2> /dev/null
-		fi
-	done
-}
-
-pcmcia_probe()
-{
-	MODULE=$1
-	OPTS=$2
-
-	/sbin/modprobe $MODULE $OPTS 2>/dev/null
-
-	return $?
-}
-
-start() {
-	local code
-	# Scheme is set for the /etc/pcmcia/shared script
-	if [ -n "${SCHEME}" ] ; then umask 022 ; echo $SCHEME > ${SC}
-	else umask 022 ; touch ${SC}
-	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 w/out 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
-			pcmcia_probe $PCIC $PCIC_OPTS || {
-				ewarn "'modprobe ${PCIC}' failed"
-				ewarn "Trying alternative PCIC driver: ${PCIC_ALT}"
-				pcmcia_probe $PCIC_ALT $PCIC_ALT_OPTS
-			}
-		fi
-		pcmcia_probe ds
-	fi
-
-	ebegin "Starting pcmcia"
-	start-stop-daemon --start --quiet --exec /sbin/cardmgr -- -s ${RUN}/stab ${CARDMGR_OPTS}
-	code=$?	
-	if [ $code -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 $code
-}
-
-stop() {
-	local code
-
-	if [ -w ${SC} ] ; then rm -f ${SC} ; fi
-
-	ebegin "Stopping pcmcia"
-	start-stop-daemon --stop --quiet --pidfile /var/run/cardmgr.pid --retry 5
-	code=$?	
-
-	if [ -n `fgrep "ds " /proc/modules | head -n1 | cut -c1` ]; then
-		/sbin/rmmod ds 2> /dev/null
-		/sbin/rmmod $PCIC 2> /dev/null
-		/sbin/rmmod pcmcia_core 2> /dev/null
-	fi
-	
-	eend $code
-}
-
diff --git a/sys-apps/pcmcia-cs/files/ppc.config.opts b/sys-apps/pcmcia-cs/files/ppc.config.opts
deleted file mode 100644
index 9c835b7704bc..000000000000
--- a/sys-apps/pcmcia-cs/files/ppc.config.opts
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# 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/pcmcia-cs-3.2.7-r3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
deleted file mode 100644
index 8f59712047c2..000000000000
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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.7-r3.ebuild,v 1.5 2005/07/07 10:47:47 brix Exp $
-
-inherit linux-info eutils
-
-OV="orinoco-0.13e"
-
-DESCRIPTION="PCMCIA tools for Linux"
-SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
-		http://dev.gentoo.org/~latexer/files/patches/${P}-module-init-tools.diff.gz
-		ppc? ( http://dev.gentoo.org/~latexer/files/patches/pcmcia-cs-3.2.5-ppc-fix.diff.gz )
-		http://ozlabs.org/people/dgibson/dldwd/monitor-0.13e.patch"
-
-HOMEPAGE="http://pcmcia-cs.sourceforge.net"
-IUSE="X trusted build apm pnp nocardbus"
-RDEPEND="!sys-apps/pcmcia-cs-cis
-		>=sys-apps/sed-4
-		X? ( virtual/x11 )"
-DEPEND="${RDEPEND} virtual/os-headers"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc amd64"
-PROVIDE="virtual/pcmcia"
-
-src_unpack() {
-	unpack ${P}.tar.gz || die "unpack failed"
-
-	# 3.2.7 includes the latest stable orinoco (0.13e), so just patch to add
-	# monitor mode
-	cd ${S}/wireless
-	epatch ${DISTDIR}/monitor-0.13e.patch
-
-	cd ${S}
-
-	# Fix for module-init-tools systems
-	epatch ${DISTDIR}/${P}-module-init-tools.diff.gz
-
-	# Fix for ppc on newer benh kernels
-	[ "${ARCH}" == "ppc" ] && epatch ${DISTDIR}/pcmcia-cs-3.2.5-ppc-fix.diff.gz
-
-	# Install man-pages into /usr/share/man
-	sed -i -e 's:usr/man:usr/share/man:g' Configure \
-		|| die "sed Configure failed (2)"
-}
-
-src_compile() {
-	local myconf myarch
-
-	# There's now a configure option for whether to build X tools
-	if use X; then
-		myconf="${myconf} --x11"
-	else
-		myconf="${myconf} --nox11"
-	fi
-
-	if use trusted; then
-		myconf="${myconf} --trust"
-	else
-		myconf="${myconf} --notrust"
-	fi
-
-	# Note that when built with apm support, pcmcia-cs will require a
-	# kernel with APM support
-	if use apm; then
-		myconf="${myconf} --apm"
-	else
-		myconf="${myconf} --noapm"
-	fi
-
-	# Note that when built with pnp support, pcmcia-cs will require a
-	# kernel with ISA PnP support
-	if use pnp; then
-		myconf="${myconf} --pnp"
-	else
-		myconf="${myconf} --nopnp"
-	fi
-
-	if use nocardbus; then
-		myconf="${myconf} --nocardbus"
-	else
-		myconf="${myconf} --cardbus"
-	fi
-
-	# x86 is not a valid arch for configure... use a case statement
-	# here to make it easy for other arches to add their own
-	# workarounds.
-	case "${ARCH}" in
-		x86) myarch="i386" ;;
-		*)   myarch="${ARCH}" ;;
-	esac
-
-	# Use $CFLAGS for user tools, but standard kernel optimizations
-	# for the kernel modules (for compatibility).
-	#
-	# 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
-	./Configure -n \
-		--target=${D} \
-		--srctree \
-		--kernel=${KV_DIR} \
-		--arch="${myarch}" \
-		--uflags="$CFLAGS" \
-		--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
-		$myconf || die "failed configuring"
-
-	sed -i -e '/^HAS_FORMS/d ; s/^FLIBS=".*"/FLIBS=""/' config.out config.mk
-
-	ebegin "Building pcmcia-cs development environment"
-	echo ${PV} > ${S}/pcmcia-cs-version
-	cd ${S}
-	tar -cjf ${T}/pcmcia-cs-build-env.tbz2 .
-	eend ${?}
-
-	emake DO_ORINOCO=1 all || die "failed compiling"
-}
-
-src_install () {
-	make PREFIX=${D} install || die "failed installing"
-
-	# remove included rc scripts since we have our own
-	rm -rf ${D}/etc/rc*.d
-
-	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
-
-	# documentation
-	if use build; then
-		rm -rf ${D}/usr/share/man
-	else
-		dodoc BUGS CHANGES COPYING LICENSE MAINTAINERS README \
-			README-2.4 SUPPORTED.CARDS doc/*
-	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
-
-	# install the pcmcia-cs development environment tarball
-	insinto ${ROOT}/usr/src/pcmcia-cs/
-	doins ${T}/pcmcia-cs-build-env.tbz2
-}
-
-pkg_postinst() {
-	if [ ${KV_MINOR} -lt 5 ]
-	then
-		depmod -a
-
-		einfo "To avail yourself of the pcmcia-cs drivers, you have to disable the"
-		einfo "PCMCIA support in the kernel.  (Otherwise, you might experience"
-		einfo "CardServices version mismatch errors)"
-		einfo ""
-		einfo "Proper kernel config for this package is that PCMCIA/CardBus under"
-		einfo "General Setup is off and Wireless LAN (non-ham radio) is on but"
-		einfo "no modules or drivers turned on under Network Device Support"
-		einfo "if you have wireless."
-		einfo ""
-		einfo "Also note it now appears that you need CONFIG_CRC32 turned on"
-		einfo "These are the CRC32 Library functions in the config"
-	else
-		einfo "For 2.5/2.6 kernels, the PCMCIA support from the kernel should"
-		einfo "be used. Enable PCMCIA and any further drivers you need there,"
-		einfo "and then use this package to install the PCMCIA tools."
-	fi
-}