Fix for gcc 3.4 (#61595). Patch by Anton Starikov <antst@ifm.liu.se>.

diff --git a/x11-misc/kmousetool/ChangeLog b/x11-misc/kmousetool/ChangeLog
index e2e0ebc5d0469fb68e4b0fd380643a88ec54af5c..fafea2fb0c1dfd1b085a0f34541840db7a5f0a1e 100644 (file)
--- a/x11-misc/kmousetool/ChangeLog
+++ b/x11-misc/kmousetool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/kmousetool
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/kmousetool/ChangeLog,v 1.11 2004/09/02 22:49:41 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kmousetool/ChangeLog,v 1.12 2005/01/10 16:34:38 greg_g Exp $
+
+  10 Jan 2005; Gregorio Guidi <greg@gentoo.org>
+  +files/kmousetool-1.11-gcc34-fix.patch, kmousetool-1.11.ebuild:
+  Fix for gcc 3.4 (#61595). Patch by Anton Starikov <antst@ifm.liu.se>.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   kmousetool-1.05.ebuild, kmousetool-1.11.ebuild:

diff --git a/x11-misc/kmousetool/Manifest b/x11-misc/kmousetool/Manifest
index adccb00aa60de8309777bd3936a3e16cf631e719..089ddda869a5b3f65982bba69f9f4a02bb6fc974 100644 (file)
--- a/x11-misc/kmousetool/Manifest
+++ b/x11-misc/kmousetool/Manifest
@@ -1,5 +1,7 @@
-MD5 2efd703a3b0b35f37d0c793623bb068e ChangeLog 1271
+MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 1ba4bf024a257bb6b1ce2e8d1ad56bcc kmousetool-1.05.ebuild 440
-MD5 b4c52ea08f480564712c3a0a3cfe7615 kmousetool-1.11.ebuild 440
-MD5 e054d2743e45116e4bbe6ecb013469ef files/digest-kmousetool-1.05 67
+MD5 753c2aa6198f95f73325e91253a1b9b1 ChangeLog 1456
+MD5 7e8375cfd8cfccfdaf51313997d05ae5 kmousetool-1.11.ebuild 518
 MD5 0421b5b9905883a5c9989b0a4101ad23 files/digest-kmousetool-1.11 67
+MD5 e5999b2b244384f4e4e0a08d284c6f74 files/kmousetool-1.11-gcc34-fix.patch 453
+MD5 e054d2743e45116e4bbe6ecb013469ef files/digest-kmousetool-1.05 67

diff --git a/x11-misc/kmousetool/files/kmousetool-1.11-gcc34-fix.patch b/x11-misc/kmousetool/files/kmousetool-1.11-gcc34-fix.patch
new file mode 100644 (file)
index 0000000..fcfed6e
--- /dev/null
+++ b/x11-misc/kmousetool/files/kmousetool-1.11-gcc34-fix.patch
@@ -0,0 +1,19 @@
+diff -urNa kmousetool-1.11.old/kmousetool/mtstroke.cpp kmousetool-1.11/kmousetool/mtstroke.cpp
+--- kmousetool-1.11.old/kmousetool/mtstroke.cpp        2002-12-11 03:14:16.000000000 +0100
++++ kmousetool-1.11/kmousetool/mtstroke.cpp    2004-08-25 05:34:47.406702016 +0200
+@@ -88,7 +88,7 @@
+       points.push_back(Pt(x,y));
+     }
+   }
+-};
++}
+ 
+ 
+ /*
+@@ -310,4 +310,4 @@
+   char ch = 'a';
+   while (ch != '\n')
+     infile.get(ch);
+-}
+\ No newline at end of file
++}

diff --git a/x11-misc/kmousetool/kmousetool-1.11.ebuild b/x11-misc/kmousetool/kmousetool-1.11.ebuild
index fe92049038ebc759195bd41805398446a5883071..5505303d6c86c14b013498a7f3897048ea0f2b15 100644 (file)
--- a/x11-misc/kmousetool/kmousetool-1.11.ebuild
+++ b/x11-misc/kmousetool/kmousetool-1.11.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/kmousetool/kmousetool-1.11.ebuild,v 1.7 2004/09/02 22:49:41 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kmousetool/kmousetool-1.11.ebuild,v 1.8 2005/01/10 16:34:38 greg_g Exp $
 
 inherit kde
 
-need-kde 3
-
 DESCRIPTION="kmousetool - anti rsi tool"
 HOMEPAGE="http://www.mousetool.com"
 LICENSE="GPL-2"
@@ -14,3 +12,10 @@ IUSE=""
 
 SRC_URI="http://www.mousetool.com/distribution/${P}.tar.gz"
 
+need-kde 3
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}-gcc34-fix.patch
+}

diff --git a/x11-misc/kmousetool/metadata.xml b/x11-misc/kmousetool/metadata.xml
new file mode 100644 (file)
index 0000000..b435a84
--- /dev/null
+++ b/x11-misc/kmousetool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde-other</herd>
+</pkgmetadata>