Removed unused man-pages patch, added gcc4 patch as per bug #90359.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 34 insertions, 19 deletions

diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 72bd81650f96..8549edffd6ad 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.84 2005/05/04 09:40:04 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.85 2005/05/08 08:16:36 brix Exp $
+
+  08 May 2005; <brix@gentoo.org> +files/pcmcia-cs-3.2.8-gcc4.patch,
+  -files/pcmcia-cs-3.2.8-man-pages.patch, pcmcia-cs-3.2.8.ebuild:
+  Removed unused man-pages patch, added gcc4 patch as per bug #90359.
 
   04 May 2005; <brix@gentoo.org> pcmcia-cs-3.2.8.ebuild:
   Require in-kernel PCMCIA support for 2.6.x, warn users about in-kernel
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 831e52f95660..df9c3c6b8e56 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,8 +1,8 @@
 MD5 cf93b43a7c6f6d4987fbbe331073f39b pcmcia-cs-3.2.5-r2.ebuild 4452
 MD5 bd45772ec06d2e6c5df4922ee1b65d28 pcmcia-cs-3.2.7-r3.ebuild 4900
-MD5 47897562ba99ecd85bcb6602f7c6e88d pcmcia-cs-3.2.8.ebuild 3658
+MD5 885c9f8c19c380442a5224f94d45afc4 pcmcia-cs-3.2.8.ebuild 3694
 MD5 9c24e6836b1acf3a9ed1830e6f5d505a pcmcia-cs-3.2.5-r3.ebuild 5269
-MD5 7f82a3f30604f634f9cb25bed83fcb26 ChangeLog 18224
+MD5 afa02faca65cc8c5af742ec5ce52d40b ChangeLog 18429
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 338830e2d0514d080a684e34404424a7 pcmcia-cs-3.2.7-r4.ebuild 4946
 MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5-r2 150
@@ -11,7 +11,6 @@ MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r3 287
 MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r4 287
 MD5 8df7f8fac6931504e84e1c13acfe92e6 files/pcmcia-cs-3.2.8-x11.patch 874
 MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.8-move-pnp-ids.patch 1648
-MD5 41828d310f105853882f147692c88e60 files/pcmcia-cs-3.2.8-man-pages.patch 424
 MD5 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
 MD5 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.8-conf.d 524
 MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
@@ -21,6 +20,7 @@ MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
 MD5 fb59203b176eea34b5969d465efb85a9 files/ppc.config.opts 1687
 MD5 8938df25626d18aa4493d26dea7e00eb files/pcmcia-cs-3.2.8-ppc.config.opts 1657
 MD5 e4879f03bbdbfbdc094c1f1b6486846b files/pcmcia.conf 549
+MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
 MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.8-tools-only.patch 1230
 MD5 ec6d7ed3b83d1af45933e3e8af41796a files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch 1436
 MD5 33d296f61d4e7689c1b9b7e1c09f3bf9 files/pcmcia-cs-3.2.8-includes.patch 594
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-gcc4.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-gcc4.patch
new file mode 100644
index 000000000000..11d13706df39
--- /dev/null
+++ b/sys-apps/pcmcia-cs/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/files/pcmcia-cs-3.2.8-man-pages.patch b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-man-pages.patch
deleted file mode 100644
index d4618711daaa..000000000000
--- a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-man-pages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urp pcmcia-cs-3.2.8/man/Makefile pcmcia-cs-3.2.8-man-pages/man/Makefile
---- pcmcia-cs-3.2.8/man/Makefile	2003-09-15 07:14:41.000000000 +0200
-+++ pcmcia-cs-3.2.8-man-pages/man/Makefile	2005-04-25 11:34:56.000000000 +0200
-@@ -33,8 +33,10 @@ ifdef HAS_FORMS
- endif
- 
- install-man4: $(MAN4)
-+ifdef CONFIG_PCMCIA
- 	@mkdir -p $(MANDIR)/man4
- 	cp *.4 $(MANDIR)/man4
-+endif
- 
- install-man5: $(MAN5)
- 	@mkdir -p $(MANDIR)/man5
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
index 7ccc12da4c0f..4d294cc8bb74 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.2 2005/05/04 09:40:04 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8.ebuild,v 1.3 2005/05/08 08:16:36 brix Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -45,6 +45,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
 	epatch ${FILESDIR}/${P}-includes.patch
 	epatch ${FILESDIR}/${P}-ldflags.patch
 	epatch ${FILESDIR}/${P}-move-pnp-ids.patch