Fix bug 249887 for gcc-4.3 compilation. Also added libtool patch and tweaks to allow eautoreconf which fixes as-needed compilation (old automake, I presume).

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)

4 files changed, 47 insertions, 7 deletions

diff --git a/games-mud/kmuddy/ChangeLog b/games-mud/kmuddy/ChangeLog
index 8c9f9bdc744b..d71d3ef72af4 100644
--- a/games-mud/kmuddy/ChangeLog
+++ b/games-mud/kmuddy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-mud/kmuddy
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.19 2008/08/01 17:58:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.20 2008/12/18 22:01:50 loki_val Exp $
+
+  18 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/kmuddy-0.8-gcc43.patch, +files/kmuddy-0.8-libtool.patch,
+  kmuddy-0.8.ebuild:
+  Fix bug 249887 for gcc-4.3 compilation. Also added libtool patch and
+  tweaks to allow eautoreconf which fixes as-needed compilation (old
+  automake, I presume).
 
   01 Aug 2008; Raúl Porcel <armin76@gentoo.org> kmuddy-0.8.ebuild:
   x86 stable wrt #233441
diff --git a/games-mud/kmuddy/files/kmuddy-0.8-gcc43.patch b/games-mud/kmuddy/files/kmuddy-0.8-gcc43.patch
new file mode 100644
index 000000000000..fb798da1d9f1
--- /dev/null
+++ b/games-mud/kmuddy/files/kmuddy-0.8-gcc43.patch
@@ -0,0 +1,12 @@
+diff -Nurpa kmuddy-0.8.orig/lib/ctextchunk.cpp kmuddy-0.8/lib/ctextchunk.cpp
+--- kmuddy-0.8.orig/lib/ctextchunk.cpp	2008-12-05 07:04:05.000000000 +0300
++++ kmuddy-0.8/lib/ctextchunk.cpp	2008-12-05 07:42:28.000000000 +0300
+@@ -22,6 +22,8 @@
+ 
+ #include <klocale.h>
+ 
++#include <cstdlib>
++
+ QColor chunkLink::linkColor = Qt::blue;
+ 
+ /** state variables needed to paint a row */
diff --git a/games-mud/kmuddy/files/kmuddy-0.8-libtool.patch b/games-mud/kmuddy/files/kmuddy-0.8-libtool.patch
new file mode 100644
index 000000000000..d4d6ec501444
--- /dev/null
+++ b/games-mud/kmuddy/files/kmuddy-0.8-libtool.patch
@@ -0,0 +1,16 @@
+--- kmuddy-0.8.orig/Makefile.am	2008-12-18 21:21:19.000000000 +0100
++++ kmuddy-0.8/Makefile.am	2008-12-18 22:02:41.000000000 +0100
+@@ -15,13 +15,10 @@
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
+ 
+ $(top_srcdir)/subdirs:
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
+ 
+-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
+-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
+-
+ MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
+ 
+ package-messages:
+ 	$(MAKE) -f admin/Makefile.common package-messages
+ 	$(MAKE) -C po merge
diff --git a/games-mud/kmuddy/kmuddy-0.8.ebuild b/games-mud/kmuddy/kmuddy-0.8.ebuild
index f20c66bb8d72..2c9855db8730 100644
--- a/games-mud/kmuddy/kmuddy-0.8.ebuild
+++ b/games-mud/kmuddy/kmuddy-0.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-0.8.ebuild,v 1.6 2008/08/01 17:58:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-0.8.ebuild,v 1.7 2008/12/18 22:01:50 loki_val Exp $
 
-inherit eutils kde-functions
+inherit base eutils kde-functions autotools
 
 DESCRIPTION="MUD client for KDE"
 HOMEPAGE="http://www.kmuddy.com/"
@@ -17,13 +17,18 @@ DEPEND="arts? ( kde-base/arts )
 	sdl? ( media-libs/sdl-mixer )"
 
 need-kde 3
+PATCHES=(	"${FILESDIR}/${P}-nocrash.patch"
+		"${FILESDIR}/${P}-gcc43.patch"
+		"${FILESDIR}/${P}-idle-crash.patch"
+		"${FILESDIR}/${P}-libtool.patch"
+	)
 
 src_unpack() {
-	unpack ${A}
+	base_src_unpack
 	cd "${S}"
-	epatch \
-		"${FILESDIR}/${P}-nocrash.patch" \
-		"${FILESDIR}/${P}-idle-crash.patch"
+	mv admin/acinclude.m4.in acinclude.m4
+	eautoreconf
+	find . -name Makefile.in -exec perl admin/am_edit ';'
 }
 
 src_compile() {