Fix server busy loop with 64bit architectures. Fix parallel make. Fix building with GCC 4.3 wrt #218831, thanks to Peter Alfredsen. Also, run full eautoreconf to fix obscure compile failure where _init gets redefined.

(Portage version: 2.1.5_rc6)

5 files changed, 105 insertions, 10 deletions

diff --git a/net-libs/libcapsinetwork/ChangeLog b/net-libs/libcapsinetwork/ChangeLog
index 72c0bd9a85ed..412e0655ab76 100644
--- a/net-libs/libcapsinetwork/ChangeLog
+++ b/net-libs/libcapsinetwork/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/libcapsinetwork
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/ChangeLog,v 1.14 2007/05/15 14:09:45 bangert Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/ChangeLog,v 1.15 2008/05/04 09:57:41 drac Exp $
+
+  04 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/libcapsinetwork-0.3.0-64bit.patch,
+  +files/libcapsinetwork-0.3.0-gcc43.patch,
+  +files/libcapsinetwork-0.3.0-parallel.patch, libcapsinetwork-0.3.0.ebuild:
+  Fix server busy loop with 64bit architectures. Fix parallel make. Fix
+  building with GCC 4.3 wrt #218831, thanks to Peter Alfredsen. Also, run
+  full eautoreconf to fix obscure compile failure where _init gets
+  redefined.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-64bit.patch b/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-64bit.patch
new file mode 100644
index 000000000000..23cd97d23114
--- /dev/null
+++ b/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-64bit.patch
@@ -0,0 +1,20 @@
+--- libcapsinetwork-0.3.0.old/src/socket.cpp	2004-07-15 05:39:28.000000000 -0400
++++ libcapsinetwork-0.3.0/src/socket.cpp	2007-10-10 07:36:41.000000000 -0400
+@@ -49,7 +49,7 @@
+ const bool Socket::hasReadLine()
+ {
+ 	static std::string newLine = "\r\n";
+-	unsigned int pos = m_ioBuf.find_first_of(newLine);
++	std::string::size_type pos = m_ioBuf.find_first_of(newLine);
+ 
+ 	return (!(pos == std::string::npos));
+ }
+@@ -57,7 +57,7 @@
+ const std::string Socket::readLine()
+ {
+ 	static std::string newLine = "\r\n";
+-	unsigned int pos = m_ioBuf.find_first_of(newLine);
++	std::string::size_type pos = m_ioBuf.find_first_of(newLine);
+ 
+ 	if (pos != std::string::npos)
+ 	{
diff --git a/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-gcc43.patch b/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-gcc43.patch
new file mode 100644
index 000000000000..686da3390259
--- /dev/null
+++ b/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-gcc43.patch
@@ -0,0 +1,44 @@
+diff -urN libcapsinetwork-0.3.0.old/src/listener.cpp libcapsinetwork-0.3.0/src/listener.cpp
+--- libcapsinetwork-0.3.0.old/src/listener.cpp	2008-01-08 18:10:17.000000000 -0500
++++ libcapsinetwork-0.3.0/src/listener.cpp	2008-01-08 18:15:51.000000000 -0500
+@@ -31,6 +31,7 @@
+ 
+ #include <netdb.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #include "listener.h"
+ #include "listenport.h"
+diff -urN libcapsinetwork-0.3.0.old/src/listenport.cpp libcapsinetwork-0.3.0/src/listenport.cpp
+--- libcapsinetwork-0.3.0.old/src/listenport.cpp	2004-07-15 05:39:28.000000000 -0400
++++ libcapsinetwork-0.3.0/src/listenport.cpp	2008-01-08 18:15:51.000000000 -0500
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include "listenport.h"
+ 
+diff -urN libcapsinetwork-0.3.0.old/src/server.cpp libcapsinetwork-0.3.0/src/server.cpp
+--- libcapsinetwork-0.3.0.old/src/server.cpp	2008-01-08 18:10:17.000000000 -0500
++++ libcapsinetwork-0.3.0/src/server.cpp	2008-01-08 18:15:51.000000000 -0500
+@@ -26,6 +26,7 @@
+ 
+ #include <string>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ // In real applications, use the following include instead of the local.
+ // #include <libcapsinetwork/socket.h>
+diff -urN libcapsinetwork-0.3.0.old/src/socket.cpp libcapsinetwork-0.3.0/src/socket.cpp
+--- libcapsinetwork-0.3.0.old/src/socket.cpp	2008-01-08 18:10:17.000000000 -0500
++++ libcapsinetwork-0.3.0/src/socket.cpp	2008-01-08 18:15:13.000000000 -0500
+@@ -25,6 +25,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include "socket.h"
+ 
diff --git a/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-parallel.patch b/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-parallel.patch
new file mode 100644
index 000000000000..6cba499c92ff
--- /dev/null
+++ b/net-libs/libcapsinetwork/files/libcapsinetwork-0.3.0-parallel.patch
@@ -0,0 +1,12 @@
+diff -urN libcapsinetwork-0.3.0.old/src/Makefile.am libcapsinetwork-0.3.0/src/Makefile.am
+--- libcapsinetwork-0.3.0.old/src/Makefile.am	2004-07-15 05:39:28.000000000 -0400
++++ libcapsinetwork-0.3.0/src/Makefile.am	2007-10-10 07:09:59.000000000 -0400
+@@ -8,7 +8,7 @@
+ 
+ noinst_PROGRAMS = exampleserver
+ exampleserver_SOURCES = server.cpp
+-exampleserver_LDADD = -L. -lcapsinetwork
++exampleserver_LDADD = ./libcapsinetwork.la
+ exampleserverincdir = .
+ 
+ noinst_HEADERS = listenport.h server.h
diff --git a/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild b/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild
index 7f4d770cd059..efe201f369c4 100644
--- a/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild
+++ b/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild
@@ -1,24 +1,34 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild,v 1.1 2004/07/19 19:14:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libcapsinetwork/libcapsinetwork-0.3.0.ebuild,v 1.2 2008/05/04 09:57:41 drac Exp $
 
-inherit flag-o-matic
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="C++ network library to allow fast development of server daemon processes"
-HOMEPAGE="http://unixcode.org/libcapsinetwork/"
+HOMEPAGE="http://unixcode.org/libcapsinetwork"
 SRC_URI="http://unixcode.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-64bit.patch
+	eautoreconf
+}
+
 src_compile() {
 	filter-flags -fomit-frame-pointer
-	econf || die
-	emake -j1 || die "emake failed"
+	econf
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }