fix for gcc-4, bug #120607

(Portage version: 2.1_pre7-r2)

5 files changed, 44 insertions, 14 deletions

diff --git a/games-util/emilia-pinedit/ChangeLog b/games-util/emilia-pinedit/ChangeLog
index 44abcb520d0a..68bd5dc6e80f 100644
--- a/games-util/emilia-pinedit/ChangeLog
+++ b/games-util/emilia-pinedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/emilia-pinedit
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/ChangeLog,v 1.7 2005/09/16 22:23:50 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/ChangeLog,v 1.8 2006/04/01 10:39:00 tupone Exp $
+
+  01 Apr 2006; <Tupone@gentoo.org> +files/emilia-pinedit-0.3.1-gcc4.patch,
+  emilia-pinedit-0.3.1.ebuild:
+  Fix compiling with gcc-4, bug #120607 by joshuabaergen. Thanks for patch
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-util/emilia-pinedit/Manifest b/games-util/emilia-pinedit/Manifest
index 2448ba8e1523..f6327b5bb527 100644
--- a/games-util/emilia-pinedit/Manifest
+++ b/games-util/emilia-pinedit/Manifest
@@ -1,15 +1,18 @@
-MD5 12c40c3b72201d121f166b1792e4f65a ChangeLog 926
-RMD160 22c1ece0e6e237164405521f637e115f2bfbcee1 ChangeLog 926
-SHA256 78881010b224854951ace2677838ca4155b00b1860f8ccffebad217b472c3151 ChangeLog 926
-MD5 bd22c501409547144e51f7d964b196cd emilia-pinedit-0.3.1.ebuild 1381
-RMD160 cf0b5a641376c868d8dae51690f468baaf51a5e7 emilia-pinedit-0.3.1.ebuild 1381
-SHA256 0dd1de407a0a693d3475719623af821e492bfd9a66bb5ec8d4058c87d7f37627 emilia-pinedit-0.3.1.ebuild 1381
+MD5 913304ad56b0d1a7f9b5802c4cc42f67 ChangeLog 1108
+RMD160 877da3c468c95ef58b443da7038678201a6b41a4 ChangeLog 1108
+SHA256 2379335af92bb013b180209ffa580241002d4450bfaf6d04ebe1d464a1ae97de ChangeLog 1108
+MD5 383b85b8946dae228889ee83ca576cba emilia-pinedit-0.3.1.ebuild 1415
+RMD160 25a5d7f095ef8e15ef5c705bb3f47fd6807a0e48 emilia-pinedit-0.3.1.ebuild 1415
+SHA256 2496d8f1c103ea7c4d1660b151e99c0fd20d25c557cbad4b5fea9d721a4326a0 emilia-pinedit-0.3.1.ebuild 1415
 MD5 60a658534e2d09a438b77cf44b08bbd4 files/0.3.1-assert.patch 525
 RMD160 a6bceff29344ec36b02111dc4d73f2348476b75c files/0.3.1-assert.patch 525
 SHA256 d718dca672bc5e37312a7b3aa4e9f3175309a6b1787b2c294ed06a8592aedd39 files/0.3.1-assert.patch 525
-MD5 37689c5b51074f36c8cc6af759d2ade5 files/digest-emilia-pinedit-0.3.1 66
-RMD160 d3dde19d8aae8ae5debdf763c48847aebf3ed5e3 files/digest-emilia-pinedit-0.3.1 66
-SHA256 0ebd650d97a743e0a809edad64dfe4d518f5448772f089744221ca10c9917c3d files/digest-emilia-pinedit-0.3.1 66
+MD5 dab0ea7023242f13292e95ea8ff6a3fe files/digest-emilia-pinedit-0.3.1 244
+RMD160 68417e00e864eb6e4b863f2ffd90828811267b0e files/digest-emilia-pinedit-0.3.1 244
+SHA256 4a2ba3180adf960d765ff672e43d0a7feba318ea39c200d1de89b021ce2383cb files/digest-emilia-pinedit-0.3.1 244
+MD5 76282c90c2779fb6ce8307d228f66668 files/emilia-pinedit-0.3.1-gcc4.patch 659
+RMD160 2ee9a567a3c5fa72da07a83e277e21d2342c62c1 files/emilia-pinedit-0.3.1-gcc4.patch 659
+SHA256 53807233f38e98a15037a7f2f63348163d99411cbf9644bf879e7b9d86d8be7f files/emilia-pinedit-0.3.1-gcc4.patch 659
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild b/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
index 370e25c08e1a..14793293fd7f 100644
--- a/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
+++ b/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# 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-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild,v 1.12 2006/01/28 07:24:55 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/emilia-pinedit/emilia-pinedit-0.3.1.ebuild,v 1.13 2006/04/01 10:39:00 tupone Exp $
 
 inherit eutils games
 
@@ -37,7 +37,8 @@ src_unpack() {
 		-e "/^LDFLAGS/s:$:$(pinball-config --libs) @LIBS@ -lSDL -lSDL_image -lSDL_mixer:" \
 		pinedit/Makefile.in \
 		|| die "sed pinedit/Makefile.in failed"
-	epatch ${FILESDIR}/${PV}-assert.patch
+	epatch ${FILESDIR}/${PV}-assert.patch \
+		"${FILESDIR}"/${P}-gcc4.patch
 }
 
 src_compile() {
diff --git a/games-util/emilia-pinedit/files/digest-emilia-pinedit-0.3.1 b/games-util/emilia-pinedit/files/digest-emilia-pinedit-0.3.1
index 431d8f21721e..8286e7fd7507 100644
--- a/games-util/emilia-pinedit/files/digest-emilia-pinedit-0.3.1
+++ b/games-util/emilia-pinedit/files/digest-emilia-pinedit-0.3.1
@@ -1 +1,3 @@
 MD5 3f33c72ef8749e8259aa600622d668f9 pinedit-0.3.1.tar.gz 1244070
+RMD160 142b5416957f0c460ebf20b9c92fb0b7157b3fd4 pinedit-0.3.1.tar.gz 1244070
+SHA256 14c818e539c0ffa49868f5e7a92858038df91bd38610b38743946f9183538aa1 pinedit-0.3.1.tar.gz 1244070
diff --git a/games-util/emilia-pinedit/files/emilia-pinedit-0.3.1-gcc4.patch b/games-util/emilia-pinedit/files/emilia-pinedit-0.3.1-gcc4.patch
new file mode 100644
index 000000000000..2ab229f81a05
--- /dev/null
+++ b/games-util/emilia-pinedit/files/emilia-pinedit-0.3.1-gcc4.patch
@@ -0,0 +1,20 @@
+--- pinedit/fileutil.h.original	2006-04-01 12:16:59.000000000 +0200
++++ pinedit/fileutil.h	2006-04-01 12:17:42.000000000 +0200
+@@ -36,14 +36,14 @@
+   int writeGroup(QTextStream & file, Group * Group);
+   int writeShape(QTextStream & file, Shape3D * shape);
+   int writeBehavior(QTextStream & file, Behavior * beh);
+-  inline void FileUtil::incIndent() {
++  inline void incIndent() {
+     ++m_iIndent;
+   };
+-  inline void FileUtil::decIndent() {
++  inline void decIndent() {
+     --m_iIndent;
+     if (m_iIndent < 0) m_iIndent = 0;
+   };
+-  inline void FileUtil::resetIndent() {
++  inline void resetIndent() {
+     m_iIndent = 0;
+   };
+   PinEditDoc * p_Doc;