Fix gcc-4.3 build issues (bug #217755, thanks to Peter Alfredsen and Debian)

Package-Manager: portage-2.1.5_rc6

4 files changed, 40 insertions, 7 deletions

diff --git a/dev-libs/log4cpp/ChangeLog b/dev-libs/log4cpp/ChangeLog
index a9e4920c3192..a373d2de384a 100644
--- a/dev-libs/log4cpp/ChangeLog
+++ b/dev-libs/log4cpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/log4cpp
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.14 2007/10/13 08:04:38 dev-zero Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.15 2008/05/07 08:29:30 dev-zero Exp $
+
+  07 May 2008; Tiziano Müller <dev-zero@gentoo.org> +files/1.0-gcc43.patch,
+  log4cpp-1.0.ebuild:
+  Fix gcc-4.3 build issues (bug #217755, thanks to Peter Alfredsen and
+  Debian)
 
 *log4cpp-1.0 (13 Oct 2007)
 
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index ac0db71c5f8d..ea0daf1ee03f 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -1,10 +1,11 @@
 AUX 0.3.5_rc3-namespace_semikolon.patch 342 RMD160 8e8b044c5989ea2b96c392b51f7092e2f11ddd69 SHA1 572af1b4dfe4f7b6d2cc1c385a197029a256e68b SHA256 e421450ef33c1ef379e0819a32047611cd40fa1fc89b65fcead6340608f18604
 AUX 1.0-doc_install_path.patch 1150 RMD160 49e137bc740285f32c434866aae42ff4aac9141f SHA1 0ee7939b353566c019fbe1577fe1dda23139c763 SHA256 509681de09b218d922ecc1640f881ba5577d2d45817f40d01e644740ff84d507
+AUX 1.0-gcc43.patch 1166 RMD160 9d3584ca99aef96731ee85608cd099773e2e066b SHA1 9cf28ce49c6dfc81c47fa994bf4e3d8b5a6eee45 SHA256 f569a48f495d3a4b87f6b2174e845b3fe328dfbd759a795e7ace53beb71ff308
 DIST log4cpp-0.3.4b.tar.gz 323195 RMD160 da4f5a40c1c7023349e19bad8353ff286d3c28dc SHA1 60f1bf4eaf60a0ca45339b0b2a93abb9139a1fd8 SHA256 030f7cb38e0fe2c6cea8983bddba8d47c13a76c96c1327f394254dcbfd47efd5
 DIST log4cpp-0.3.5rc3.tar.gz 472249 RMD160 ee950db0d7fe1ef0ac0207c67a69dc0a05896fa3 SHA1 433f61f2dc0d64459d2dbafc24e93a315ee6638c SHA256 2bcfefc7a59cedd0e3754ed796fa025081e66a2bca5120687c8605ce417325e8
 DIST log4cpp-1.0.tar.gz 495726 RMD160 2ebc7c4bc0a77991023f4d85bdeee35ec6b75770 SHA1 bdb2fa7a8c8af738d79156bf9f6191875cdba5cc SHA256 b4533324b0a1f46ad74a9e92bf2caa46c246e9353059e1a835e735d41826ed19
 EBUILD log4cpp-0.3.4b.ebuild 1166 RMD160 ee84e4f74d440f2b71b73031494d1574505dd9e2 SHA1 71dd3b409850efd783204630f79dcf54e4824dd2 SHA256 b8e02ae18aeb13ed83c2b670b0bf8aec69001a6dd3b1dcd7aaa6054c15c51c52
 EBUILD log4cpp-0.3.5_rc3.ebuild 1313 RMD160 9b9d13e21cbec3d7a1d1ef18d2ae4f0c3b6b6642 SHA1 2b1deaf02a19af04ffd5338939619b48604e4fb4 SHA256 6e8507deb6f465d56b856613e2438dded1383120304fcdbfc4fae2d1a8525298
-EBUILD log4cpp-1.0.ebuild 984 RMD160 b8501f5fb521244baca70982a78f418e833f7830 SHA1 5e0eeffdba80c5437035dd69555017a89b63ba05 SHA256 6a9724290d27c5897141a1a5e30aa2967007a72ebdbd0dbd757205f45c36c88c
-MISC ChangeLog 1873 RMD160 e3e83f098f5ce856f5904cc2b2f8e02df6b7d87f SHA1 c7011446847ef1353c7fbc44dcb0cfa06203e68b SHA256 61e45f6cd8a741468e29e9357e4140fa5a675fdebc1ce1061261ececdc9bd511
+EBUILD log4cpp-1.0.ebuild 1020 RMD160 bd4ffbd5746f7f191ba5317a34fb2ce341be5a52 SHA1 3ed0270d71f2e6200801bd9e1c025a9e616aa3aa SHA256 15f46aeb320b53a2a693041b18683ac2aa3bc2e7821f5f2b60aa7c84815e0126
+MISC ChangeLog 2054 RMD160 060344f2ad85ae1cefe3921cb53ff9f713a8ed01 SHA1 dde4ed3619154a08c5be8589996357c3e7a30ee4 SHA256 533f6d71a127b91e7e6ed61690993776bad2fbe496914811ea567025034126d1
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
diff --git a/dev-libs/log4cpp/files/1.0-gcc43.patch b/dev-libs/log4cpp/files/1.0-gcc43.patch
new file mode 100644
index 000000000000..a60f986e9c0d
--- /dev/null
+++ b/dev-libs/log4cpp/files/1.0-gcc43.patch
@@ -0,0 +1,26 @@
+Index: log4cpp-1.0/src/BasicLayout.cpp
+===================================================================
+--- log4cpp-1.0.orig/src/BasicLayout.cpp	2008-03-14 16:06:57.000000000 -0400
++++ log4cpp-1.0/src/BasicLayout.cpp	2008-03-14 16:07:11.000000000 -0400
+@@ -15,6 +15,8 @@
+ #include <sstream>
+ #endif
+ 
++#include <memory>
++
+ namespace log4cpp {
+ 
+     BasicLayout::BasicLayout() {
+Index: log4cpp-1.0/src/PatternLayout.cpp
+===================================================================
+--- log4cpp-1.0.orig/src/PatternLayout.cpp	2008-03-14 16:07:33.000000000 -0400
++++ log4cpp-1.0/src/PatternLayout.cpp	2008-03-14 16:07:49.000000000 -0400
+@@ -370,7 +370,7 @@
+                         literal = "";
+                     }
+                     if ((minWidth != 0) || (maxWidth != 0)) {
+-                        component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0);
++                        component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0);
+                         minWidth = maxWidth = 0;
+                     }
+                     _components.push_back(component);
diff --git a/dev-libs/log4cpp/log4cpp-1.0.ebuild b/dev-libs/log4cpp/log4cpp-1.0.ebuild
index 11fb956edeab..62b9b7a8e1d1 100644
--- a/dev-libs/log4cpp/log4cpp-1.0.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/log4cpp-1.0.ebuild,v 1.1 2007/10/13 08:04:38 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/log4cpp-1.0.ebuild,v 1.2 2008/05/07 08:29:30 dev-zero Exp $
 
 NEED_AUTOCONF="latest"
 NEED_AUTOMAKE="latest"
@@ -23,7 +23,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PV}-doc_install_path.patch"
+	epatch "${FILESDIR}/${PV}-doc_install_path.patch" \
+		"${FILESDIR}/${PV}-gcc43.patch"
 
 	AT_M4DIR=m4
 	eautoreconf