From 90dcd9eedabd1930678281791500bf8be75e3c32 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Thu, 25 Jan 2007 17:51:40 +0000 Subject: [PATCH] Fixing compilation of paludis-0.16.0 (when using =gcc-3.4*), bug #163729. Package-Manager: portage-2.1.2-r4 --- sys-apps/paludis/ChangeLog | 6 +++- sys-apps/paludis/Manifest | 30 ++++++++++++++----- .../paludis/files/paludis-0.16.0-gcc34.patch | 22 ++++++++++++++ sys-apps/paludis/paludis-0.16.0.ebuild | 8 ++++- 4 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 sys-apps/paludis/files/paludis-0.16.0-gcc34.patch 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 + +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/Manifest b/sys-apps/paludis/Manifest index f215db6b0192..bd01cdbeb292 100644 --- a/sys-apps/paludis/Manifest +++ b/sys-apps/paludis/Manifest @@ -1,21 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX paludis-0.14.3-ruby-so.patch 2928 RMD160 44bd41903c00dc0b4f0de72c8013ef741cfffed6 SHA1 2ed6ec390895f2b3989e9524530161cf8cc20a6d SHA256 cd32065d3188910759e6dcd211c5ba0e6edbd9e6b7cfa4de82d09449b8a84b78 MD5 6e833fdf8bb2c4776daed146a6cee01a files/paludis-0.14.3-ruby-so.patch 2928 RMD160 44bd41903c00dc0b4f0de72c8013ef741cfffed6 files/paludis-0.14.3-ruby-so.patch 2928 SHA256 cd32065d3188910759e6dcd211c5ba0e6edbd9e6b7cfa4de82d09449b8a84b78 files/paludis-0.14.3-ruby-so.patch 2928 +AUX paludis-0.16.0-gcc34.patch 1128 RMD160 4f2022d4a97ee826b117f411e6bb8b49c24df3cd SHA1 9e96ab51cc06f73cc1fc179138db360f6fd2f4d7 SHA256 cc32da718d25b0e13fa12feb10cc2370d5006d68f334a4e3992a7ca1114d4063 +MD5 1e21317afc1ca58f768015dfe558cd53 files/paludis-0.16.0-gcc34.patch 1128 +RMD160 4f2022d4a97ee826b117f411e6bb8b49c24df3cd files/paludis-0.16.0-gcc34.patch 1128 +SHA256 cc32da718d25b0e13fa12feb10cc2370d5006d68f334a4e3992a7ca1114d4063 files/paludis-0.16.0-gcc34.patch 1128 DIST paludis-0.14.3.tar.bz2 1254602 RMD160 e5a33425072ef2d71236dd78708146195ebb3008 SHA1 6c93bfcdb3ed4a5886057c97fb3b2c5bee245087 SHA256 343e6dfd382a84ca80d70f6bdb226fcf94e9a26c3aa9c7e5c3b1edb48ff078d2 DIST paludis-0.16.0.tar.bz2 1311995 RMD160 34de8430d6571163563199d731acc2ea8bb6eb56 SHA1 901fd160227274c69ef47ec827b350dfad811a82 SHA256 d94bfbb80f2d09ce916f995664e9e15ac088847ee5d7521b1d7c6d84bac38217 EBUILD paludis-0.14.3.ebuild 3183 RMD160 ebb6a1af610968f5f0320e3cf5ed9ad948e4ccd2 SHA1 45717dd03d3782ce798d76f24dc7c2d42f93ae3d SHA256 1ffe8b1099370c8c26f2c7151be0bf9fad0139ea7f5eb9ddf2b446392925c3a3 MD5 4a2d4a6cc2815b3b9f3e3699634373b1 paludis-0.14.3.ebuild 3183 RMD160 ebb6a1af610968f5f0320e3cf5ed9ad948e4ccd2 paludis-0.14.3.ebuild 3183 SHA256 1ffe8b1099370c8c26f2c7151be0bf9fad0139ea7f5eb9ddf2b446392925c3a3 paludis-0.14.3.ebuild 3183 -EBUILD paludis-0.16.0.ebuild 3098 RMD160 7f32ab05b2dce45aa6c5e83639519dc355b95924 SHA1 03a19f70aec21d1cbcf04ab12f2eeb1261722746 SHA256 e52646784a881eeee47803ea953fdd15b040f31fd8d62ef7bb917a7e178d8983 -MD5 1f9478f322fc52b2d49532dcf2931706 paludis-0.16.0.ebuild 3098 -RMD160 7f32ab05b2dce45aa6c5e83639519dc355b95924 paludis-0.16.0.ebuild 3098 -SHA256 e52646784a881eeee47803ea953fdd15b040f31fd8d62ef7bb917a7e178d8983 paludis-0.16.0.ebuild 3098 -MISC ChangeLog 5663 RMD160 7fe4aac8a7077035920de8f4f8ef2175fd33674b SHA1 56d51df232c48804f731018565eb289abdbea8c1 SHA256 2c5ba6f8a7fdbef7ab709b0cc73201924aee895adeb841f28af02227ef6e8e67 -MD5 16e1ee0027f1f65b03c0ac6680aa60e7 ChangeLog 5663 -RMD160 7fe4aac8a7077035920de8f4f8ef2175fd33674b ChangeLog 5663 -SHA256 2c5ba6f8a7fdbef7ab709b0cc73201924aee895adeb841f28af02227ef6e8e67 ChangeLog 5663 +EBUILD paludis-0.16.0.ebuild 3180 RMD160 d2ebb7191e591b02abfb04ff17fea6ca146721cc SHA1 af3bac32e8b167e7867a320cbce1bacc6c1a4ead SHA256 3c4147c9bab6595778b5c8ff1502ce951b26b073a97522cdc1261778875935f7 +MD5 7f9b3d03c523925f202138179c9f0d80 paludis-0.16.0.ebuild 3180 +RMD160 d2ebb7191e591b02abfb04ff17fea6ca146721cc paludis-0.16.0.ebuild 3180 +SHA256 3c4147c9bab6595778b5c8ff1502ce951b26b073a97522cdc1261778875935f7 paludis-0.16.0.ebuild 3180 +MISC ChangeLog 5851 RMD160 bd8818c38db6282fd665dc24581b1ad58a2ab815 SHA1 f9b6efb4edf9ad92f5aa6c2457282ca2253bae44 SHA256 0d650eca34d887b95b5f9fca7514b86f5de2a69b7b4e28bb5893ae4a92554fa9 +MD5 d7ab08c25ce4cde14bf3deabc412e847 ChangeLog 5851 +RMD160 bd8818c38db6282fd665dc24581b1ad58a2ab815 ChangeLog 5851 +SHA256 0d650eca34d887b95b5f9fca7514b86f5de2a69b7b4e28bb5893ae4a92554fa9 ChangeLog 5851 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215 @@ -26,3 +33,10 @@ SHA256 783bcf24487da267064058eff6e690c5aaf0b552dd3c8c33191572ad275dc303 files/di MD5 4d1b4e83e157827395657b29621f4004 files/digest-paludis-0.16.0 250 RMD160 f555bda1f5aae28751e687a01556ac5a6265c163 files/digest-paludis-0.16.0 250 SHA256 373ff8bab4cfc41197ac2fdd31d22e83fdec4e5eb2f0fe3aac61caf2dbf65420 files/digest-paludis-0.16.0 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFuO4xyuNVb5qfaOYRAiNLAJ93wj9EB14g13uXyP4EmopLzj9fvACeOVV2 +GaXRzlAaDK16VmUZJsq/BZo= +=ITK7 +-----END PGP SIGNATURE----- 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 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 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 \ ,` -- 2.26.2