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

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)

5 files changed, 174 insertions, 21 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index aa779ebde3e7..d0ab3b18416f 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.32 2008/05/29 14:29:53 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.33 2008/09/13 22:39:00 sbriesen Exp $
+
+*capisuite-0.4.5-r5 (13 Sep 2008)
+
+  13 Sep 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/capisuite-0.4.5-gcc43.patch, +files/capisuite-0.4.5-python25.patch,
+  -files/capisuite, +capisuite-0.4.5-r5.ebuild:
+  added gcc 4.3 + python 2.5 patches, minor ebuild cleanup. Solving bugs
+  #221557, #226589, #232734 and #236777.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> capisuite-0.4.5-r4.ebuild:
   python_mod_compile is ROOT aware. Fixed python_mod_cleanup.
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild
new file mode 100644
index 000000000000..8b846afdf376
--- /dev/null
+++ b/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r5.ebuild,v 1.1 2008/09/13 22:39:00 sbriesen Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools flag-o-matic multilib python
+
+DESCRIPTION="ISDN telecommunication suite providing fax and voice services"
+HOMEPAGE="http://www.capisuite.de"
+SRC_URI="http://www.capisuite.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/python
+	media-sound/sox
+	>=media-libs/tiff-3.7.1
+	media-gfx/jpeg2ps
+	media-gfx/sfftobmp
+	virtual/ghostscript
+	net-dialup/capi4k-utils"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# taken from capisuite-0.4.5-5.src.rpm (SuSE-9.3)
+	epatch "${FILESDIR}/${P}-capi4linux_v3.diff"
+
+	# patched scripts/cs_helpers.pyin (bug #96540)
+	epatch "${FILESDIR}/${P}-date-header.patch"
+
+	# patched src/backend/connection.cpp (bug #69522)
+	epatch "${FILESDIR}/${PN}-fax-compatibility.patch"
+
+	# patched scripts/{incoming,idle}.py (bug #147854)
+	epatch "${FILESDIR}/${P}-syntax.patch"
+
+	# GCC 4.3 patches (bug #236777)
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	# Python 2.5 patches (bug #232734)
+	epatch "${FILESDIR}/${P}-python25.patch"
+
+	# run autotools
+	eautoreconf
+}
+
+src_compile() {
+	strip-flags  # see bug #90901
+
+	econf --localstatedir=/var \
+		--with-docdir="/usr/share/doc/${PF}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed."
+
+	rm -f "${D}"/usr/{lib,share}/capisuite/README
+	rmdir -p --ignore-fail-on-non-empty "${D}/var/log"
+	rm -f "${D}/usr/share/doc/${PF}"/{COPYING,manual.pdf}
+	keepdir /var/spool/capisuite/{done,failed,sendq,users}
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}/capisuite.initd" capisuite
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/capisuite.logrotated" capisuite
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	exeinto /etc/cron.daily
+	doexe capisuite.cron
+
+	insinto /etc/capisuite
+	doins cronjob.conf
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/cs_helpers.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
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)