Fix building with GCC 4.5 wrt #317509 by Philipp.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 121fd7d46b2eeb423258b6b07e4ba39a80cfab4a..42cc09d4d99f7ee9da7befe72cd893620c3fb253 100644 (file)
--- a/dev-vcs/monotone/ChangeLog
+++ b/dev-vcs/monotone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/monotone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.1 2010/03/05 16:49:35 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.2 2010/04/27 17:30:46 ssuominen Exp $
+
+  27 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> monotone-0.45.ebuild,
+  +files/monotone-0.45-gcc45.patch:
+  Fix building with GCC 4.5 wrt #317509 by Philipp.
 
   05 Mar 2010; Sebastian Pipping <sping@gentoo.org>
   +files/50monotone-gentoo.el, +files/monotone-0.36.initd,

diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
index 55030128b09790b480aa7b126d5b95aec1584963..14abeaa6a0d6026719c3597551e6db590d7ceffb 100644 (file)
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -1,10 +1,11 @@
 AUX 50monotone-gentoo.el 1217 RMD160 82532c08ab1409fe2a9a643baf0f769841f39db2 SHA1 ccdd819dd1e497a5dd546df3b898a8f3efce2e45 SHA256 bfd32a5f57abd47bd6bc35ce27c2a31dfd1c1f7517d869fc0bca6b715d8ea259
 AUX hooks.lua 154 RMD160 0297c570bafe350a4160a46351c00f46ea4fc1ef SHA1 f31bdd8d567639b2aa427e98b2df47351a8e1237 SHA256 55e17360a14ccf70d2da5b3e3ad038b1021c30f4be5c69029f50bd1ec8cbf326
 AUX monotone-0.36.initd 2431 RMD160 bfa9672644eb07cbdfc2a03f7e20c557f2b5cc97 SHA1 448eea7bf3bdf14c85ce01d7197d04cfacedd89d SHA256 361cd19633a64f6b037b98ac50a2622d8856ff2dffb89c0b11b45660ba43bdb6
+AUX monotone-0.45-gcc45.patch 242 RMD160 1928c622e4493deac474d73e6a7cd675a24ce1a0 SHA1 4c498e24eb47d7a28c2e04bef9dcc7e08d909500 SHA256 bbde8fe9c5ae2d259d09a9bc1dbd7fb2b38aca9ba9b021d03f4b5481d145b734
 AUX monotone.confd 803 RMD160 507ee4058e6f8197bd0b7a25f1115ec42ae226ec SHA1 1887e76fd00585344e614c3392527866bb94614c SHA256 4e266a08108441438fb4b3ac40216e731378d378593807b0826f58446c346e5b
 AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b83336348987f9c6f9a46f0191adf9fa87d1b83c SHA256 4f93a644b2f16d6ea5c4d28e3039dfddd7f8e38ca1b8d54389094be751fbfa7c
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
 DIST monotone-0.45.tar.gz 4645511 RMD160 d225595ba908d2d9366ffc3490caba83aa9ad9bb SHA1 84bd7ab5f7b1bfe98028f5105e3dbcd82c809e51 SHA256 64c734274715f392eb4a879172a11c0606d37c02b4a6f23045772af5f8e2a9ec
-EBUILD monotone-0.45.ebuild 3298 RMD160 3f5e852102203e71dc96133bd236995d4bf6300f SHA1 7007f29a31eaa5feba28e628497d3933e0038b99 SHA256 dda02ccbd05949ce6bd3427a9581a5e5e656ca4e01d2d1eae0c6ab138f601310
-MISC ChangeLog 10969 RMD160 06c8461cb9cc80838a0fe076d6d0711fd39c85af SHA1 cb526a4afb2fbbdd90b3bba862ec0f6834a1aa96 SHA256 9b44dcf564d659b8dbaa6047ba54e75030ab737bc973dc712a2eb4ce22a5ec91
+EBUILD monotone-0.45.ebuild 3360 RMD160 15b99a25803569c7b852e2cfedc95e13b2e9d2a4 SHA1 ee6082ea1c9a6e3bb753e9e39a284929a01e9b62 SHA256 e68330fd743d7c34e202907a5574cc9d98dc963d47e4335cb72d7f45d936318e
+MISC ChangeLog 11138 RMD160 cd44c8fefb9239e93a40867b0117742c46bbe90e SHA1 2607ab9c38d455232e137a86f5f6b18ba1453f1e SHA256 486fb02917f0666ee32c8caeee5961a9233f0f8d89edd23ec7eb2113fa6f7e06
 MISC metadata.xml 1024 RMD160 85108ed2778629efe1db730bcca17511c1df0acf SHA1 f51b9fba062d2a7011df881c8c907b7bfa30373c SHA256 e55ef6758ed6927c8412a7514e43e869c1304b503b7ca3e6d8311558c2413c7c

diff --git a/dev-vcs/monotone/files/monotone-0.45-gcc45.patch b/dev-vcs/monotone/files/monotone-0.45-gcc45.patch
new file mode 100644 (file)
index 0000000..d343dcd
--- /dev/null
+++ b/dev-vcs/monotone/files/monotone-0.45-gcc45.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/show_bug.cgi?id=317509
+
+--- selectors.cc
++++ selectors.cc
+@@ -18,6 +18,7 @@
+ #include "cmd.hh"
+ #include "work.hh"
+ #include "transforms.hh"
++#include "roster.hh"
+ 
+ #include <algorithm>
+ #include <boost/tokenizer.hpp>

diff --git a/dev-vcs/monotone/monotone-0.45.ebuild b/dev-vcs/monotone/monotone-0.45.ebuild
index db7c75371d64ffa6973d36e2c5b2c5667b9d8481..5875806bec5abf0a2aa7bcc3b312ccf2577b7fad 100644 (file)
--- a/dev-vcs/monotone/monotone-0.45.ebuild
+++ b/dev-vcs/monotone/monotone-0.45.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/dev-vcs/monotone/monotone-0.45.ebuild,v 1.1 2010/03/05 16:49:35 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.45.ebuild,v 1.2 2010/04/27 17:30:46 ssuominen Exp $
 
 EAPI=2
 inherit bash-completion elisp-common eutils
@@ -34,6 +34,10 @@ pkg_setup() {
        fi
 }
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gcc45.patch
+}
+
 src_configure() {
        econf \
                $(use_enable nls) \