Add patch to compile with gcc-4.1, bug 146070. Also change patch call to epatch

Package-Manager: portage-2.1.2_rc2-r2

5 files changed, 37 insertions, 15 deletions

diff --git a/app-office/kletterwizard/ChangeLog b/app-office/kletterwizard/ChangeLog
index 031d43878153..a3ed529a01bd 100644
--- a/app-office/kletterwizard/ChangeLog
+++ b/app-office/kletterwizard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kletterwizard
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.17 2006/06/25 16:52:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.18 2006/11/25 19:43:25 masterdriverz Exp $
+
+  25 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/kletterwizard-0.9.7-gcc-4.1.patch, kletterwizard-0.9.7.ebuild:
+  Add patch to compile with gcc-4.1, bug 146070. Also change patch call to epatch
 
   25 Jun 2006; Simon Stelling <blubb@gentoo.org> kletterwizard-0.9.7.ebuild:
   stable on amd64
diff --git a/app-office/kletterwizard/Manifest b/app-office/kletterwizard/Manifest
index fe8aca0b9fce..2c7071e7aaa6 100644
--- a/app-office/kletterwizard/Manifest
+++ b/app-office/kletterwizard/Manifest
@@ -2,20 +2,24 @@ AUX kletterwizard-0.9.6-gentoo.diff 1505 RMD160 2808e16c02a4594f9fdc1a21c4c7be41
 MD5 bead1367fe377e3aa71427f048472657 files/kletterwizard-0.9.6-gentoo.diff 1505
 RMD160 2808e16c02a4594f9fdc1a21c4c7be413cbc6e9c files/kletterwizard-0.9.6-gentoo.diff 1505
 SHA256 e6b64892a378073a0a75607b4d7a1c312cfafe33fc71630f6cc939affe138d2a files/kletterwizard-0.9.6-gentoo.diff 1505
+AUX kletterwizard-0.9.7-gcc-4.1.patch 517 RMD160 da4aa22d6e1a0116e95ac63627dddc5b971f4a85 SHA1 aff6df469f0b19575b6e7eada6c4fecc47244c42 SHA256 abe084da0427aba02cd02703d675a3ae7ef624738c4a5128741b57bfeca920b2
+MD5 0aeaefeb733297e1b62de96a3fc45e3c files/kletterwizard-0.9.7-gcc-4.1.patch 517
+RMD160 da4aa22d6e1a0116e95ac63627dddc5b971f4a85 files/kletterwizard-0.9.7-gcc-4.1.patch 517
+SHA256 abe084da0427aba02cd02703d675a3ae7ef624738c4a5128741b57bfeca920b2 files/kletterwizard-0.9.7-gcc-4.1.patch 517
 DIST kletterwizard-0.9.6.tar.gz 994545
-DIST kletterwizard-0.9.7.tar.gz 997714
+DIST kletterwizard-0.9.7.tar.gz 997714 RMD160 003d766df6f4e0c3c584a574cde1c94419d6f388 SHA1 e945d80340feac6181b7dd94b58e9b5b3ba6a4e8 SHA256 34c9bfb3037d52150e6458992369a60ee979376934c50d92244e9a84b2e4f24b
 EBUILD kletterwizard-0.9.6.ebuild 966 RMD160 e6c3510d8fdba253817bd4fb3282ef5530118f81 SHA1 966132d46a270d8e59b9171e24faaee37db4d586 SHA256 867b5de100342efe6b3003c57a807b75ef890694cb8387b2b8461f03b00ddc4b
 MD5 985918558c70e1ee526b74bf181f2f19 kletterwizard-0.9.6.ebuild 966
 RMD160 e6c3510d8fdba253817bd4fb3282ef5530118f81 kletterwizard-0.9.6.ebuild 966
 SHA256 867b5de100342efe6b3003c57a807b75ef890694cb8387b2b8461f03b00ddc4b kletterwizard-0.9.6.ebuild 966
-EBUILD kletterwizard-0.9.7.ebuild 926 RMD160 fbd82840b120d99fc2e0110033205c8a13798a3b SHA1 d667313d3ef9a2389d850df698804d46d419d2ee SHA256 e4c5388dcde2dcd219bed541628fe2f6140435a3b14aa8e161f3af64f5227c26
-MD5 127ce79df6bc3152752fae85db04c1fe kletterwizard-0.9.7.ebuild 926
-RMD160 fbd82840b120d99fc2e0110033205c8a13798a3b kletterwizard-0.9.7.ebuild 926
-SHA256 e4c5388dcde2dcd219bed541628fe2f6140435a3b14aa8e161f3af64f5227c26 kletterwizard-0.9.7.ebuild 926
-MISC ChangeLog 2504 RMD160 59fb25730dd2522c3d48ee15ec222a69022b6d31 SHA1 d6a975a1806e88d561dc75c84a1319cc044cec59 SHA256 93c494178f7d71b600f254a5e694c4a8fa65ff7b7dac1caec1010e3823a1e62c
-MD5 82ac671832ff213f670009d73ccd5552 ChangeLog 2504
-RMD160 59fb25730dd2522c3d48ee15ec222a69022b6d31 ChangeLog 2504
-SHA256 93c494178f7d71b600f254a5e694c4a8fa65ff7b7dac1caec1010e3823a1e62c ChangeLog 2504
+EBUILD kletterwizard-0.9.7.ebuild 972 RMD160 08834c5c38ebbfcbb1dc868496f2565d88384fa4 SHA1 8eb71f05aa7a1f21e1abdd0c1845cb29515d449a SHA256 3947b0957b02f6ede8c5a81800d5714e730f873d3dbd56087a8124e6907b9dcd
+MD5 bdd33b684fc5087aca3bf840b5446f92 kletterwizard-0.9.7.ebuild 972
+RMD160 08834c5c38ebbfcbb1dc868496f2565d88384fa4 kletterwizard-0.9.7.ebuild 972
+SHA256 3947b0957b02f6ede8c5a81800d5714e730f873d3dbd56087a8124e6907b9dcd kletterwizard-0.9.7.ebuild 972
+MISC ChangeLog 2726 RMD160 db7d64b53ee1ef602417b184a7f2f2ce31c48ffb SHA1 53ad6411c4a437449330770717a9f056f5fb1aa8 SHA256 8b50beb3336fe5196e5e98dfa0884c2027c6418f4eed82d745d0005351c00460
+MD5 2b5fe6556042d72f2fa7eefa0c62a324 ChangeLog 2726
+RMD160 db7d64b53ee1ef602417b184a7f2f2ce31c48ffb ChangeLog 2726
+SHA256 8b50beb3336fe5196e5e98dfa0884c2027c6418f4eed82d745d0005351c00460 ChangeLog 2726
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
@@ -23,6 +27,6 @@ SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata
 MD5 b28a8de5a4b3cca948dbc0b34cc67768 files/digest-kletterwizard-0.9.6 71
 RMD160 c29cab408f67b10bb0e918041340c85a18ece732 files/digest-kletterwizard-0.9.6 71
 SHA256 83e9f3ff0021117217242aa874dc602fb6fa553dc57eef8845edc0a3b135a313 files/digest-kletterwizard-0.9.6 71
-MD5 e185bb0427789475889ea9194b77ba12 files/digest-kletterwizard-0.9.7 71
-RMD160 3369405030486d489d5b80b6fd0509ab9cf07acf files/digest-kletterwizard-0.9.7 71
-SHA256 1202a4f6757666a56f6dc4cf067225d30d4f2a597bccf6264473265ca2d27990 files/digest-kletterwizard-0.9.7 71
+MD5 41e9524716aeb7c8f537d0687335db08 files/digest-kletterwizard-0.9.7 259
+RMD160 acf1822ee1151528166d962ae6fbc7f17112f4e6 files/digest-kletterwizard-0.9.7 259
+SHA256 8985030c7749c2326f65f1e706b981fe36812a8e1eede2b990d0f3dbe0cd82b2 files/digest-kletterwizard-0.9.7 259
diff --git a/app-office/kletterwizard/files/digest-kletterwizard-0.9.7 b/app-office/kletterwizard/files/digest-kletterwizard-0.9.7
index 9f1045acc7be..b7cde0428682 100644
--- a/app-office/kletterwizard/files/digest-kletterwizard-0.9.7
+++ b/app-office/kletterwizard/files/digest-kletterwizard-0.9.7
@@ -1 +1,3 @@
 MD5 2d547750201c8791bbe068cf56582ec2 kletterwizard-0.9.7.tar.gz 997714
+RMD160 003d766df6f4e0c3c584a574cde1c94419d6f388 kletterwizard-0.9.7.tar.gz 997714
+SHA256 34c9bfb3037d52150e6458992369a60ee979376934c50d92244e9a84b2e4f24b kletterwizard-0.9.7.tar.gz 997714
diff --git a/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch b/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch
new file mode 100644
index 000000000000..a7aba56b9d1a
--- /dev/null
+++ b/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch
@@ -0,0 +1,11 @@
+--- src/klwletter.cpp.orig	2006-11-25 19:35:14.000000000 +0000
++++ src/klwletter.cpp	2006-11-25 19:35:31.000000000 +0000
+@@ -228,7 +228,7 @@
+ {
+     KProcess *proc = new KProcess;
+     *proc << klwSettings::latex();
+-    *proc << " \\nonstopmode\\input\{" << letterTexfile->name() << "\}";
++    *proc << " \\nonstopmode\\input{" << letterTexfile->name() << "}";
+     proc->setWorkingDirectory(letterTmpDir->name());
+     connect(proc,SIGNAL(processExited(KProcess* )),this,SLOT(letterBuildPS()));
+     proc->start();
diff --git a/app-office/kletterwizard/kletterwizard-0.9.7.ebuild b/app-office/kletterwizard/kletterwizard-0.9.7.ebuild
index 45f2c9df895d..111072b239d0 100644
--- a/app-office/kletterwizard/kletterwizard-0.9.7.ebuild
+++ b/app-office/kletterwizard/kletterwizard-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.7.ebuild,v 1.3 2006/06/25 16:52:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.7.ebuild,v 1.4 2006/11/25 19:43:25 masterdriverz Exp $
 
 inherit kde
 
@@ -20,7 +20,8 @@ need-kde 3.4
 
 src_unpack() {
 	kde_src_unpack
-	patch -p0 < ${FILESDIR}/${PN}-0.9.6-gentoo.diff
+	epatch "${FILESDIR}/${PN}-0.9.6-gentoo.diff"
+	epatch "${FILESDIR}/${P}-gcc-4.1.patch"
 }
 
 src_compile() {