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).

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

5 files changed, 51 insertions, 9 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/Manifest b/games-mud/kmuddy/Manifest
index baead0aa1657..cb6966ad2f85 100644
--- a/games-mud/kmuddy/Manifest
+++ b/games-mud/kmuddy/Manifest
@@ -1,6 +1,8 @@
+AUX kmuddy-0.8-gcc43.patch 377 RMD160 aea890c823d0fbe8dc3d7557ee70ccddecfdac0b SHA1 e7f49981009a36734010eeb7febf1c78b2d558de SHA256 3a984ef87207c628e74cc172f59489f031bd33f6be744968cc5be7865932f718
 AUX kmuddy-0.8-idle-crash.patch 3265 RMD160 d18de581108230ee07a5561644af4ee3bbb3a66a SHA1 93f7be5a481a04c225fc7c44d2bfcc9037eca8e7 SHA256 ce50456b1cd323dd82536726ce284c30572a77e14c9313d7a1f0b1f785f40776
+AUX kmuddy-0.8-libtool.patch 667 RMD160 72c49b8ac4a9480b2ccc5f2c0c7ac3a37ce66e38 SHA1 ad8534564c035749b6879da3d80f7786c313323d SHA256 71fee17dc128e84e58caeedf8b8e0fa2f5c6f0a7df070932339c641deee395d5
 AUX kmuddy-0.8-nocrash.patch 635 RMD160 af716aed42c584513c57135ded6b3e9cda88df73 SHA1 3e6e9be9ae2ab257204b5128004210403af77b91 SHA256 c76a7cae08710fd163875011111140dc3a6ead94ab18c4d62fe27917aa86410d
 DIST kmuddy-0.8.tar.gz 1058011 RMD160 1e8d408a6ccbc5cfe9a205f9dbe5f2e5aee9489f SHA1 372f25aa1699adc24b962d61d0d5ca45f747327e SHA256 7f65a3932696f84e11058b673fa3ec0f47d3f060191982438075a01c4d261265
-EBUILD kmuddy-0.8.ebuild 895 RMD160 3d9a3faa30ef0cadb59bb29746370cdd6a70d502 SHA1 fec7173c89d7a705c5574c1a06971605578a105e SHA256 15a8ce5c5cb0a3762e06ff80971ef0b22edca5837f7145d61019fb81fd27e933
-MISC ChangeLog 2500 RMD160 7f4566ed51a518b39a18ef96aa6f5292e81a9e82 SHA1 42a871f46859c4dc24b00e413ed2004ccde016fc SHA256 9ebe036eecaacb124c1cd22b79b3f35c213eb1833d67c97b26c545c060abf61e
+EBUILD kmuddy-0.8.ebuild 1089 RMD160 60c478723c3ee83d766dbe30ba3d289d4e801cb1 SHA1 817e5463f78af7c3a4fe3b865a29605a5a98060e SHA256 3667b537865770234aec39b58c0d4ece4187f3baee8c148a5628f5aa6e3709a3
+MISC ChangeLog 2806 RMD160 819af9f24271044f824467d040e8bb3765e823d6 SHA1 5c714eb1b5a6b1b26bb2d2cffd9c41639c8ce39c SHA256 515bec69d1f81ef48e912cb8a1c7eef506d9642110077918b37ce22e398c9499
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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() {