gcc-3.4 compilation, bug #127446

(Portage version: 2.1_pre7-r2)

5 files changed, 131 insertions, 8 deletions

diff --git a/games-mud/xpertmud/ChangeLog b/games-mud/xpertmud/ChangeLog
index e6d7c238599e..5fc86ac7dda1 100644
--- a/games-mud/xpertmud/ChangeLog
+++ b/games-mud/xpertmud/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/xpertmud
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/xpertmud/ChangeLog,v 1.5 2005/03/15 23:16:01 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/xpertmud/ChangeLog,v 1.6 2006/03/30 17:28:22 tupone Exp $
+
+  30 Mar 2006; <Tupone@gentoo.org> +files/xpertmud-3.1_pre1-gcc34.patch,
+  xpertmud-3.1_pre1.ebuild:
+  Fix for gcc-3.4, bug #127446 reported by Alex Zorach
 
   15 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
   xpertmud-3.1_pre1.ebuild:
diff --git a/games-mud/xpertmud/Manifest b/games-mud/xpertmud/Manifest
index dbb7cbe8c05c..5ccbf5ee4951 100644
--- a/games-mud/xpertmud/Manifest
+++ b/games-mud/xpertmud/Manifest
@@ -1,4 +1,15 @@
+MD5 8d7df482f592b32ff5dd19e9dba50d47 ChangeLog 823
+RMD160 b11f70b637f170a405fdbe74d049990f8de62289 ChangeLog 823
+SHA256 1538cac16a6b6f719b4b6f198a47dbcef49d70f1f8600d6ff37f8788f2d15ac3 ChangeLog 823
+MD5 e0536dbb3c7e1949ed09c362df6c74fe files/digest-xpertmud-3.1_pre1 265
+RMD160 aac83b521dc8aabfc59b4b1455ba68de85e97832 files/digest-xpertmud-3.1_pre1 265
+SHA256 a23ef09a12132d5a4e1d1b8c125388a0fc91d3e3a233b20d60072c7e74b42410 files/digest-xpertmud-3.1_pre1 265
+MD5 39220b3b078bd9c9a1a61292ed00feb7 files/xpertmud-3.1_pre1-gcc34.patch 3711
+RMD160 3fd48b92fe1b1275cd9bebbe9166d9d09986c785 files/xpertmud-3.1_pre1-gcc34.patch 3711
+SHA256 97b1e07b99366b794cd6659213d7e15f77f23b2f1d4ad4e43ecdb65689377d6e files/xpertmud-3.1_pre1-gcc34.patch 3711
 MD5 3dad188c2c2ad974f6e512994d514f62 metadata.xml 782
-MD5 8b040aed800f640a54bca5af548a48c8 xpertmud-3.1_pre1.ebuild 922
-MD5 7d7ecc9c305449ec51be08b9c21b577c ChangeLog 666
-MD5 617e81e08bd1eda856d8edb50f6559d7 files/digest-xpertmud-3.1_pre1 73
+RMD160 4e60f0ec432e1d5495464316549caa556de60787 metadata.xml 782
+SHA256 d20cc99f01ca6536111b2aa2406dde6404030b07ab0124a404338ee0f1459a8e metadata.xml 782
+MD5 176496f9ef22f53b29c04397604a19c4 xpertmud-3.1_pre1.ebuild 1010
+RMD160 41b2a02f3749ce097441447adbb0d7b0e0a51800 xpertmud-3.1_pre1.ebuild 1010
+SHA256 c61eaf6e8f45d1389cd2d1558ce98c0ac2451dc33b471aba746e2b2e70fc902b xpertmud-3.1_pre1.ebuild 1010
diff --git a/games-mud/xpertmud/files/digest-xpertmud-3.1_pre1 b/games-mud/xpertmud/files/digest-xpertmud-3.1_pre1
index 8a9f214f7aef..717427e4ec5c 100644
--- a/games-mud/xpertmud/files/digest-xpertmud-3.1_pre1
+++ b/games-mud/xpertmud/files/digest-xpertmud-3.1_pre1
@@ -1 +1,3 @@
 MD5 c8dc5df62c5b9e70cbdf1802810e46c5 xpertmud-3.1preview1.tar.bz2 773108
+RMD160 ca34b46f599534e7a935de167712f21c2314b13b xpertmud-3.1preview1.tar.bz2 773108
+SHA256 6ad2aa5c6cead8845c6f3cb5f73317c140ef465379a90bf3d42001c5d029d996 xpertmud-3.1preview1.tar.bz2 773108
diff --git a/games-mud/xpertmud/files/xpertmud-3.1_pre1-gcc34.patch b/games-mud/xpertmud/files/xpertmud-3.1_pre1-gcc34.patch
new file mode 100644
index 000000000000..72144cdb8c8b
--- /dev/null
+++ b/games-mud/xpertmud/files/xpertmud-3.1_pre1-gcc34.patch
@@ -0,0 +1,100 @@
+--- qextmdi/include/qextmdidefines.h.original	2006-03-30 01:06:51.000000000 +0200
++++ qextmdi/include/qextmdidefines.h	2006-03-30 01:06:59.000000000 +0200
+@@ -88,7 +88,7 @@
+       TabPageMode    = 2
+    };
+ 
+-}; //namespace
++} //namespace
+ 
+ 
+ //----------------------------------------------------------------------------
+--- qextmdi/src/qextmdimainfrm.cpp.original	2006-03-30 01:11:33.000000000 +0200
++++ qextmdi/src/qextmdimainfrm.cpp	2006-03-30 01:11:47.000000000 +0200
+@@ -1875,7 +1875,7 @@
+    if (m_pTaskBar)
+       m_pTaskBar->close();
+    m_pTaskBar = 0L;
+-};
++}
+ 
+ #ifndef NO_INCLUDE_MOCFILES
+ #include "qextmdimainfrm.moc"
+--- xpertmud/scripting/perl/XMPerlFactory.cc.original	2006-03-30 01:22:16.000000000 +0200
++++ xpertmud/scripting/perl/XMPerlFactory.cc	2006-03-30 01:22:34.000000000 +0200
+@@ -30,7 +30,7 @@
+   return new XMPerl(parent,name);
+ } 
+ 
+-K_EXPORT_COMPONENT_FACTORY(libxmperlinterpreter,XMPerlFactory);
++K_EXPORT_COMPONENT_FACTORY(libxmperlinterpreter,XMPerlFactory)
+ 
+ 
+ 
+--- xpertmud/scripting/python/XMPythonFactory.cc.original	2006-03-30 01:26:58.000000000 +0200
++++ xpertmud/scripting/python/XMPythonFactory.cc	2006-03-30 01:27:08.000000000 +0200
+@@ -23,7 +23,7 @@
+   return new XMPython(parent,name);
+ } 
+ 
+-K_EXPORT_COMPONENT_FACTORY(libxmpythoninterpreter,XMPythonFactory);
++K_EXPORT_COMPONENT_FACTORY(libxmpythoninterpreter,XMPythonFactory)
+ 
+ 
+ // KInstance *XMPythonFactory::s_instance = 0L;
+--- xpertmud/scripting/ruby/XMRubyFactory.cc.original	2006-03-30 01:31:07.000000000 +0200
++++ xpertmud/scripting/ruby/XMRubyFactory.cc	2006-03-30 01:31:16.000000000 +0200
+@@ -20,6 +20,6 @@
+   return new XMRuby(parent,name);
+ } 
+ 
+-K_EXPORT_COMPONENT_FACTORY(libxmrubyinterpreter,XMRubyFactory);
++K_EXPORT_COMPONENT_FACTORY(libxmrubyinterpreter,XMRubyFactory)
+ 
+ 
+--- xpertmud/plugins/example/example.cc.original	2006-03-30 01:37:36.000000000 +0200
++++ xpertmud/plugins/example/example.cc	2006-03-30 01:37:48.000000000 +0200
+@@ -42,4 +42,4 @@
+ }
+ 
+ 
+-K_EXPORT_COMPONENT_FACTORY( xmud_example, KGenericFactory<XmudExample>( "xmud_example" ) );
++K_EXPORT_COMPONENT_FACTORY( xmud_example, KGenericFactory<XmudExample>( "xmud_example" ) )
+--- xpertmud/plugins/battletech/BattleCore.h.original	2006-03-30 01:43:22.000000000 +0200
++++ xpertmud/plugins/battletech/BattleCore.h	2006-03-30 01:43:43.000000000 +0200
+@@ -199,7 +199,7 @@
+ class TextParser;
+ class HUDParser;
+ class BattleCore: public QObject {
+-  Q_OBJECT;
++  Q_OBJECT
+   typedef map<QString, BattleMap *> mapsT;
+ 
+   // mustn't go into map, because it's just temporary
+--- xpertmud/plugins/battletech/Factory.cc.original	2006-03-30 18:23:19.000000000 +0200
++++ xpertmud/plugins/battletech/Factory.cc	2006-03-30 18:23:25.000000000 +0200
+@@ -35,4 +35,4 @@
+ 
+ 
+ 
+-K_EXPORT_COMPONENT_FACTORY( xmud_battletech, BattleFactory );
++K_EXPORT_COMPONENT_FACTORY( xmud_battletech, BattleFactory )
+--- xpertmud/plugins/html/XMhtml.cc.original	2006-03-30 18:26:55.000000000 +0200
++++ xpertmud/plugins/html/XMhtml.cc	2006-03-30 18:27:06.000000000 +0200
+@@ -61,4 +61,4 @@
+ 
+ 
+ 
+-K_EXPORT_COMPONENT_FACTORY( xmud_html, KGenericFactory<XMHtml>( "xmud_html" ) );
++K_EXPORT_COMPONENT_FACTORY( xmud_html, KGenericFactory<XMHtml>( "xmud_html" ) )
+--- xpertmud/kfile-plugin/kfile_xmud.cc.original	2006-03-30 18:28:58.000000000 +0200
++++ xpertmud/kfile-plugin/kfile_xmud.cc	2006-03-30 18:29:08.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ typedef KGenericFactory<KXmudPlugin> XmudFactory;
+ 
+-K_EXPORT_COMPONENT_FACTORY( kfile_xmud, XmudFactory( "kfile_xmud" ) );
++K_EXPORT_COMPONENT_FACTORY( kfile_xmud, XmudFactory( "kfile_xmud" ) )
+ 
+ KXmudPlugin::KXmudPlugin( QObject *parent, const char *name,
+                         const QStringList &preferredItems )
diff --git a/games-mud/xpertmud/xpertmud-3.1_pre1.ebuild b/games-mud/xpertmud/xpertmud-3.1_pre1.ebuild
index 33333bcf7698..554019f81c02 100644
--- a/games-mud/xpertmud/xpertmud-3.1_pre1.ebuild
+++ b/games-mud/xpertmud/xpertmud-3.1_pre1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/xpertmud/xpertmud-3.1_pre1.ebuild,v 1.6 2005/07/21 15:34:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/xpertmud/xpertmud-3.1_pre1.ebuild,v 1.7 2006/03/30 17:28:22 tupone Exp $
 
-inherit kde
+inherit eutils kde
 
 MY_PV="${PV/_pre/preview}"
 DESCRIPTION="the eXtensible Python pErl Ruby scripTable MUD client"
@@ -22,6 +22,12 @@ need-kde 3
 
 S=${WORKDIR}/xpertmud-${MY_PV}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc34.patch
+}
+
 src_compile() {
 	econf \
 		$(use_with python python) \