added gcc 4.3 + python 2.5 patches, minor ebuild cleanup. Solving bugs #221557, #226589, #232734 and #236777.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

3 files changed, 70 insertions, 20 deletions

diff --git a/net-dialup/capisuite/files/capisuite b/net-dialup/capisuite/files/capisuite
deleted file mode 100644
index 36e878eb1dbc..000000000000
--- a/net-dialup/capisuite/files/capisuite
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/files/capisuite,v 1.3 2004/07/14 23:14:33 agriffis Exp $
-
-depend() {
-	need capi
-}
-
-start() {
-	ebegin "Starting capisuite"
-	start-stop-daemon --start --quiet --pidfile /var/run/capisuite.pid --exec /usr/sbin/capisuite -- -d
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping capisuite"
-	killall -9 capisuite
-	eend $?
-}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch b/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch
new file mode 100644
index 000000000000..51326c30af6b
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch
@@ -0,0 +1,21 @@
+--- src/backend/connection.cpp.orig	2008-09-05 08:53:19.000000000 +0200
++++ src/backend/connection.cpp	2008-09-05 08:54:08.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <pthread.h>
+ #include <errno.h> // for errno
+ #include <iconv.h> // for iconv(), iconv_open(), iconv_close()
++#include <cstring>
+ #include "capi.h"
+ #include "callinterface.h"
+ #include "connection.h"
+
+--- src/backend/capi.cpp.orig	2008-09-05 09:01:18.000000000 +0200
++++ src/backend/capi.cpp	2008-09-05 09:01:38.000000000 +0200
+@@ -16,6 +16,7 @@
+ 
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ #include "connection.h"
+ #include "applicationinterface.h"
+ #include "capi.h"
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch b/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch
new file mode 100644
index 000000000000..e86919a2336d
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch
@@ -0,0 +1,49 @@
+--- src/application/pythonscript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
++++ src/application/pythonscript.cpp	2008-08-03 17:12:45.000000000 +0200
+@@ -99,14 +99,14 @@
+ 			if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) )
+ 				throw ApplicationError("unable to get traceback","PythonScript::run()");
+ 			
+-			int length;
++			Py_ssize_t length;
+ 			char *traceback;
+ 			if (PyString_AsStringAndSize(py_traceback, &traceback, &length))
+ 				throw ApplicationError("unable to convert traceback to char*","PythonScript::run()");
+ 
+                         error << prefix() << "A python error occured. See traceback below." << endl;
+ 			error << prefix(false) << "Python traceback: ";
+-			for (int i=0;i<length-1;i++) {
++			for (Py_ssize_t i=0;i<length-1;i++) {
+ 				error << traceback[i];
+ 				if (traceback[i]=='\n')
+ 					error << prefix(false) << "Traceback: ";
+--- src/application/idlescript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
++++ src/application/idlescript.cpp	2008-08-03 17:13:55.000000000 +0200
+@@ -28,6 +28,7 @@
+ 	IdleScript *instance=static_cast<IdleScript*>(arg);
+ 	instance->run();
+ 	pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
++	return NULL;
+ }
+ 
+ void idlescript_cleanup_handler(void* arg)
+--- src/application/incomingscript.cpp.orig	2004-11-28 14:35:24.000000000 +0100
++++ src/application/incomingscript.cpp	2008-08-03 17:14:36.000000000 +0200
+@@ -31,6 +31,7 @@
+ 	IncomingScript *instance=static_cast<IncomingScript*>(arg);
+ 	instance->run();
+ 	pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it
++	return NULL;
+ }
+ 
+ void incomingscript_cleanup_handler(void* arg)
+--- src/backend/capi.cpp.orig	2008-08-03 17:10:41.000000000 +0200
++++ src/backend/capi.cpp	2008-08-03 17:21:37.000000000 +0200
+@@ -30,6 +30,7 @@
+ 
+ 	Capi *instance=static_cast<Capi*>(arg);
+ 	instance->run();
++	return NULL;
+ }
+ 
+ Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError)