QA issue: install cardinfo & xcardinfo to /usr/bin

5 files changed, 220 insertions, 8 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 61e49a164620..b4134b2fcf0e 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.71 2004/09/03 21:03:24 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.72 2004/09/10 14:44:35 cardoe Exp $
+
+*pcmcia-cs-3.2.7-r1 (10 Sep 2004)
+
+  10 Sep 2004; Doug Goldstein <cardoe@gentoo.org>
+  +files/cardinfo-install-3.2.7.patch, +pcmcia-cs-3.2.7-r1.ebuild:
+  QA issue: install cardinfo & xcardinfo into /usr/bin rather then /usr/X11R6/bin
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   pcmcia-cs-3.2.7.ebuild:
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 03a7fb105169..6b88724a7800 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,18 +1,21 @@
-MD5 6594d6446b5e1007a46f32e90b7d1804 ChangeLog 15294
+MD5 d94253e6b6db5a107754140b8b5a6384 pcmcia-cs-3.2.4.ebuild 4308
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 9cb0e20339d778261fa9b617a9bd9b6e pcmcia-cs-3.1.34-r8.ebuild 4089
-MD5 d94253e6b6db5a107754140b8b5a6384 pcmcia-cs-3.2.4.ebuild 4308
+MD5 6594d6446b5e1007a46f32e90b7d1804 ChangeLog 15294
+MD5 63dc2764f165913254983ff62eb40f5d pcmcia-cs-3.2.7.ebuild 4729
 MD5 b021686c144e74f9b6fac22eddd2627a pcmcia-cs-3.2.5-r1.ebuild 5231
 MD5 fd0db86b0c8dbe693a607b02d86c3583 pcmcia-cs-3.2.5.ebuild 4399
-MD5 63dc2764f165913254983ff62eb40f5d pcmcia-cs-3.2.7.ebuild 4729
+MD5 eb3874523759e0e9eb80b59120fa5db9 pcmcia-cs-3.2.7-r1.ebuild 4862
 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 157ac5bc22e938e1c2268c1f2610420c files/digest-pcmcia-cs-3.2.5-r1 379
-MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7 287
 MD5 8621a69779c0a084e6092f495ac08cde files/gentoo-pcmcia-cs-3.1.34.patch 589
-MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
-MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
+MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
+MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r1 287
 MD5 3046f6b0a3025d78a1ecbefac12484b0 files/pcmcia.conf 549
 MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
+MD5 0f50b04b5efd5cad60974dc51c6ce470 files/cardinfo-install-3.2.7.patch 857
+MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
 MD5 614f873dfdb6afcff9a631d64eada8e5 files/ppc.config.opts 1687
+MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7 287
+MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
diff --git a/sys-apps/pcmcia-cs/files/cardinfo-install-3.2.7.patch b/sys-apps/pcmcia-cs/files/cardinfo-install-3.2.7.patch
new file mode 100644
index 000000000000..ba9c5bb0a1e9
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/cardinfo-install-3.2.7.patch
@@ -0,0 +1,24 @@
+diff -urN pcmcia-cs-3.2.7.orig/cardmgr/Makefile pcmcia-cs-3.2.7/cardmgr/Makefile
+--- pcmcia-cs-3.2.7.orig/cardmgr/Makefile	2004-08-30 14:16:45.860891080 -0500
++++ pcmcia-cs-3.2.7/cardmgr/Makefile	2004-08-30 14:17:58.787804504 -0500
+@@ -90,14 +90,14 @@
+ 	$(CC) $< -o $@ $(GTK_LIBS)
+ 
+ install-cardinfo: cardinfo
+-	@mkdir -p $(PREFIX)/usr/X11R6/bin
+-	cp -f cardinfo $(PREFIX)/usr/X11R6/bin
+-	chmod u+s $(PREFIX)/usr/X11R6/bin/cardinfo
++	@mkdir -p $(PREFIX)/usr/bin
++	cp -f cardinfo $(PREFIX)/usr/bin
++	chmod u+s $(PREFIX)/usr/bin/cardinfo
+ 
+ install-xcardinfo: xcardinfo
+-	@mkdir -p $(PREFIX)/usr/X11R6/bin
+-	cp -f xcardinfo $(PREFIX)/usr/X11R6/bin
+-	chmod u+s $(PREFIX)/usr/X11R6/bin/xcardinfo
++	@mkdir -p $(PREFIX)/usr/bin
++	cp -f xcardinfo $(PREFIX)/usr/bin
++	chmod u+s $(PREFIX)/usr/bin/xcardinfo
+ 
+ install-gpccard: gpccard
+ 	@mkdir -p $(PREFIX)/usr/bin
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1
new file mode 100644
index 000000000000..c3aa9a6290bf
--- /dev/null
+++ b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.7-r1
@@ -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-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r1.ebuild
new file mode 100644
index 000000000000..c14b65c273d8
--- /dev/null
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r1.ebuild
@@ -0,0 +1,175 @@
+# 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/pcmcia-cs-3.2.7-r1.ebuild,v 1.1 2004/09/10 14:44:35 cardoe 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
+
+	# 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
+}