diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2005-04-12 11:49:03 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2005-04-12 11:49:03 +0000 |
commit | 7a11a6a4fd3af1b8c3f3d9fdc591d4e430adfa97 (patch) | |
tree | 6b3fe7f3eed853d2a359185b8a3a22fbf7585b8e /sys-apps/pcmcia-cs | |
parent | Added modifications as recommended by Bug #79969 (diff) | |
download | historical-7a11a6a4fd3af1b8c3f3d9fdc591d4e430adfa97.tar.gz historical-7a11a6a4fd3af1b8c3f3d9fdc591d4e430adfa97.tar.bz2 historical-7a11a6a4fd3af1b8c3f3d9fdc591d4e430adfa97.zip |
Pruned old versions
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-apps/pcmcia-cs')
-rw-r--r-- | sys-apps/pcmcia-cs/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.1.34-r8 | 2 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.4 | 2 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1 | 4 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/gentoo-pcmcia-cs-3.1.34.patch | 24 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/hermes.conf | 74 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/files/network.orig | 253 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild | 146 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild | 156 | ||||
-rw-r--r-- | sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r1.ebuild | 172 |
10 files changed, 6 insertions, 834 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog index c64322c5f4f8..a208a98af350 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.78 2005/01/17 10:53:40 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.79 2005/04/12 11:49:03 brix Exp $ + + 12 Apr 2005; <brix@gentoo.org> -files/gentoo-pcmcia-cs-3.1.34.patch, + -files/hermes.conf, -files/network.orig, -pcmcia-cs-3.1.34-r8.ebuild, + -pcmcia-cs-3.2.4.ebuild, -pcmcia-cs-3.2.7-r1.ebuild: + Pruned old versions 17 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> pcmcia-cs-3.2.7-r2.ebuild: diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.1.34-r8 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.1.34-r8 deleted file mode 100644 index fe8a51039ed2..000000000000 --- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.1.34-r8 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 c31d1bbd2117cc90f4bf1cac31f97d1d pcmcia-cs-3.1.34.tar.gz 1247038 -MD5 c2e545a8358edcd0ecec1be1685fac71 orinoco-0.12b.tar.gz 62958 diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.4 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.4 deleted file mode 100644 index f6b712230def..000000000000 --- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 126e2d87e7a8a12e283db37ae82e9e4c pcmcia-cs-3.2.4.tar.gz 1262994 -MD5 1e97b69319d9c208c3df7c365d0152bd pcmcia-cs-3.2.4-orinoco-patch.diff 33570 diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1 deleted file mode 100644 index c3aa9a6290bf..000000000000 --- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1 +++ /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/gentoo-pcmcia-cs-3.1.34.patch b/sys-apps/pcmcia-cs/files/gentoo-pcmcia-cs-3.1.34.patch deleted file mode 100644 index db334a0aad8b..000000000000 --- a/sys-apps/pcmcia-cs/files/gentoo-pcmcia-cs-3.1.34.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur pcmcia-cs-3.1.34.orig/cardmgr/cardmgr.c pcmcia-cs-3.1.34/cardmgr/cardmgr.c ---- pcmcia-cs-3.1.34.orig/cardmgr/cardmgr.c Wed Jul 3 10:40:21 2002 -+++ pcmcia-cs-3.1.34/cardmgr/cardmgr.c Wed Jul 3 10:42:41 2002 -@@ -1222,6 +1222,11 @@ - unlink(stabfile); - } - -+static void dummy(void) -+{ -+ -+} -+ - /*====================================================================*/ - - /* most recent signal */ -@@ -1473,7 +1478,7 @@ - if (one_pass) - exit(EXIT_SUCCESS); - if (delay_fork) { -- atexit(NULL); -+ atexit(&dummy); - fork_now(); - atexit(&done); - write_pid(); diff --git a/sys-apps/pcmcia-cs/files/hermes.conf b/sys-apps/pcmcia-cs/files/hermes.conf deleted file mode 100644 index df1b30515f47..000000000000 --- a/sys-apps/pcmcia-cs/files/hermes.conf +++ /dev/null @@ -1,74 +0,0 @@ -device "orinoco_cs" - class "network" - module "hermes", "orinoco", "orinoco_cs" -# module "hermes", "orinoco" opts "pc_debug=3", "orinoco_cs" - -# -# Wireless network adapters -# -# We should use the manfid (which cover multiple cards), otherwise we will -# go crazy listing all cards and their variations !!! - -# First class of device : Lucent & OEM -card "Lucent Technologies Orinoco" - manfid 0x0156,0x0002 - bind "orinoco_cs" - -card "Lucent Technologies Wavelan/IEEE" - version "Lucent Technologies", "WaveLAN/IEEE" - bind "orinoco_cs" - -card "Cabletron RoamAbout 802.11 DS" - version "Cabletron", "RoamAbout 802.11 DS" - bind "orinoco_cs" - -card "ELSA AirLancer MC-11" - version "ELSA", "AirLancer MC-11" - bind "orinoco_cs" - -card "MELCO WLI-PCM-L11" - version "MELCO", "WLI-PCM-L11" - bind "wvlan_cs" - -# Second class of device : Symbol & OEM -card "LA4111 Spectrum24 Wireless LAN PC Card" - version "Symbol Technologies" - bind "orinoco_cs" - -card "3Com AirConnect" - version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card" - bind "orinoco_cs" - -card "Intel PRO/Wireless 2011" - manfid 0x0089,0x0001 - bind "orinoco_cs" - -card "Ericsson WLAN Card C11" - manfid 0x016b,0x0001 - bind "orinoco_cs" - -# Third class of device : other Intersil clones -card "Intersil PRISM2 11 Mbps Wireless Adapter" - manfid 0x0156, 0x0002 - bind "orinoco_cs" - -card "Farallon SkyLINE" - version "INTERSIL", "HFA384x/IEEE" - bind "orinoco_cs" - -card "D-Link DWL-650" - version "D", "Link DWL-650 11Mbps WLAN Card" - bind "orinoco_cs" - -card "SAMSUNG 11Mbps WLAN Card" - version "SAMSUNG", "11Mbps WLAN Card" - bind "orinoco_cs" -# Does this one cover Compaq as well ??? - -card "HyperLink Wireless PC Card 11Mbps" - version "HyperLink","Wireless PC Card 11Mbps" - bind "orinoco_cs" - -card "PROXIM LAN PC CARD HARMONY 80211B" - version "PROXIM","LAN PC CARD HARMONY 80211B" - bind "orinoco_cs" diff --git a/sys-apps/pcmcia-cs/files/network.orig b/sys-apps/pcmcia-cs/files/network.orig deleted file mode 100644 index 4191350918d2..000000000000 --- a/sys-apps/pcmcia-cs/files/network.orig +++ /dev/null @@ -1,253 +0,0 @@ -#! /bin/sh -# -# network 1.86 2002/07/03 06:44:01 (David Hinds) -# -# Initialize or shutdown a PCMCIA ethernet adapter -# -# This script should be invoked with two arguments. The first is the -# action to be taken, either "start", "stop", or "restart". The -# second is the network interface name. -# -# The script passes an extended device address to 'network.opts' in -# the ADDRESS variable, to retrieve device-specific configuration -# options. The address format is "scheme,socket,instance,hwaddr" -# where "scheme" is the current PCMCIA device configuration scheme, -# "socket" is the socket number, "instance" is used to number multiple -# interfaces in a single socket, and "hwaddr" is the card's hardware -# ethernet address. -# - -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" -start_fn () { return; } -stop_fn () { return; } -. $0.opts - -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 - -bootp_setup () -{ - if match `uname -r` "2.[2-9].*" ; then - log /sbin/ifconfig $DEVICE up - else - log /sbin/ifconfig $DEVICE up 0.0.0.0 - log /sbin/route add default dev $DEVICE netmask 0.0.0.0 - fi -} - -case "$ACTION" in - -'start') - [ -n "$VERBOSE" -a -n "$INFO" ] && echo "$INFO" - - [ -n "$IF_PORT" ] && /sbin/ifport $DEVICE $IF_PORT - - if is_true $PUMP ; then - log "/sbin/pump -i $DEVICE > /dev/null" || exit 1 - elif is_true $BOOTP ; then - bootp_setup - if [ -x /sbin/bootpc ] ; then - eval `/sbin/bootpc --bootfile '' --returniffail \ - --timeoutwait 10 --dev $DEVICE` - log /sbin/ifconfig $DEVICE down - if [ -n "$GATEWAYS" ] ; then - set - $GATEWAYS ; GATEWAY=$1 - fi - elif [ -x /sbin/pump ] ; then - log "/sbin/pump -i $DEVICE > /dev/null" || exit 1 - else - exit 1 - fi - elif is_true $DHCP ; then - bootp_setup - HN=${DHCP_HOSTNAME:+-h $DHCP_HOSTNAME} - if [ -x /sbin/dhcpcd ] ; then - # This is a version check: I know it looks weird - if /sbin/dhcpcd -XYZZY 2>&1 | grep -q DHCP ; then - log "/sbin/dhcpcd -d $HN $DEVICE >/dev/null 2>&1" || exit 1 - else - # Jump through hoops for lame 0.70-era dhcpcd - L=/var/run/dhcp-lock-$DEVICE - /bin/echo "#!/bin/sh\nrm $L" > $L ; chmod +x $L - log "/sbin/dhcpcd $HN -c $L $DEVICE >/dev/null 2>&1" - for t in 0 1 2 3 4 5 6 7 8 9 ; do - sleep 2 ; if [ ! -e $L ] ; then break ; fi - done - rm -f $L - if [ -e /etc/dhcpc/resolv.conf ] ; then - echo "# $DEVICE begin" > $RESOLV.N - chmod og+r $RESOLV.N - cat /etc/dhcpc/resolv.conf >> $RESOLV.N - echo "# $DEVICE end" >> $RESOLV.N - cat $RESOLV >> $RESOLV.N ; mv $RESOLV.N $RESOLV - fi - fi - elif [ -x /sbin/dhclient ] ; then - log "/sbin/dhclient $DEVICE >/dev/null 2>&1" || exit 1 - elif [ -x /sbin/pump ] ; then - log "/sbin/pump $HN -i $DEVICE > /dev/null" || exit 1 - else - exit 1 - fi - fi - - if [ -n "$IPADDR" ] ; then - # Basic network setup - NM=${NETMASK:+netmask $NETMASK} - BC=${BROADCAST:+broadcast $BROADCAST} - MTU=${MTU:+mtu $MTU} - log /sbin/ifconfig $DEVICE up $IPADDR $NM $BC $MTU - if [ -n "$NETWORK" ] ; then - /sbin/ifuser $DEVICE $NETWORK || \ - log /sbin/route add -net $NETWORK $NM dev $DEVICE - elif [ -n "$GATEWAY" ] ; then - /sbin/ifuser $DEVICE $GATEWAY || \ - log /sbin/route add $GATEWAY $DEVICE - fi - [ -n "$GATEWAY" ] && /sbin/route add default gw $GATEWAY metric 1 - fi - - # Update DNS stuff - if [ -n "$DOMAIN$SEARCH$DNSSRVS$DNS_1$DNS_2$DNS_3" ] ; then - echo "# $DEVICE begin" > $RESOLV.N - chmod og+r $RESOLV.N - [ -n "$DOMAIN" ] && echo "domain $DOMAIN" >> $RESOLV.N - [ -n "$SEARCH" ] && echo "search $SEARCH" >> $RESOLV.N - for DNS in $DNSSRVS $DNS_1 $DNS_2 $DNS_3 ; do - echo "nameserver $DNS" >> $RESOLV.N - done - echo "# $DEVICE end" >> $RESOLV.N - sed -e "/# $DEVICE begin/,/# $DEVICE end/d" $RESOLV >> $RESOLV.N - mv $RESOLV.N $RESOLV - fi - - # Handle NFS mounts - if [ -n "$MOUNTS" ] ; then - for MT in $MOUNTS ; do log mount -v $MT ; done - fi - - if [ -n "$IPX_NETNUM" ] ; then - log ipx_interface add $DEVICE $IPX_FRAME $IPX_NETNUM - fi - - start_fn $DEVICE - ;; - -'stop') - - stop_fn $DEVICE - - if is_true $PUMP || is_true $BOOTP || is_true $DHCP || \ - [ -n "$IPADDR" ] ; then - - # Shut down all NFS mounts on this interface - nfsstop () - { - local HOST MT - if read HOST MT ; then - nfsstop - if /sbin/ifuser $DEVICE $HOST ; then - do_fuser -k -m $MT > /dev/null - log umount -f -v $MT - fi - fi - } - mount -t nfs | sed -e 's/:.* on \(.*\) type .*/ \1/' | nfsstop - - [ -n "$IPX_NETNUM" ] && ipx_interface del $DEVICE $IPX_FRAME - - if is_true $PUMP ; then - log pump -r -i $DEVICE - elif is_true $DHCP ; then - if [ -x /sbin/dhcpcd ] ; then - PID=`cat /var/run/dhcpcd-$DEVICE.pid 2>/dev/null` - if [ -n "$PID" ] ; then - kill -TERM $PID - sleep 2 - fi - /sbin/dhcpcd -XYZZY 2>&1 | grep -q DHCP || \ - rm -f /var/run/dhcpcd-$DEVICE.pid - elif [ -x /sbin/dhclient ] ; then - PID=`cat /var/run/dhclient.pid 2>/dev/null` - if [ -n "$PID" ] ; then kill -TERM $PID ; fi - elif [ -x /sbin/pump ] ; then - log /sbin/pump -r -i $DEVICE - fi - fi - fi - - # Remove nameservers - if grep -q "# $DEVICE begin" $RESOLV ; then - sed -e "/# $DEVICE begin/,/# $DEVICE end/d" $RESOLV > $RESOLV.N - mv $RESOLV.N $RESOLV - fi - - log /sbin/ifconfig $DEVICE down - ;; - -'check') - is_true $NO_CHECK && exit 0 - /sbin/ifconfig $DEVICE | grep -q RUNNING || exit 0 - - # Check for any in-use NFS mounts - nfscheck () - { - while read HOST MT ; do - /sbin/ifuser $DEVICE $HOST && do_fuser -sm $MT && exit 1 - done - } - mount -t nfs | sed -e 's/:.* on \(.*\) type .*/ \1/' | nfscheck - - # Check for active TCP or UDP connections - getdests () - { - IFS=" :" ; read A ; read A - while read A B C D E HOST PORT STATE ; do - if [ "$STATE" != "FIN_WAIT1" -a "$STATE" != "FIN_WAIT2" \ - -a "$STATE" != "CLOSE_WAIT" -a "$STATE" != "TIME_WAIT" \ - -a "$HOST" != "127.0.0.1" -a "$HOST" != "0.0.0.0" \ - -a "$STATE" != "CLOSE" -a "$PORT" != "*" ] ; then\ - echo $HOST - fi - done - } - DESTS=`netstat -ntuw | getdests` - /sbin/ifuser $DEVICE $DESTS && exit 1 - ;; - -'cksum') - if [ $WIRELESS = 1 ] ; then exit 1 ; fi - chk_simple "$NEW_SCHEME,$SOCKET,$INSTANCE,$HWADDR" || exit 1 - ;; - -'restart') - [ -n "$IPADDR" ] && /sbin/ifconfig $DEVICE down up - ;; - -'suspend'|'resume') - ;; - -*) - usage - ;; - -esac - -exit 0 diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild deleted file mode 100644 index b78ad346ce39..000000000000 --- a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.34-r8.ebuild +++ /dev/null @@ -1,146 +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.1.34-r8.ebuild,v 1.18 2005/01/08 03:31:58 dragonheart Exp $ - -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="virtual/os-headers" -RDEPEND="" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 amd64 ppc -sparc " -IUSE="apm build nocardbus pnp trusted wavelan" - -# 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 - patch -p0 < ${FILESDIR}/gentoo-${P}.patch - - if ! 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 use trusted ; then - myconf="--trust" - else - myconf="--notrust" - fi - - if use apm ; then - myconf="$myconf --apm" - else - myconf="$myconf --noapm" - fi - - if use pnp ; then - myconf="$myconf --pnp" - else - myconf="$myconf --nopnp" - fi - - if 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 ! 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.4.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild deleted file mode 100644 index ae8e3261d575..000000000000 --- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.4.ebuild +++ /dev/null @@ -1,156 +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.4.ebuild,v 1.12 2005/01/08 03:31:58 dragonheart Exp $ - -inherit eutils - -OV="orinoco-0.13b" - -DESCRIPTION="PCMCIA tools for Linux" -SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz - http://airsnort.shmoo.com/${P}-orinoco-patch.diff" - -HOMEPAGE="http://pcmcia-cs.sourceforge.net" -IUSE="trusted build apm pnp nocardbus" -DEPEND="virtual/os-headers" -RDEPEND="" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 amd64 -sparc" - -# 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() { - check_KV - okvminor="${KV#*.}" ; okvminor="${okvminor%%.*}" - if [ "${okvminor}" -gt 4 ]; then - eerror "This version of pcmcia-cs will NOT work with 2.6 kernels" - eerror "Please use pcmcia-cs-3.2.5-r1 in combination with *kernel* PCMCIA" - eerror "drivers to use PCMCIA on a 2.6 kernel." - die "This version of pcmcia-cs does not support 2.6 kernels" - fi - - unpack ${P}.tar.gz - - # pcmcia-cs now has the latest orinoco driver included - - cd ${S} - epatch ${DISTDIR}/${P}-orinoco-patch.diff - - 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 - - -} - -src_compile() { - local myconf - if use trusted ; then - myconf="--trust" - else - myconf="--notrust" - fi - - if use apm ; then - myconf="$myconf --apm" - else - myconf="$myconf --noapm" - fi - - if use pnp ; then - myconf="$myconf --pnp" - else - myconf="$myconf --nopnp" - fi - - if 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 ! 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." -} diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r1.ebuild deleted file mode 100644 index 7be638b84e6e..000000000000 --- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r1.ebuild +++ /dev/null @@ -1,172 +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-r1.ebuild,v 1.4 2005/01/08 03:31:58 dragonheart Exp $ - -inherit 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" -DEPEND="virtual/os-headers - >=sys-apps/sed-4 - X? ( virtual/x11 )" -RDEPEND="" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86" - -# 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() { - # Check to make sure we have a kernel to compile against - check_KV - - 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)" - - # Install cardinfo and xcardinfo into /usr/bin instead of /usr/X11R6/bin - cd ${S} - epatch ${FILESDIR}/cardinfo-install-3.2.7.patch -} - -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 - - set_arch_to_kernel - # 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=/usr/src/linux \ - --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 - - emake DO_ORINOCO=1 all || die "failed compiling" -} - -src_install () { - make PREFIX=${D} install || die "failed installing" - set_arch_to_portage - - # 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 -} - -pkg_postinst() { - okvminor="${KV#*.}" ; okvminor="${okvminor%%.*}" - if [ "${okvminor}" -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 -} |