Initial import, fixes bug #116899.

(Portage version: 2.0.53)

7 files changed, 155 insertions, 0 deletions

diff --git a/sys-apps/pcmcia-cs-pnptools/ChangeLog b/sys-apps/pcmcia-cs-pnptools/ChangeLog
new file mode 100644
index 000000000000..f550e66ae51e
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sys-apps/pcmcia-cs-pnptools
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-pnptools/ChangeLog,v 1.1 2006/01/12 12:56:18 brix Exp $
+
+*pcmcia-cs-pnptools-3.2.8 (12 Jan 2006)
+
+  12 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/pcmcia-cs-3.2.8-gcc4.patch,
+  +files/pcmcia-cs-3.2.8-move-pnp-ids.patch, +metadata.xml,
+  +pcmcia-cs-pnptools-3.2.8.ebuild:
+  Initial import, fixes bug #116899.
+
diff --git a/sys-apps/pcmcia-cs-pnptools/Manifest b/sys-apps/pcmcia-cs-pnptools/Manifest
new file mode 100644
index 000000000000..6b60d4c58d7b
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/Manifest
@@ -0,0 +1,6 @@
+MD5 0ad07770088b2905e2001489b36e02ef ChangeLog 394
+MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-pnptools-3.2.8 68
+MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
+MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.8-move-pnp-ids.patch 1648
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 c405d92bf97bed30d8c9ca5af542d8b8 pcmcia-cs-pnptools-3.2.8.ebuild 1270
diff --git a/sys-apps/pcmcia-cs-pnptools/files/digest-pcmcia-cs-pnptools-3.2.8 b/sys-apps/pcmcia-cs-pnptools/files/digest-pcmcia-cs-pnptools-3.2.8
new file mode 100644
index 000000000000..5cc9da5c0ea4
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/files/digest-pcmcia-cs-pnptools-3.2.8
@@ -0,0 +1 @@
+MD5 0d6d65be8896eff081aee996049afaa5 pcmcia-cs-3.2.8.tar.gz 1271846
diff --git a/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-gcc4.patch b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-gcc4.patch
new file mode 100644
index 000000000000..11d13706df39
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-gcc4.patch
@@ -0,0 +1,24 @@
+diff -urp pcmcia-cs-3.2.8/debug-tools/lspnp.c pcmcia-cs-3.2.8-gcc4/debug-tools/lspnp.c
+--- pcmcia-cs-3.2.8/debug-tools/lspnp.c	2002-02-13 06:45:01.000000000 +0100
++++ pcmcia-cs-3.2.8-gcc4/debug-tools/lspnp.c	2005-05-08 10:08:07.000000000 +0200
+@@ -496,7 +496,7 @@ static char *dump_chain(u_char *buf, int
+ 		dump_io_fixed(r); break;
+ 	    }
+ 	}
+-	(u_char *)p += sz + 1;
++	p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
+diff -urp pcmcia-cs-3.2.8/debug-tools/setpnp.c pcmcia-cs-3.2.8-gcc4/debug-tools/setpnp.c
+--- pcmcia-cs-3.2.8/debug-tools/setpnp.c	2001-10-10 04:58:12.000000000 +0200
++++ pcmcia-cs-3.2.8-gcc4/debug-tools/setpnp.c	2005-05-08 10:08:07.000000000 +0200
+@@ -163,7 +163,7 @@ static char *update_chain(u_char *buf, i
+ 		break;
+ 	    }
+ 	}
+-	(u_char *)p += sz + 1;
++	p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
diff --git a/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-move-pnp-ids.patch b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-move-pnp-ids.patch
new file mode 100644
index 000000000000..2913be2ac090
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-move-pnp-ids.patch
@@ -0,0 +1,40 @@
+diff -urp pcmcia-cs-3.2.8/debug-tools/lspnp.c pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/lspnp.c
+--- pcmcia-cs-3.2.8/debug-tools/lspnp.c	2002-02-13 06:45:01.000000000 +0100
++++ pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/lspnp.c	2005-04-13 00:21:58.000000000 +0200
+@@ -154,7 +154,7 @@ static void load_ids(void)
+     char s[133], *t;
+     int n;
+     struct eisa_id *id;
+-    FILE *f = fopen("/usr/share/pnp.ids", "r");
++    FILE *f = fopen("/usr/share/misc/pnp.ids", "r");
+     
+     if (f == NULL)
+ 	return;
+diff -urp pcmcia-cs-3.2.8/debug-tools/Makefile pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/Makefile
+--- pcmcia-cs-3.2.8/debug-tools/Makefile	2002-12-21 09:23:22.000000000 +0100
++++ pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/Makefile	2005-04-13 00:21:37.000000000 +0200
+@@ -65,8 +65,8 @@ install: $(TOOLS)
+ 	cp -f dump_cis pack_cis $(PREFIX)/sbin
+ ifdef CONFIG_PNP_BIOS
+ 	cp -f lspnp setpnp $(PREFIX)/sbin
+-	@mkdir -p $(PREFIX)/usr/share
+-	cp -f pnp.ids $(PREFIX)/usr/share
++	@mkdir -p $(PREFIX)/usr/share/misc
++	cp -f pnp.ids $(PREFIX)/usr/share/misc
+ endif
+ 
+ include ../rules.mk
+diff -urp pcmcia-cs-3.2.8/man/lspnp.8 pcmcia-cs-3.2.8-move-pnp-ids/man/lspnp.8
+--- pcmcia-cs-3.2.8/man/lspnp.8	2000-06-12 23:24:49.000000000 +0200
++++ pcmcia-cs-3.2.8-move-pnp-ids/man/lspnp.8	2005-04-13 00:22:35.000000000 +0200
+@@ -36,8 +36,8 @@ boot (as opposed to current resource inf
+ .B \-v
+ Selects more verbose output.  Can be used more than once.
+ .SH FILES
+-.TP \w'/usr/share/pnp.ids\ \ \ \ |\|'u
+-/usr/share/pnp.ids
++.TP \w'/usr/share/misc/pnp.ids\ \ \ \ |\|'u
++/usr/share/misc/pnp.ids
+ A database of known Plug and Play device ID's.
+ .TP
+ /proc/bus/pnp/...
diff --git a/sys-apps/pcmcia-cs-pnptools/metadata.xml b/sys-apps/pcmcia-cs-pnptools/metadata.xml
new file mode 100644
index 000000000000..cfbdff13bd61
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mobile</herd>
+<maintainer>
+  <email>brix@gentoo.org</email>
+  <name>Henrik Brix Andersen</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/pcmcia-cs-pnptools/pcmcia-cs-pnptools-3.2.8.ebuild b/sys-apps/pcmcia-cs-pnptools/pcmcia-cs-pnptools-3.2.8.ebuild
new file mode 100644
index 000000000000..1cbbc4d635f6
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/pcmcia-cs-pnptools-3.2.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-pnptools/pcmcia-cs-pnptools-3.2.8.ebuild,v 1.1 2006/01/12 12:56:18 brix Exp $
+
+inherit eutils toolchain-funcs linux-info
+
+MY_P=${P/-pnptools/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="PCMCIA PNP tools for Linux"
+HOMEPAGE="http://pcmcia-cs.sourceforge.net"
+SRC_URI="mirror://sourceforge/pcmcia-cs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+RDEPEND="!sys-apps/pcmcia-cs"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-move-pnp-ids.patch
+	epatch ${FILESDIR}/${MY_P}-gcc4.patch
+}
+
+pcmcia_cs_configure() {
+	# output arguments to Configure to assist in debugging
+	echo "${S}/Configure $@"
+	${S}/Configure "$@" || die "Configure failed"
+	return ${?}
+}
+
+src_compile() {
+	pcmcia_cs_configure \
+		--noprompt \
+		--kernel=${KV_DIR} \
+		--target=${D} \
+		--arch=$(tc-arch-kernel) \
+		--ucc=$(tc-getCC) \
+		--kcc=$(tc-getCC) \
+		--ld=$(tc-getLD) \
+		--uflags="${CFLAGS}" \
+		--kflags="$(getfilevar HOSTCFLAGS ${KV_DIR}/Makefile)" \
+		--srctree \
+		--nox11 \
+		--pnp \
+		|| die "Configure failed"
+
+	emake all || die "emake failed"
+}
+
+src_install () {
+	dosbin debug-tools/lspnp debug-tools/setpnp
+
+	insinto /usr/share/misc
+	doins debug-tools/pnp.ids
+
+	doman man/lspnp.8 man/setpnp.8
+}