Add m4 fixes by James Rowe, bug #109329.

(Portage version: 2.0.51.22-r2)

3 files changed, 73 insertions, 7 deletions

diff --git a/dev-libs/libstroke/ChangeLog b/dev-libs/libstroke/ChangeLog
index 0c62269a3712..94a29b109348 100644
--- a/dev-libs/libstroke/ChangeLog
+++ b/dev-libs/libstroke/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libstroke
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.15 2004/08/07 21:57:05 slarti Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.16 2005/11/14 18:09:44 plasmaroo Exp $
+
+  14 Nov 2005; <plasmaroo@gentoo.org> libstroke-0.5.1.ebuild,
+  +files/libstroke-0.5.1-m4_syntax.patch:
+  Add m4 fixes by James Rowe, bug #109329.
 
   07 Aug 2004; Tom Martin <slarti@gentoo.org> libstroke-0.4.ebuild,
   libstroke-0.5.1.ebuild:
diff --git a/dev-libs/libstroke/files/libstroke-0.5.1-m4_syntax.patch b/dev-libs/libstroke/files/libstroke-0.5.1-m4_syntax.patch
new file mode 100644
index 000000000000..2e4cafc99161
--- /dev/null
+++ b/dev-libs/libstroke/files/libstroke-0.5.1-m4_syntax.patch
@@ -0,0 +1,62 @@
+Index: libstroke-0.5.1/libgstroke.m4
+===================================================================
+--- libstroke-0.5.1/libgstroke.m4	{cset 0327db49-2e2f-4e15-8046-df647f1ed6f9}
++++ libstroke-0.5.1/libgstroke.m4	{local clone}
+@@ -26,7 +26,7 @@
+ dnl                     if different from name
+ dnl description         (optional) used to construct help string
+ dnl
+-AC_DEFUN(smr_ARG_WITHLIB, [
++AC_DEFUN([smr_ARG_WITHLIB], [
+ 
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ 
+@@ -74,7 +74,7 @@
+ dnl extra-flags         (optional) flags required when compiling the
+ dnl                     header, typically more includes; for ex. X_CFLAGS
+ dnl
+-AC_DEFUN(smr_ARG_WITHINCLUDES, [
++AC_DEFUN([smr_ARG_WITHINCLUDES], [
+ 
+ AC_ARG_WITH([$1]-includes,
+ [  --with-$1-includes=DIR  set directory for $1 headers],
+@@ -116,7 +116,7 @@
+ dnl x-libs      (optional) extra libraries, if needed to link with lib
+ dnl x-flags     (optional) extra flags, if needed to include header files
+ dnl
+-AC_DEFUN(smr_CHECK_LIB,
++AC_DEFUN([smr_CHECK_LIB],
+ [
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ ifelse($5, , , smr_header=[$5])
+Index: libstroke-0.5.1/libstroke.m4
+===================================================================
+--- libstroke-0.5.1/libstroke.m4	{cset 02bc4a5e-e9e6-4055-a406-5007a0ac3e55}
++++ libstroke-0.5.1/libstroke.m4	{local clone}
+@@ -26,7 +26,7 @@
+ dnl                     if different from name
+ dnl description         (optional) used to construct help string
+ dnl
+-AC_DEFUN(smr_ARG_WITHLIB, [
++AC_DEFUN([smr_ARG_WITHLIB], [
+ 
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ 
+@@ -74,7 +74,7 @@
+ dnl extra-flags         (optional) flags required when compiling the
+ dnl                     header, typically more includes; for ex. X_CFLAGS
+ dnl
+-AC_DEFUN(smr_ARG_WITHINCLUDES, [
++AC_DEFUN([smr_ARG_WITHINCLUDES], [
+ 
+ AC_ARG_WITH([$1]-includes,
+ [  --with-$1-includes=DIR  set directory for $1 headers],
+@@ -116,7 +116,7 @@
+ dnl x-libs      (optional) extra libraries, if needed to link with lib
+ dnl x-flags     (optional) extra flags, if needed to include header files
+ dnl
+-AC_DEFUN(smr_CHECK_LIB,
++AC_DEFUN([smr_CHECK_LIB],
+ [
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ ifelse($5, , , smr_header=[$5])
diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1.ebuild
index f34511e5e204..3fa9aff732de 100644
--- a/dev-libs/libstroke/libstroke-0.5.1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# 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/dev-libs/libstroke/libstroke-0.5.1.ebuild,v 1.13 2004/11/04 05:17:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/libstroke-0.5.1.ebuild,v 1.14 2005/11/14 18:09:44 plasmaroo Exp $
 
-inherit gnuconfig
+inherit eutils
 
 DESCRIPTION="A Stroke and Gesture recognition Library"
 HOMEPAGE="http://www.etla.net/libstroke/"
@@ -19,10 +19,10 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	gnuconfig_update
+	epatch ${FILESDIR}/${P}-m4_syntax.patch
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc CREDITS ChangeLog README
+	dodoc CREDITS ChangeLog README{,.libgstroke}
 }