Fix building with GCC 4.4+ wrt #281733.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 44 insertions, 4 deletions

diff --git a/dev-cpp/libassa/ChangeLog b/dev-cpp/libassa/ChangeLog
index 3df07414fbb3..4cc41b2b6e51 100644
--- a/dev-cpp/libassa/ChangeLog
+++ b/dev-cpp/libassa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/libassa
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/ChangeLog,v 1.6 2009/04/14 13:22:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/ChangeLog,v 1.7 2009/09/04 10:33:22 ssuominen Exp $
+
+  04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> libassa-3.5.0.ebuild,
+  +files/libassa-3.5.0-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #281733.
 
   14 Apr 2009; Raúl Porcel <armin76@gentoo.org> libassa-3.5.0.ebuild:
   Add ~x86 wrt #265897
diff --git a/dev-cpp/libassa/Manifest b/dev-cpp/libassa/Manifest
index 3604e131943d..877b73b0987a 100644
--- a/dev-cpp/libassa/Manifest
+++ b/dev-cpp/libassa/Manifest
@@ -1,4 +1,5 @@
+AUX libassa-3.5.0-gcc44.patch 1093 RMD160 924d77ba42a188ad896dc1b2415f78af7571e82f SHA1 a2016fc161c6b425a6fbcb704b7ce3ed79b0ab6e SHA256 c6a4e0e310201b600a7b89c0f132e1c6d628954b010ec484a8c943a48b7426a7
 DIST libassa-3.5.0.tar.gz 586237 RMD160 4919157cdf3fd75c42aed571328c0033867aa5eb SHA1 b3813fa952dec3ece621606a919035f308798a7a SHA256 72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314
-EBUILD libassa-3.5.0.ebuild 543 RMD160 e1aeeae9c11b9f6b0f922d9129cfaede4a761587 SHA1 6c6d8eeb05208ad08dbc7463d78e69cdf1fcdc62 SHA256 48b8d265315d18ed6684713930645e26d41e934ce93b2efd5ab15e0cca8deea7
-MISC ChangeLog 818 RMD160 da03456ed1cfffc80e1e1d9f95967a0ff5302388 SHA1 6a22a8ae17536b10293d5692b3be3786a8006c92 SHA256 65d8930adbd91402dfe58d4e46ccd736dab9488d2aff154b9de2d8731b3adfbc
+EBUILD libassa-3.5.0.ebuild 626 RMD160 bfb5d5cae7cb6bf2bcbe866aa89572b58061fe36 SHA1 a6a9eaa0ef19cf2b8f6927a5e3b9c9a930d4a6d3 SHA256 0fb12db7b9edb985cf34992bd7f7db7b42bb3f64c33fdc1c5a3e6fe389d49d14
+MISC ChangeLog 975 RMD160 b3ed1924384b99964968158f7ef13a58d28271a2 SHA1 f787baa23d180b54d22668942685854108ef8618 SHA256 27dec60df88a5c7bf9d1097eeff99a9d263f9ed582dcc00307bd5b276dad1542
 MISC metadata.xml 258 RMD160 6d4c6c4e7c021a3fc82145a078f8e113eb6f521a SHA1 02004f2821b6ac3f69abfbfdafc9744008535258 SHA256 ee85021b7ae93a2e1442a570b114d3c9bf2e577c16b7b1b409914983d5d55485
diff --git a/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch b/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch
new file mode 100644
index 000000000000..02e3f9232a8c
--- /dev/null
+++ b/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch
@@ -0,0 +1,28 @@
+For va_list in gcc 4.4+ and glibc system stdarg.h is always required. For gcc 4.4+ including stdio.h
+is required because of headers clean up.
+
+Patch by Samuli Suominen <ssuominen@gentoo.org>
+
+diff -ur libassa-3.5.0.orig/assa/Logger_Impl.cpp libassa-3.5.0/assa/Logger_Impl.cpp
+--- libassa-3.5.0.orig/assa/Logger_Impl.cpp	2006-07-20 05:30:54.000000000 +0300
++++ libassa-3.5.0/assa/Logger_Impl.cpp	2009-09-04 13:26:26.000000000 +0300
+@@ -14,6 +14,7 @@
+ 
+ #include <iostream>
+ #include <iomanip>
++#include <stdio.h>				// vsnprintf(3)
+ #include <string.h>				// strerror(3)
+ 
+ #include "assa/TimeVal.h"
+diff -ur libassa-3.5.0.orig/assa/Logger_Impl.h libassa-3.5.0/assa/Logger_Impl.h
+--- libassa-3.5.0.orig/assa/Logger_Impl.h	2006-07-20 05:30:54.000000000 +0300
++++ libassa-3.5.0/assa/Logger_Impl.h	2009-09-04 13:29:45.000000000 +0300
+@@ -21,7 +21,7 @@
+ #include <sys/varargs.h>		// va_list
+ #endif
+ 
+-#if defined (__CYGWIN32__) || defined (__NetBSD__) || defined (WIN32)
++#if defined (__CYGWIN32__) || defined (__NetBSD__) || defined (WIN32) || defined (__GLIBC__)
+ # include <stdarg.h>
+ #endif
+ 
diff --git a/dev-cpp/libassa/libassa-3.5.0.ebuild b/dev-cpp/libassa/libassa-3.5.0.ebuild
index 9c1bbb4d1ef6..3c1be770af93 100644
--- a/dev-cpp/libassa/libassa-3.5.0.ebuild
+++ b/dev-cpp/libassa/libassa-3.5.0.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.0.ebuild,v 1.3 2009/04/14 13:22:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.0.ebuild,v 1.4 2009/09/04 10:33:22 ssuominen Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="A networking library based on Adaptive Communication Patterns"
 HOMEPAGE="http://libassa.sourceforge.net/"
@@ -11,6 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO