Fix header for gcc 4.7 (bug #425110)

(Portage version: 2.2.0_alpha117/cvs/Linux x86_64)

5 files changed, 12 insertions, 77 deletions

diff --git a/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch b/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch
deleted file mode 100644
index fcc6042b057c..000000000000
--- a/dev-cpp/libassa/files/libassa-3.5.0-dont-run-ldconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 508d13e..2cd704e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,16 +40,3 @@ MAINTAINERCLEANFILES = \
- 	*.log core FILE *~ Makefile.in configure config.h.in \
- 	config.status aclocal.m4 config.guess config.sub \
- 	depcomp install-sh mkinstalldirs missing
--
--
--# Run ldconfig after installing the library:
--#
--#   '-ldconfig' expands into 'PATH="$PATH:/sbin" ldconfig -n /usr/local/bin'
--#
--# Somehow, this doen't work.
--#
--install-exec-hook:
--	-ldconfig
--
--uninstall-hook:
--	-ldconfig
diff --git a/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch b/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch
deleted file mode 100644
index 02e3f9232a8c..000000000000
--- a/dev-cpp/libassa/files/libassa-3.5.0-gcc44.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/libassa-3.5.0-ldflags.patch b/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch
deleted file mode 100644
index 22a65c1ea8dc..000000000000
--- a/dev-cpp/libassa/files/libassa-3.5.0-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 3d95d22..82c2345 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -15,7 +15,7 @@ noinst_PROGRAMS = bytereader
- ASSADIR = ${top_srcdir}/assa
- INCLUDES = -I$(top_srcdir)
- 
--LDFLAGS = -static
-+LDFLAGS += -static
- LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@
- 
- bytereader_SOURCES   = bytereader.cpp
diff --git a/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch b/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch
deleted file mode 100644
index 883fed474961..000000000000
--- a/dev-cpp/libassa/files/libassa-3.5.0-link-dynamically.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 82c2345..6550015 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -15,8 +15,8 @@ noinst_PROGRAMS = bytereader
- ASSADIR = ${top_srcdir}/assa
- INCLUDES = -I$(top_srcdir)
- 
--LDFLAGS += -static
--LDADD = $(top_builddir)/assa/libassa-@ASSA_RELEASE@.la @WIN32_EXTRA_LIBADD@
-+LDFLAGS += -L$(top_builddir)/assa/.libs
-+LIBS = -lassa-3.5
- 
- bytereader_SOURCES   = bytereader.cpp
- 
diff --git a/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch b/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch
new file mode 100644
index 000000000000..725636a3967c
--- /dev/null
+++ b/dev-cpp/libassa/files/libassa-3.5.1-gcc47.patch
@@ -0,0 +1,12 @@
+diff --git a/assa/CommonUtils.h b/assa/CommonUtils.h
+index 2db38d2..4db27f6 100644
+--- a/assa/CommonUtils.h
++++ b/assa/CommonUtils.h
+@@ -16,6 +16,7 @@
+ 
+ #include <sstream>
+ 
++#include <unistd.h>
+ #include <string> 
+ #include <vector>
+ using std::vector;