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

Package-Manager: portage-2.1.5.5

5 files changed, 26 insertions, 43 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/Manifest b/dev-libs/socketstream/Manifest
index 8b71665387e4..b5c3b7cce715 100644
--- a/dev-libs/socketstream/Manifest
+++ b/dev-libs/socketstream/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST socketstream-0.3.0.tar.gz 267616 RMD160 85ba7f01e11eb48ae28cc1df343b2ea2213e3a6d SHA1 936810cb4635935f3ce02130aa8372f6ee0f5d0e SHA256 9a518a91644dfe29aaa3634642a0e0ab2297e8b661d86962c3b5c2238a0e8b16
+AUX 0.7.0-missing_includes.patch 396 RMD160 f0e83146718def8858867384caf1fdb914f29b6a SHA1 91eb60618083743ced337685771279ed61e22b49 SHA256 0adfb95daa4c9aa063478a6d621bda1a86f988aceb38319560566ef01de01ba2
 DIST socketstream-0.7.0.tar.gz 464806 RMD160 6ec6b65ce1235cbb47093eab97803f84440680cd SHA1 5f80f18020502d5d558786fb701374b9b27fb3ad SHA256 98f3dd7d3a20b8efd882032871f4c680508dfbf7f6f704ff010f029974d778fd
-EBUILD socketstream-0.3.0.ebuild 598 RMD160 c27ed1d06b0163edacf6e9a257c154d5bde13129 SHA1 4a77abb421536c9146ab0c740a883615cb5786fa SHA256 1e40ecd9a8047cdd82bf6045aa4c2af8663460e73f910852595fd8b18a659b28
-EBUILD socketstream-0.7.0-r1.ebuild 1036 RMD160 e54b34886738c167440a1526c76f39654629a0d4 SHA1 0fe59f6a82707dbf751f9ea7206fbbb798740833 SHA256 e32f2f523257af565606a9cde2849ac245ed684c523da22fa633e1d66ad664bb
-MISC ChangeLog 1814 RMD160 d1042e433971daa0d024b27581d0711f604f4020 SHA1 7f1045c0568f3ab2915bfdabe3f5d99196ec28ac SHA256 ef5e60beed398030184dbcb394e62921a7878fbb83537df2c09a27ad64ee4c7f
+EBUILD socketstream-0.7.0-r1.ebuild 1106 RMD160 1d0406d9f0b4a1c132498cdadb64b4423b99c189 SHA1 ab9af121c0a1a2af8b682999a78ff8dfba13fb90 SHA256 3a6f0cbc0d23829aca76d2f3025b3080e4002b3f154ec7d3b55234d37e8feb73
+MISC ChangeLog 2034 RMD160 6d65d573e653d4281f114a98f78a7f16c9bf525a SHA1 2f37abed1b0617cfd5475175fe02110284c0b883 SHA256 25b58fb6a9c56c19150fa9febd8b354e768c54278ac973ad3f46e67cc6b42d4d
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgnnp0ACgkQCRZPokWLroQ2LgCfRojO6BjtUKYMsxEFp11jP8w1
-lK4AoIBum7KTM4y62/hO2xbwd95VSbU4
-=zUT4
------END PGP SIGNATURE-----
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/*
 }