Fixed gcc-4.3.x compilation (bug #227617), dropped old version.

(Portage version: 2.1.5.5)

4 files changed, 23 insertions, 29 deletions

diff --git a/dev-libs/socketstream/ChangeLog b/dev-libs/socketstream/ChangeLog
index 29018f965083..3c41cc4c0c32 100644
--- a/dev-libs/socketstream/ChangeLog
+++ b/dev-libs/socketstream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/socketstream
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/ChangeLog,v 1.14 2008/05/12 01:33:10 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/ChangeLog,v 1.15 2008/06/16 20:14:10 dev-zero Exp $
+
+  16 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/0.7.0-missing_includes.patch, -socketstream-0.3.0.ebuild,
+  socketstream-0.7.0-r1.ebuild:
+  Fixed gcc-4.3.x compilation (bug #227617), dropped old version.
 
   12 May 2008; Mark Loeser <halcy0n@gentoo.org>
   socketstream-0.7.0-r1.ebuild:
diff --git a/dev-libs/socketstream/files/0.7.0-missing_includes.patch b/dev-libs/socketstream/files/0.7.0-missing_includes.patch
new file mode 100644
index 000000000000..22c29379ed10
--- /dev/null
+++ b/dev-libs/socketstream/files/0.7.0-missing_includes.patch
@@ -0,0 +1,11 @@
+diff -Naur socketstream-0.7.0.orig/src/socket_exception.cc socketstream-0.7.0/src/socket_exception.cc
+--- socketstream-0.7.0.orig/src/socket_exception.cc	2008-06-16 22:08:13.000000000 +0200
++++ socketstream-0.7.0/src/socket_exception.cc	2008-06-16 22:09:00.000000000 +0200
+@@ -24,6 +24,7 @@
+ 
+ #include <socketstream/socket_exception.h>
+ #include <cerrno>
++#include <cstring>
+ 
+ namespace ss {
+ 
diff --git a/dev-libs/socketstream/socketstream-0.3.0.ebuild b/dev-libs/socketstream/socketstream-0.3.0.ebuild
deleted file mode 100644
index a1ed3fc34c2f..000000000000
--- a/dev-libs/socketstream/socketstream-0.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/socketstream-0.3.0.ebuild,v 1.7 2008/05/12 01:33:10 halcy0n Exp $
-
-DESCRIPTION="C++ Streaming sockets library"
-SRC_URI="mirror://sourceforge/socketstream/${P}.tar.gz"
-HOMEPAGE="http://socketstream.sourceforge.net/"
-
-SLOT="0"
-
-LICENSE="LGPL-2"
-KEYWORDS="~x86 alpha ~ppc ~sparc ~hppa amd64"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
index 77a8fd564b04..7530a2ce9b00 100644
--- a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
+++ b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild,v 1.5 2008/05/12 01:33:10 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild,v 1.6 2008/06/16 20:14:10 dev-zero Exp $
+
+inherit eutils
 
 DESCRIPTION="C++ Streaming sockets library"
 HOMEPAGE="http://socketstream.sourceforge.net/"
@@ -20,6 +22,8 @@ src_unpack() {
 	# include/Makefile uses DIST_SUBDIRS and thus headers dont get installed
 	sed -i 's|^DIST_\(SUBDIRS =\)|\1|' include/Makefile.in || \
 		die "sed include/Makefile.in failed"
+
+	epatch "${FILESDIR}/${PV}-missing_includes.patch"
 }
 
 src_compile() {
@@ -32,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README* HACKING TODO
 	use doc && dohtml -r docs/html/*
 }