fix gcc-4.0 broken build (#94279)

Package-Manager: portage-2.0.51.19

5 files changed, 41 insertions, 8 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 686089865ba5..c760e0a35306 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.43 2005/05/14 13:02:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.44 2005/05/29 12:35:33 mrness Exp $
+
+  29 May 2005; Alin Nastac <mrness@gentoo.org>
+  +files/slmodem-2.9.9b-gcc4.patch, slmodem-2.9.9b.ebuild,
+  slmodem-2.9.9d.ebuild:
+  Fix gcc-4.0 compile error (#94279).
 
 *slmodem-2.9.9d (14 May 2005)
 
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 5b597674502b..acfe9cf211cd 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3637c7e3fe4b31081f97768434376210 slmodem-2.9.9a-r2.ebuild 3882
-MD5 a00ccc69b5e8d9b83d5502eec87b264a slmodem-2.9.9b.ebuild 3604
-MD5 fdbea616c29a7613411ed5cc77fbed61 slmodem-2.9.9d.ebuild 3518
-MD5 b4d8a4f235848084fac4fa06c8df1ec5 ChangeLog 10459
+MD5 380c79d8c9f82b06a3a8c3b065caef89 slmodem-2.9.9b.ebuild 3609
+MD5 5a22b64424d98e35480318422a350a67 slmodem-2.9.9d.ebuild 3562
+MD5 f03f0b8951941f004ead6ca9f532367b ChangeLog 10628
 MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
@@ -10,6 +13,14 @@ MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-2.9.conf 649
 MD5 6b1353dad0548404d5a468d4e6f5a18c files/slmodem-2.9.init 2679
 MD5 abbaebc2245cf7223d65772abf782842 files/digest-slmodem-2.9.9b 66
 MD5 fd55ef399408a109742263cd5b4a5219 files/digest-slmodem-2.9.9d 66
+MD5 fd0f0a405fb7f059cc2f5078d54fd884 files/slmodem-2.9.9b-gcc4.patch 463
 MD5 ef9ad53b66480e01974b9f183e4edbc8 files/digest-slmodem-2.9.9a-r2 66
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
 MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-usb_endpoint_halted-gentoo.patch 830
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCmbcsjiC39V7gKu0RAkz8AJ44MaTdccLUskIAuvYO0jR51qrDPQCfS6Ux
+G2I3pxjOmAtivedh6RHi3aw=
+=2NZj
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/slmodem-2.9.9b-gcc4.patch b/net-dialup/slmodem/files/slmodem-2.9.9b-gcc4.patch
new file mode 100644
index 000000000000..b7fcea20eaf5
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.9b-gcc4.patch
@@ -0,0 +1,14 @@
+diff -Naur slmodem-2.9.9b.old/modem/modem.c slmodem-2.9.9b/modem/modem.c
+--- slmodem-2.9.9b.old/modem/modem.c	2004-06-29 21:13:07.000000000 +0800
++++ slmodem-2.9.9b/modem/modem.c	2005-04-30 14:16:57.000000000 +0800
+@@ -1599,9 +1599,9 @@
+ }
+ 
+ 
++static int sregs_init(unsigned char sregs[]);
+ int modem_reset(struct modem *m)
+ {
+-	static int sregs_init(unsigned char sregs[]);
+ 	MODEM_DBG("modem reset...\n");
+ 	if(m->state != STATE_MODEM_IDLE)
+ 		modem_hup(m,1);
diff --git a/net-dialup/slmodem/slmodem-2.9.9b.ebuild b/net-dialup/slmodem/slmodem-2.9.9b.ebuild
index 785d3b722cea..2d40adffb561 100644
--- a/net-dialup/slmodem/slmodem-2.9.9b.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9b.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/net-dialup/slmodem/slmodem-2.9.9b.ebuild,v 1.2 2005/03/14 15:44:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9b.ebuild,v 1.3 2005/05/29 12:35:33 mrness Exp $
 
 inherit eutils linux-mod
 
@@ -32,9 +32,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
 
-	epatch ${FILESDIR}/slmodem-2.9.9a-alsa.patch || die "failed to apply alsa patch"
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.9.9a-alsa.patch
+	epatch ${FILESDIR}/${PN}-2.9.9b-gcc4.patch
 
 	convert_to_m drivers/Makefile
 }
diff --git a/net-dialup/slmodem/slmodem-2.9.9d.ebuild b/net-dialup/slmodem/slmodem-2.9.9d.ebuild
index f092c4c4b25a..b4407537656b 100644
--- a/net-dialup/slmodem/slmodem-2.9.9d.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9d.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/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.1 2005/05/14 13:02:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.2 2005/05/29 12:35:33 mrness Exp $
 
 inherit eutils linux-mod
 
@@ -32,7 +32,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+
 	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.9.9b-gcc4.patch
 
 	convert_to_m drivers/Makefile
 }