Add a patch fixing gcc 4.1 compile time error.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 38 insertions, 4 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index e767070bc8cc..eac2af2c3676 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.149 2010/01/09 16:50:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.150 2010/01/14 22:04:00 peper Exp $
+
+  14 Jan 2010; Piotr Jaroszyński <peper@gentoo.org> paludis-0.44.0.ebuild,
+  +files/paludis-0.44.0-gcc41-fix.patch:
+  Add a patch fixing gcc 4.1 compile time error.
 
 *paludis-0.44.0 (09 Jan 2010)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 7e94591c9ba2..84b4e7e4ba0f 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,3 +1,4 @@
+AUX paludis-0.44.0-gcc41-fix.patch 882 RMD160 cd71e28315bb4d7230bc319601a2b6470199e48e SHA1 c27774d405c21219b9dacab64ebf339be0fd7f9d SHA256 a316ebdb3ebd4d286889c483b460a6d1e50ceb8d0a9fe06e9968a48d50e7ee75
 DIST paludis-0.40.0.tar.bz2 1617157 RMD160 5179b1306565af122d86b9e75f95036e9dd03045 SHA1 5d45795ee3de60b1a13308f6ab2bf573d4fd6182 SHA256 ea019e9d141b7cae8f33501042477b644e2d4c8485a7e9301f207e77a5cab8df
 DIST paludis-0.40.1.tar.bz2 1621882 RMD160 c217f5055b93cd06d036c66226700e5dfed35514 SHA1 3be8e0d363cfeec8076b73e8fec3178ae0f53192 SHA256 5d71e21cb5ebd198cf446cbed0c9b0c5dbe4e5302cacf1b9012c4b59cbaa2f59
 DIST paludis-0.42.0.tar.bz2 1578684 RMD160 21c1ddaaf62f1de5a491e21ac4f7faa203cdce63 SHA1 e9630a024e14f88d4bab260c2ef46f7580f1a40b SHA256 858587dea9d009f8dd655a96f624154fbd843e77b185f791032547e6f2f71fd6
@@ -11,6 +12,6 @@ EBUILD paludis-0.42.0.ebuild 4456 RMD160 79f1ef4c33f7b91055776d7ca1a0a21e5d99cc2
 EBUILD paludis-0.42.0_alpha1.ebuild 4646 RMD160 1454dbfd3ecbca460cca7051eeed2d65c17b6ba1 SHA1 e539c0753fde7e1cbb16322a852e88348b2e5cc1 SHA256 4bcca0e5931d38a4dd1277855496a7351e17a683d017b0150f18d1ff56145e9c
 EBUILD paludis-0.42.2.ebuild 4452 RMD160 070f9ab32e12afe9e125a0015477dce8e1a0f88f SHA1 af94028746318259bcd56eda952163029935ea3c SHA256 e0b44232a01728fcc5558dce3e141cf3a8c4762ead6d1a8f93f219130ba3da7c
 EBUILD paludis-0.42.3.ebuild 4456 RMD160 f9de2383e873501e958d63220900e38f56ee2ac1 SHA1 4b00deb633054a6a55f68264e8fc69eb9430d2c4 SHA256 2c2c2cbb0bafb77c1eb05b39461a2b6e0eadff86aabee88ec89b3c8a1d5f5b71
-EBUILD paludis-0.44.0.ebuild 4452 RMD160 c87a41103a4e121fb19c21ba4d49441ee43f773d SHA1 200840a78343aaf9a9de3f98cb63721f1b5c49c9 SHA256 aa083f15663c73757c5a438495a3f9ffc68bd9975c058fd9c329fd616d97353f
-MISC ChangeLog 23204 RMD160 cae6ce156d52eb5e0d670b4ee8409c7d6594cae3 SHA1 93a4273ee148269337e17b9ee2521cfeb96b26e4 SHA256 ce9a36915d2d9b2cf2168e12c58a1660063bc8c93da86cd6e348ca146c1c3117
+EBUILD paludis-0.44.0.ebuild 4537 RMD160 b082370fb8119d2b3aea2edb1b9e836798b11b10 SHA1 36cd72f88210dcad03f79bf8a80afca1dddecbef SHA256 66e51f789c1551bdae96a27ee871f774716c50e9b1d479803fb73e162058c28b
+MISC ChangeLog 23371 RMD160 23dd8e3df3156ea105d68b8274dc4c2fd0f80025 SHA1 4997910fc923a973de9eb4717505836ff1f51efe SHA256 f19dfb8b686f6414bb55de11084e92a4bcd7c71ff5b84d0864e2782d43641808
 MISC metadata.xml 904 RMD160 7c64a815163d3a16c9fc64d439e14bf487334c4a SHA1 0e1df6c4ecb601dabe8dda6ab6bf3b45a351ca99 SHA256 24197d2a033e795038d003b44bf57cd6e12ceba51a14cb56f896a4d82ea4bd7d
diff --git a/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch b/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch
new file mode 100644
index 000000000000..8691f7c8d598
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch
@@ -0,0 +1,23 @@
+commit 35402f6a25d9439c310216ed1f7c55222dde3db3
+Author: David Leverton <levertond@googlemail.com>
+Date:   Tue Jan 12 22:34:02 2010 +0000
+
+    Fix gcc 4.1 build
+
+diff --git a/paludis/ipc_output_manager.cc b/paludis/ipc_output_manager.cc
+index 939b979..907cb0e 100644
+--- a/paludis/ipc_output_manager.cc
++++ b/paludis/ipc_output_manager.cc
+@@ -410,8 +410,10 @@ const std::tr1::shared_ptr<OutputManager>
+ OutputManagerFromIPC::operator() (const Action & a)
+ {
+     if (! _imp->result)
+-        _imp->result.reset(new IPCOutputManager(_imp->read_fd, _imp->write_fd,
+-                    CreateOutputManagerForPackageIDActionInfo(_imp->id, a, _imp->exclusivity)));
++    {
++        CreateOutputManagerForPackageIDActionInfo info(_imp->id, a, _imp->exclusivity);
++        _imp->result.reset(new IPCOutputManager(_imp->read_fd, _imp->write_fd, info));
++    }
+     return _imp->result;
+ }
+ 
diff --git a/sys-apps/paludis/paludis-0.44.0.ebuild b/sys-apps/paludis/paludis-0.44.0.ebuild
index 6b897cb4b574..1087ec2fc744 100644
--- a/sys-apps/paludis/paludis-0.44.0.ebuild
+++ b/sys-apps/paludis/paludis-0.44.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.44.0.ebuild,v 1.1 2010/01/09 16:50:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.44.0.ebuild,v 1.2 2010/01/14 22:04:00 peper Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -64,6 +64,12 @@ pkg_setup() {
 	create-paludis-user
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc41-fix.patch"
+}
+
 src_compile() {
 	local repositories=`echo default unpackaged | tr -s \  ,`
 	local clients=`echo default accerso adjutrix appareo importare \