ARCH cleanup and ~alpha keywords (bugs #34771, #34773)

3 files changed, 94 insertions, 91 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 6cf4a8589a20..3091f88f1c1c 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/pcmcia-cs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.46 2003/12/16 05:58:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.47 2003/12/19 18:18:05 latexer Exp $
+
+  19 Dec 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5.ebuild:
+  Fixes for ARCH and cleanup (bug #34773 and 34771)
 
   15 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
   <herd>base-system</herd> -> <herd>mobile</herd>
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 104b80dbca00..4a372ba47ee8 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,35 +1,35 @@
-MD5 bdf561327252bd49dc5501d4d57117de ChangeLog 11534
+MD5 41bbb5b4921c05f4476903cf977ed184 pcmcia-cs-3.2.4.ebuild 4029
 MD5 2e27752157c688260591d1932da0797e pcmcia-cs-3.1.34-r8.ebuild 4136
-MD5 09778e65d2d7dfd817b20bd91185f939 pcmcia-cs-3.2.0.ebuild 4079
-MD5 a13380cbcf7e44cb62da8d02f6d5e6b1 pcmcia-cs-3.2.1-r1.ebuild 4359
+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 79a4a1c7df41ec21b7b068729bf1ddac pcmcia-cs-3.2.1-r3.ebuild 4485
+MD5 aae4ddfbddc6942af41c0027952f779b pcmcia-cs-3.2.3.ebuild 3902
 MD5 8fa881eb68d0863794b346cd466d84a1 pcmcia-cs-3.2.1-r4.ebuild 4638
-MD5 362a997b2f6e77a55b39056bed46d92b pcmcia-cs-3.2.1.ebuild 4079
-MD5 65f0eb65d75bd69dd0d0f4590ffb6ff0 pcmcia-cs-3.2.2.ebuild 4542
-MD5 d35bd47deb54e2d35ac4f3ca43690a6e pcmcia-cs-3.2.3-r1.ebuild 4709
+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 aae4ddfbddc6942af41c0027952f779b pcmcia-cs-3.2.3.ebuild 3902
-MD5 41bbb5b4921c05f4476903cf977ed184 pcmcia-cs-3.2.4.ebuild 4029
-MD5 fb3fb1336658094b05f8fc300f14bea6 pcmcia-cs-3.2.5.ebuild 4346
+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 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
-MD5 645c48ec1ab21e1ff5abd7c3da0e6c49 files/digest-pcmcia-cs-3.2.0 132
-MD5 27f5efcad7ec088bf5520785f38ffb9e files/digest-pcmcia-cs-3.2.1 132
 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 ad2ff65ddeee3b4191866e70ddc75005 files/digest-pcmcia-cs-3.2.2 210
-MD5 166988c95effd8177790227bd751ccf5 files/digest-pcmcia-cs-3.2.3 132
 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 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 6c67fb29e452bc0bb06cd410429234b6 files/network.orig 6807
-MD5 83977336aa2077a799ca633a6504aabd files/pcmcia.conf 363
-MD5 398d67e8e892182884b962c8ff2fca2e files/pcmcia.rc 1795
 MD5 8c814c1d24b600cfaa48cd9a669d0143 files/ppc.config.opts 228
-MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
+MD5 83977336aa2077a799ca633a6504aabd files/pcmcia.conf 363
+MD5 6c67e080235f83a3cb14be6cf3d2c872 files/hermes.conf 1859
+MD5 c1034d56e6decdb7d4f732bfff70088a files/digest-pcmcia-cs-3.1.34-r8 133
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild
index c404dc4ff92f..007a2a00aa19 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.3 2003/12/09 20:26:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5.ebuild,v 1.4 2003/12/19 18:18:05 latexer Exp $
 
 inherit eutils
 
@@ -13,112 +13,111 @@ SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
 
 HOMEPAGE="http://pcmcia-cs.sourceforge.net"
 IUSE="trusted build apm pnp nocardbus"
-DEPEND="sys-kernel/linux-headers"
+DEPEND="sys-kernel/linux-headers >=sys-apps/sed-4"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 alpha ~amd64"
-
-# check arch for configure
-if [ ${ARCH} = "x86" ] ; then
-	MY_ARCH="i386"
-else
-	MY_ARCH="ppc"
-fi
+KEYWORDS="~x86 ~alpha"
 
 # 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
 
-	check_KV
-	OKVMINOR="`echo ${KV} | sed -e 's:^2\.\(.\).*:\1:'`"
+	unpack ${P}.tar.gz || die "unpack failed"
+	cd ${S} || die "cd ${S} failed"
 
-	cd ${S}
+	# parse out the middle number from the kernel version
+	check_KV
+	okvminor="${KV#*.}" ; okvminor="${okvminor%%.*}"
+	[ -n "${okvminor}" ] || die "couldn't figure out okvminor"
 
 	# 3.2.5 includes the latest orinoco (0.13e), so just patch to add
-	#monitor mode
+	# monitor mode
 	epatch ${DISTDIR}/${P}-orinoco-monitor.diff.gz
+
 	# If we're on 2.5.x or 2.6.x, modversions.h has *moved*
-	if [ ${OKVMINOR} -ge 5 ]
-	then
-		mv -f Configure ${T}
-		sed -e "s:include/linux/modversion:include/config/modversion:" \
-			${T}/Configure > Configure
+	if [ "${okvminor}" -ge 5 ]; then
+		sed -i -e "s:include/linux/modvers:include/config/modvers:" Configure \
+			|| die "sed Configure failed (1)"
 	fi
 
-	mv -f Configure ${T}
-	sed -e 's:usr/man:usr/share/man:g' ${T}/Configure > Configure
-	chmod ug+x Configure
-	#man pages will now install into /usr/share/man
-
-
+	# 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
-	if [ -n "`use trusted`" ] ; then
-		myconf="--trust"
+	local myconf myarch
+
+	if use trusted; then
+		myconf="${myconf} --trust"
 	else
-		myconf="--notrust"
+		myconf="${myconf} --notrust"
 	fi
 
-	if [ -n "`use apm`" ] ; then
-		myconf="$myconf --apm"
+	# 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"
+		myconf="${myconf} --noapm"
 	fi
 
-	if [ -n "`use pnp`" ] ; then
-		myconf="$myconf --pnp"
+	# 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"
+		myconf="${myconf} --nopnp"
 	fi
 
-	if [ -n "`use nocardbus`" ] ; then
-		myconf="$myconf --nocardbus"
+	if use nocardbus; then
+		myconf="${myconf} --nocardbus"
 	else
-		myconf="$myconf --cardbus"
+		myconf="${myconf} --cardbus"
 	fi
 
-	#use $CFLAGS for user tools, but standard kernel optimizations for the kernel modules (for compatibility)
+	# 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="${MY_ARCH}" \
+		--arch="${myarch}" \
 		--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
+	sed -i -e '/^HAS_FORMS/d ; s/^FLIBS=".*"/FLIBS=""/' config.out config.mk
 
 	emake all || die "failed compiling"
 }
 
 src_install () {
 	make PREFIX=${D} install || die "failed installing"
-	cd ${D}
-	rm -rf etc/rc*.d
+
+	# remove included rc scripts since we have our own
+	rm -rf ${D}/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
+	rm -rf ${D}/usr/X11R6
+	# todo: if they are installed, move them to /usr
 
 	insinto /etc/conf.d
 	newins ${FILESDIR}/pcmcia.conf pcmcia
@@ -129,30 +128,31 @@ src_install () {
 	# install our own init script
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pcmcia.rc pcmcia
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		# install docs
+
+	# 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/*
-	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
+	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 "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 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 "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."
 }