Bump.

4 files changed, 196 insertions, 12 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index e9e412f3c8a5..a2c39f1050de 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.58 2004/02/07 20:27:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.59 2004/02/08 01:20:51 latexer Exp $
+
+*pcmcia-cs-3.2.7 (07 Feb 2004)
+
+  07 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.7.ebuild:
+  New version! has much better detection for 2.6 and newer 2.4 kernels. Using
+  dgibson's monitor mode patch. Includes PPC fix.
 
   07 Feb 2004; Luca Barbato <lu_zero@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
   Marked ~ppc
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 8a6a16855752..c58515c4f7c6 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,17 +1,19 @@
-MD5 08ca37b47d421800afeff3671389bcb3 ChangeLog 13600
+MD5 c4675c67f927f061a3461e191c81179d pcmcia-cs-3.2.4.ebuild 4392
+MD5 42b6034692126c56b1775fdae2c56e45 pcmcia-cs-3.1.34-r8.ebuild 4136
+MD5 d7ccb7bbeca6ff955ca46d7a4e63970c pcmcia-cs-3.2.5-r1.ebuild 5263
+MD5 052a01e3c3fdfd19ecaa57d902c4fd49 pcmcia-cs-3.2.5.ebuild 4430
+MD5 bd36f6092e1ff5702ef9a2b374044852 pcmcia-cs-3.2.7.ebuild 4632
+MD5 ea8405b8cfd14b6d078d46938d4eee1b ChangeLog 13819
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 23eca17ebcdf35ffefafa59288f4949f pcmcia-cs-3.2.5-r1.ebuild 5262
-MD5 037b39bf630e44081f86b210cbaeeecd pcmcia-cs-3.2.4.ebuild 4391
-MD5 6665e69cfa55a0fc043ba11b14ac43b5 pcmcia-cs-3.2.5.ebuild 4429
-MD5 9fa3714e443c93e1038ea29640a5bf38 pcmcia-cs-3.1.34-r8.ebuild 4135
-MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
-MD5 3046f6b0a3025d78a1ecbefac12484b0 files/pcmcia.conf 549
-MD5 088c74e7bcd96f28b223636ec999b9c2 files/pcmcia.rc 2035
 MD5 157ac5bc22e938e1c2268c1f2610420c files/digest-pcmcia-cs-3.2.5-r1 379
-MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
-MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
-MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
+MD5 da9744cdc1401162cea92b7aded74826 files/pcmcia.rc 2036
 MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652
+MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
+MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7 287
 MD5 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
 MD5 8621a69779c0a084e6092f495ac08cde files/gentoo-pcmcia-cs-3.1.34.patch 589
 MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
+MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
+MD5 3046f6b0a3025d78a1ecbefac12484b0 files/pcmcia.conf 549
+MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
+MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7
new file mode 100644
index 000000000000..c3aa9a6290bf
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7
@@ -0,0 +1,4 @@
+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/pcmcia-cs-3.2.7.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7.ebuild
new file mode 100644
index 000000000000..b4d5dafb6529
--- /dev/null
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2004 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.7.ebuild,v 1.1 2004/02/08 01:20:51 latexer Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+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="sys-kernel/linux-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)"
+}
+
+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=/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"
+
+	# 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."
+	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
+}