Fix building w/ GCC 4.5 (bug #319355, patch from Xarthisius).

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

4 files changed, 48 insertions, 5 deletions

diff --git a/dev-util/nemiver/ChangeLog b/dev-util/nemiver/ChangeLog
index c4a1a6bf8bf8..f5457f455215 100644
--- a/dev-util/nemiver/ChangeLog
+++ b/dev-util/nemiver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/nemiver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/ChangeLog,v 1.29 2010/07/20 15:30:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/ChangeLog,v 1.30 2010/08/01 21:41:49 dirtyepic Exp $
+
+  01 Aug 2010; Ryan Hill <dirtyepic@gentoo.org> nemiver-0.7.3.ebuild,
+  +files/nemiver-0.7.3-gcc45.patch:
+  Fix building w/ GCC 4.5 (bug #319355, patch from Xarthisius).
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> nemiver-0.7.2.ebuild,
   nemiver-0.7.3.ebuild:
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
index 293cb0232f30..c325862775dc 100644
--- a/dev-util/nemiver/Manifest
+++ b/dev-util/nemiver/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX nemiver-0.7.3-gcc45.patch 544 RMD160 eeb45940b81f80bdecd27a531ab7095786dd4c29 SHA1 2ebaacb079c0dc70cb2e06e68621b0a8093ae27b SHA256 9099d46e8dbbb528f1b64ff4886eba586d2225561e598cfc99b23ff9ac9ecc22
 DIST nemiver-0.7.2.tar.bz2 1420879 RMD160 ffa9be5b0c051939957270178a75dfa6020e6cd9 SHA1 5e0bbb6779fa735f0b269b2ec52727e8f31c11a9 SHA256 a9b39344e4a400ce2ac24d1908ac844b924f859c2c11b2ab409028fab300ad23
 DIST nemiver-0.7.3.tar.bz2 1428156 RMD160 ccb5ecdb4bdda1dc50e5609edd112aa62693053a SHA1 dcee7254cf3a775d02cc6a933309a647d8506c88 SHA256 4e1b0dd9cae85af04acc4cfc058950d3beb4655e0a6c8c930c0c4120ddb4490e
 EBUILD nemiver-0.7.2.ebuild 1238 RMD160 13aac0c0b5784730fe2ae413f92ba80b6094bc74 SHA1 53b24a26df52d0766502e8d851ab43f270ec338d SHA256 d95243b6c62268723277139eacfa7de343a8ca2b3b373ef623051b0131c5d68d
-EBUILD nemiver-0.7.3.ebuild 1078 RMD160 68f74560bc67d5528288d7940ba88e471df37ffa SHA1 c42bc1ff2c898a75eea5737429d3d339f4e56d98 SHA256 0169079921f07401d1567c26bd17d5202c7c3b2fc5a5c18d4c5ca830f1b953e6
-MISC ChangeLog 4645 RMD160 7c2623d541da86b0f08fc1993a3b69c7d25c1af7 SHA1 ae264f47c0c21dd38391ed8316c761f0c5b671f8 SHA256 490c7ac27fc2f427223bcc15e5a1ce42b78e4d6d6a5eeacc7091ceb30d29472f
+EBUILD nemiver-0.7.3.ebuild 1158 RMD160 9efd233c9b2b2c40cfc79ae88500e860b86d1094 SHA1 f571bd4b5af4582b1e01b1c1612971355b215a9d SHA256 9689df2616b5509aa4e7ff667697bb550e528a70eb23b9922798149a2de93e0d
+MISC ChangeLog 4822 RMD160 5fdbaec95c83b1e4c711a634f185952938bef302 SHA1 6513bdb3f090d9d0cf38d5290d397b64e67f5d39 SHA256 e42a2c630686a24678306d90e9f4a096f39346cb061c1c899bdaf25987eb7afb
 MISC metadata.xml 564 RMD160 7aa94ba0afb384be367a7dd79684978f107a72ab SHA1 e2a5ab7c3e78980265298b24970385ecf5aa86c7 SHA256 dbaf643c1607f14e7f9c6efa898378fb9f0dab49216f1abe43ba40479f7f5feb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxV6xIACgkQiqiDRvmkBmIt4wCfVJsH1ylgjhFlVvTE7Ap+V9WS
+y14AoLB5K1qBEWM0maSgTb8m2kvofdBK
+=VWwV
+-----END PGP SIGNATURE-----
diff --git a/dev-util/nemiver/files/nemiver-0.7.3-gcc45.patch b/dev-util/nemiver/files/nemiver-0.7.3-gcc45.patch
new file mode 100644
index 000000000000..ada431e247b7
--- /dev/null
+++ b/dev-util/nemiver/files/nemiver-0.7.3-gcc45.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/319355
+
+--- a/src/common/nmv-object.cc
++++ b/src/common/nmv-object.cc
+@@ -59,7 +59,7 @@ Object::Object (Object const &a_object):
+     *m_priv = *a_object.m_priv;
+ }
+ 
+-Object::Object&
++Object&
+ Object::operator= (Object const &a_object)
+ {
+     if (this == &a_object)
+--- a/src/langs/nmv-cpp-ast.cc
++++ b/src/langs/nmv-cpp-ast.cc
+@@ -64,7 +64,7 @@ Token::Token (const Token &a_t)
+     m_int_value = a_t.get_int_value ();
+ }
+ 
+-Token::Token&
++Token&
+ Token::operator= (const Token &a_t)
+ {
+     m_kind = a_t.get_kind ();
diff --git a/dev-util/nemiver/nemiver-0.7.3.ebuild b/dev-util/nemiver/nemiver-0.7.3.ebuild
index 89d1e4e8d079..fc41b12f16f8 100644
--- a/dev-util/nemiver/nemiver-0.7.3.ebuild
+++ b/dev-util/nemiver/nemiver-0.7.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/nemiver-0.7.3.ebuild,v 1.2 2010/07/20 15:30:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/nemiver-0.7.3.ebuild,v 1.3 2010/08/01 21:41:49 dirtyepic Exp $
 
 EAPI="2"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
 HOMEPAGE="http://projects.gnome.org/nemiver/"
@@ -43,3 +43,7 @@ pkg_setup() {
 		--enable-gio
 		--disable-static"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/nemiver-0.7.3-gcc45.patch
+}