Fixing compilation of paludis-0.16.0 (when using =gcc-3.4*), bug #163729.

(Portage version: 2.1.2-r4)

3 files changed, 34 insertions, 2 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index e0fcaf143597..24c426b06cfa 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.40 2007/01/24 22:24:25 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.41 2007/01/25 17:51:40 phreak Exp $
+
+  25 Jan 2007; Christian Heim <phreak@gentoo.org>
+  +files/paludis-0.16.0-gcc34.patch, paludis-0.16.0.ebuild:
+  Fixing compilation of paludis-0.16.0 (when using =gcc-3.4*), bug #163729.
 
 *paludis-0.16.0 (24 Jan 2007)
 
diff --git a/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch b/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch
new file mode 100644
index 000000000000..fa7257c8ccf2
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch
@@ -0,0 +1,22 @@
+Index: paludis-0.16.0/paludis/dep_list/dep_list.cc
+===================================================================
+--- paludis-0.16.0.orig/paludis/dep_list/dep_list.cc
++++ paludis-0.16.0/paludis/dep_list/dep_list.cc
+@@ -1117,7 +1117,7 @@ DepList::add_error_package(const Package
+     std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
+             _imp->merge_list_index.equal_range(p.name));
+ 
+-    for ( ; pp.first != pp.second ; ++pp.first)
++    for ( ; pp.second != pp.first ; ++pp.first)
+     {
+         if (pp.first->second->kind == kind && pp.first->second->package == p)
+         {
+@@ -1156,7 +1156,7 @@ DepList::add_suggested_package(const Pac
+     std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
+             _imp->merge_list_index.equal_range(p.name));
+ 
+-    for ( ; pp.first != pp.second ; ++pp.first)
++    for ( ; pp.second != pp.first ; ++pp.first)
+     {
+         if ((pp.first->second->kind == dlk_suggested || pp.first->second->kind == dlk_already_installed
+                     || pp.first->second->kind == dlk_package || pp.first->second->kind == dlk_provided
\ No newline at end of file
diff --git a/sys-apps/paludis/paludis-0.16.0.ebuild b/sys-apps/paludis/paludis-0.16.0.ebuild
index 4492b99c77da..a339940b21b8 100644
--- a/sys-apps/paludis/paludis-0.16.0.ebuild
+++ b/sys-apps/paludis/paludis-0.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.16.0.ebuild,v 1.1 2007/01/24 22:24:25 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.16.0.ebuild,v 1.2 2007/01/25 17:51:40 phreak Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -48,6 +48,12 @@ pkg_setup() {
 	filter-ldflags -Wl,--as-needed --as-needed
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc34.patch"
+}
+
 src_compile() {
 	local repositories=`echo default $(usev cran) | tr -s \  ,`
 	local clients=`echo default $(usev contrarius) | tr -s \  ,`