Adding amd64 stuff

4 files changed, 58 insertions, 17 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index d460f9ba11a4..4ac6362cf10e 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.26 2003/07/15 20:02:46 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.27 2003/07/18 21:03:47 tester Exp $
+
+  01 Jul 2003; Olivier Crete <tester@gentoo.org> ppp-2.4.1-r14.ebuild:
+  fix for va_list on amd64 (its like ppc)
 
   15 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/net.ppp0:
   Do not update /etc/ppp/peers if no NUMBER is set - this is for non
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 684b64ed685a..1d1b5d8b539c 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,25 +1,26 @@
-MD5 389b1e6d9ec66445ba9b5140cd1f0cda ChangeLog 4428
+MD5 5fa0f7147a7070cd44b9bbb40feab1a3 ppp-2.4.1-r14.ebuild 4704
 MD5 0ed8d8e9cf25b5a4816b39a086f727f4 ppp-2.4.1-r11.ebuild 3126
-MD5 3b7ab1ee68669f90eaa32bc9d5e3953e ppp-2.4.1-r12.ebuild 3914
 MD5 39f95b3626ab5a6a1c0d4c322d9e935d ppp-2.4.1-r13.ebuild 4629
-MD5 990a582b88bf4953dd8bc3679b16bddc ppp-2.4.1-r14.ebuild 4660
+MD5 5e4bac0bbb8e03d7195673bdcf13cd31 ChangeLog 4542
+MD5 3b7ab1ee68669f90eaa32bc9d5e3953e ppp-2.4.1-r12.ebuild 3914
+MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
+MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
+MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
 MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
+MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
+MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
+MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
+MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
+MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
 MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r11 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r12 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r13 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
-MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
-MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
-MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
 MD5 b8c1ca853e3a004b064604d3f7877740 files/net.ppp0 4696
-MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
-MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
-MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
+MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
 MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
-MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
-MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
-MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
+MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
diff --git a/net-dialup/ppp/files/gcc33-amd64.patch b/net-dialup/ppp/files/gcc33-amd64.patch
new file mode 100644
index 000000000000..1daa9fc433a5
--- /dev/null
+++ b/net-dialup/ppp/files/gcc33-amd64.patch
@@ -0,0 +1,34 @@
+--- pppd/utils.c.orig	2003-07-01 17:13:31.000000000 +0000
++++ pppd/utils.c	2003-07-01 17:14:09.000000000 +0000
+@@ -253,11 +253,11 @@
+ 	    break;
+ 	case 'r':
+ 	    f = va_arg(args, char *);
+-#ifndef __powerpc__
+-	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
+-#else
++#if defined(__powerpc__) || defined(__x86_64__)
+ 	    /* On the powerpc, a va_list is an array of 1 structure */
+ 	    n = vslprintf(buf, buflen + 1, f, va_arg(args, void *));
++#else
++	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
+ #endif
+ 	    buf += n;
+ 	    buflen -= n;
+--- pppd/plugins/pppoe/utils.c.orig	2000-08-06 15:39:28.000000000 +0000
++++ pppd/plugins/pppoe/utils.c	2003-07-01 17:13:20.000000000 +0000
+@@ -182,11 +182,11 @@
+       continue;
+     case 'r':
+       f = va_arg (args, char *);
+-#ifndef __powerpc__
+-      n = vpoe_slprintf (buf, buflen + 1, f, va_arg (args, va_list));
+-#else
++#if defined(__powerpc__) || defined(__x86_64__)
+       /* On the powerpc, a va_list is an array of 1 structure */
+       n = vpoe_slprintf (buf, buflen + 1, f, va_arg (args, void *));
++#else
++      n = vpoe_slprintf (buf, buflen + 1, f, va_arg (args, va_list));
+ #endif
+       buf += n;
+       buflen -= n;
diff --git a/net-dialup/ppp/ppp-2.4.1-r14.ebuild b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
index c0f0bcb143c1..5f595c6179e6 100644
--- a/net-dialup/ppp/ppp-2.4.1-r14.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r14.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/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.5 2003/07/16 14:16:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.6 2003/07/18 21:03:47 tester Exp $
 
 IUSE="crypt ipv6 activefilter"
 S=${WORKDIR}/${P}.pppoe4
@@ -15,7 +15,7 @@ PROVIDE="virtual/pppd"
 
 SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="x86 ppc ~sparc ~hppa"
+KEYWORDS="x86 ppc ~sparc ~hppa amd64"
 
 src_unpack() {
 	unpack ${A}
@@ -37,6 +37,9 @@ src_unpack() {
 		pppd/Makefile.linux
 	}
 	epatch ${FILESDIR}/gcc3.3-multiline.patch
+
+	epatch ${FILESDIR}/gcc33-amd64.patch
+
 }
 
 src_compile() {