version bump as per bug #37311. x86 stable on 0.4.3. Depandancies fixed.

6 files changed, 193 insertions, 9 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index 6d8480510a6d..0c628df6b921 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/capisuite
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.5 2004/06/24 22:24:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.6 2004/10/01 22:28:53 dragonheart Exp $
+
+*capisuite-0.4.4 (02 Oct 2004)
+
+  02 Oct 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/capisuite-0.4.4-gentoo.patch, capisuite-0.4.3.ebuild,
+  +capisuite-0.4.4.ebuild:
+  version bump as per bug #37311. ebuild thanks to Kai Leibrandt
+  <k_leibrandt@hotmail.com>. x86 stable on 0.4.3. Depandancies fixed.
 
   22 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> capisuite-0.4.3.ebuild:
   fix DESCRIPTION, HOMEPAGE, SRC_URI (bug #54714)
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index d2776b3029b1..981df53ffb7d 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -1,6 +1,19 @@
-MD5 a2ddc0a768006693e2140933d28fb66a capisuite-0.4.3.ebuild 989
-MD5 daaaf22d6d71c303e5b862d6dedee026 ChangeLog 777
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f0ddf50df7ed252da6b77d930c4758dd ChangeLog 1091
+MD5 24332ce69c882d6bb66dafe08ded8569 capisuite-0.4.3.ebuild 1036
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 6bfbe2e10f339def42ea4cba8a35c0aa capisuite-0.4.4.ebuild 1017
 MD5 a6bdc491a9d9a33c0f41c68f06a320ca files/capisuite 487
-MD5 bb4582d756f7452bbb11542fd3c7dc46 files/digest-capisuite-0.4.3 68
 MD5 8cf7cf4419129ea9e97fc080c15ba077 files/capisuite-0.4.3-gentoo.patch 2238
+MD5 bb4582d756f7452bbb11542fd3c7dc46 files/digest-capisuite-0.4.3 68
+MD5 bebbd5c8d5175a594c2764902f77cb3d files/capisuite-0.4.4-gentoo.patch 3668
+MD5 3a5b2463d3fa18ad6f1fcf5f800f14c8 files/digest-capisuite-0.4.4 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBXdotmdTrptrqvGERAmumAKCScKaNgh8raT3kE1xHorYyhl013ACdFoE1
+3rK29y/Vm+vSF1bUMxmHU1E=
+=zqTW
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/capisuite/capisuite-0.4.3.ebuild b/net-dialup/capisuite/capisuite-0.4.3.ebuild
index 209c531598ee..9d02aa513d73 100644
--- a/net-dialup/capisuite/capisuite-0.4.3.ebuild
+++ b/net-dialup/capisuite/capisuite-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.3.ebuild,v 1.5 2004/06/24 22:24:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.3.ebuild,v 1.6 2004/10/01 22:28:53 dragonheart Exp $
 
 inherit eutils
 
@@ -10,16 +10,17 @@ SRC_URI="http://www.capisuite.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="net-dialup/capi4k-utils
+RDEPEND="<net-dialup/capi4k-utils-20040810
 	dev-lang/python"
 
-RDEPEND="sys-devel/patch
+DEPEND="sys-devel/patch
 	media-sound/sox
 	media-libs/tiff
-	virtual/ghostscript"
+	virtual/ghostscript
+	<net-dialup/capi4k-utils-20040810"
 
 src_unpack() {
 
diff --git a/net-dialup/capisuite/capisuite-0.4.4.ebuild b/net-dialup/capisuite/capisuite-0.4.4.ebuild
new file mode 100644
index 000000000000..270f51b1d39e
--- /dev/null
+++ b/net-dialup/capisuite/capisuite-0.4.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.4.ebuild,v 1.1 2004/10/01 22:28:53 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="An ISDN telecommunication suite"
+HOMEPAGE="http://www.capisuite.de"
+SRC_URI="http://www.capisuite.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="net-dialup/capi4k-utils
+	dev-lang/python"
+
+DEPEND="sys-devel/patch
+	media-sound/sox
+	media-libs/tiff
+	virtual/ghostscript
+	net-dialup/capi4k-utils"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+}
+
+src_compile() {
+
+	myconf="--localstatedir=/var \
+		--with-docdir=/usr/share/doc/${P}"
+
+	econf ${myconf} || die "econf failed."
+	emake DESTDIR=${D} || die "parallel make failed."
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "install failed."
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/capisuite
+
+	dodoc AUTHORS COPYING INSTALL NEWS README TODO
+
+}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.4-gentoo.patch b/net-dialup/capisuite/files/capisuite-0.4.4-gentoo.patch
new file mode 100644
index 000000000000..edb8d5d620cb
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.4-gentoo.patch
@@ -0,0 +1,109 @@
+diff -ur Makefile.in Makefile.in
+--- Makefile.in	2003-11-28 02:29:42.000000000 +1300
++++ Makefile.in	2003-11-28 02:47:26.000000000 +1300
+@@ -132,7 +132,7 @@
+ target_alias = @target_alias@
+ spooldir = @localstatedir@/spool/capisuite
+ pkgsysconfdir = @sysconfdir@/capisuite
+-doc_DATA = COPYING NEWS README
++doc_DATA =
+ EXTRA_DIST = rc.capisuite.in capisuite.cronin cronjob.conf
+ 
+ SUBDIRS = src scripts docs
+diff -ur docs/Makefile.in docs/Makefile.in
+--- docs/Makefile.in	2003-11-28 02:29:42.000000000 +1300
++++ docs/Makefile.in	2003-11-28 02:38:06.000000000 +1300
+@@ -322,9 +322,6 @@
+ 		$(mkinstalldirs) $(DESTDIR)$(docdir) ; \
+ 		cp -r manual $(DESTDIR)$(docdir)/ ; \
+ 	fi
+-	if test -f manual.pdf; then \
+-		cp manual.pdf $(DESTDIR)$(docdir)/ ; \
+-	fi
+ 
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(docdir) 
+diff -ur scripts/Makefile.in scripts/Makefile.in
+--- scripts/Makefile.in	2003-11-28 02:29:42.000000000 +1300
++++ scripts/Makefile.in	2003-11-28 02:48:43.000000000 +1300
+@@ -133,7 +133,7 @@
+ spooldir = @localstatedir@/spool/capisuite
+ pkgsysconfdir = @sysconfdir@/capisuite
+ 
+-dist_pkglib_DATA = idle.py incoming.py README
++dist_pkglib_DATA = idle.py incoming.py
+ python_module_DATA = cs_helpers.py
+ EXTRA_DIST = cs_helpers.pyin fax.confin answering_machine.confin capisuitefax.in
+ 
+diff -ur scripts/waves/Makefile.in scripts/waves/Makefile.in
+--- scripts/waves/Makefile.in	2003-11-28 02:29:42.000000000 +1300
++++ scripts/waves/Makefile.in	2003-11-28 04:09:31.000000000 +1300
+@@ -138,7 +138,7 @@
+ 	bitte-neue-ansage-komplett.la neue-ansage-lautet.la wenn-einverstanden-1.la \
+ 	bitte-neue-ansage-kurz.la ansage-gespeichert.la und.la ein.la 10.la 11.la \
+ 	12.la 13.la 14.la 15.la 16.la 17.la 18.la 19.la 20.la 30.la 40.la 50.la 60.la \
+-	70.la 80.la 90.la fernabfrage-aktiv.la unbekannt.la +.la README
++	70.la 80.la 90.la fernabfrage-aktiv.la unbekannt.la +.la
+ 
+ subdir = scripts/waves
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+diff -ur acinclude.m4 acinclude.m4
+--- acinclude.m4      2003-11-28 02:29:42.000000000 +1300
++++ acinclude.m4       2004-08-11 00:04:41.152302480 +0200
+@@ -39,6 +39,19 @@
+ )
+ ]) dnl CS_TEST_GCC
+
++AC_DEFUN([CS_TEST_CAPI4LINUX],
++[AC_MSG_CHECKING([for new ALERT_REQ signature in capiutils.h])
++AC_TRY_COMPILE([#include <capiutils.h>],
++  [ALERT_REQ (NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);],
++  [
++    AC_DEFINE([HAVE_NEW_CAPI4LINUX],1,[we have new ALERT_REQ implementation])
++    AC_MSG_RESULT([yes])
++  ],
++  AC_MSG_RESULT([no])
++)
++]) dnl CS_TEST_CAPI4LINUX
++
++
+ # PGAC_CHECK_PYTHON_DIRS
+ # -----------------------
+ # Determine the name of various directory of a given Python installation.
+
+diff -ur configure.in configure.in
+--- configure.in      2003-11-28 02:29:42.000000000 +1300
++++ configure.in       2004-08-11 00:04:41.152302480 +0200
+@@ -16,6 +16,7 @@
+ AC_HEADER_TIME
+
+ CS_TEST_GCC3
++CS_TEST_CAPI4LINUX
+
+ CS_SET_DOCDIR
+
+--- src/backend/capi.cpp	2003-11-06 19:32:15.000000000 +0100
++++ src/backend/capi.cpp	2004-08-11 00:07:42.672707184 +0200
+@@ -19,6 +19,7 @@
+ #include "connection.h"
+ #include "applicationinterface.h"
+ #include "capi.h"
++#include "../../config.h"
+ 
+ void* capi_exec_handler(void* arg)
+ {
+@@ -117,7 +118,12 @@
+ 	if (debug_level >= 2) {
+ 	    	debug << prefix() << ">ALERT_REQ: ApplId 0x" << hex << applId << ", MsgNr 0x" << messageNumber << ", PLCI 0x" << plci << endl;
+ 	}
+-	unsigned info=ALERT_REQ(&CMSG, applId, messageNumber++, plci, NULL, NULL, NULL, NULL);
++	unsigned info=ALERT_REQ(&CMSG, applId, messageNumber++, plci,
++		NULL, NULL, NULL, NULL
++	#ifdef HAVE_NEW_CAPI4LINUX
++		, NULL
++	#endif
++		);
+ 	if (debug_level >= 2) {
+ 	    	debug << prefix() << "info: " << info << endl;
+ 	}
diff --git a/net-dialup/capisuite/files/digest-capisuite-0.4.4 b/net-dialup/capisuite/files/digest-capisuite-0.4.4
new file mode 100644
index 000000000000..5a0d4bd45736
--- /dev/null
+++ b/net-dialup/capisuite/files/digest-capisuite-0.4.4
@@ -0,0 +1 @@
+MD5 d7ec4780253576cc3bcb136993cf352c capisuite-0.4.4.tar.gz 1153436