Patch the build system so that it can build with modern automake, allowing for this to be built with libtool-2.4. Also fix quoting of $FILESDIR and properly set RDEPEND/DEPEND.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 57 insertions, 10 deletions

diff --git a/dev-libs/libstroke/ChangeLog b/dev-libs/libstroke/ChangeLog
index b44385d483eb..f07c567e4979 100644
--- a/dev-libs/libstroke/ChangeLog
+++ b/dev-libs/libstroke/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libstroke
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.24 2007/09/19 09:24:33 calchan Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.25 2010/12/01 22:09:17 flameeyes Exp $
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> libstroke-0.5.1.ebuild,
+  +files/libstroke-0.5.1-autotools.patch:
+  Patch the build system so that it can build with modern automake, allowing
+  for this to be built with libtool-2.4. Also fix quoting of $FILESDIR and
+  properly set RDEPEND/DEPEND.
 
   19 Sep 2007; Denis Dupeyron <calchan@gentoo.org> metadata.xml,
   libstroke-0.5.1.ebuild:
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 8ca6f50e879d..54de2fba6e06 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libstroke-0.5.1-autotools.patch 734 RMD160 2bb36552d154af42e4bd205ffae0551970e66c96 SHA1 c3f23d9412954d5ce95b89a4874a3a6d4b6dbf46 SHA256 30b3190ce350aac45d9724fe629cfe6d14e2cebc1289cce7693acc3438490c01
 AUX libstroke-0.5.1-m4_syntax.patch 1100 RMD160 ae4fec7d09a69ba259625de4fbe6d61acb4196df SHA1 51ec0b973dcf1f62a787ae21dd8746afe8a1fc30 SHA256 ce1ec607f570d5248294df0127d2b31dda1f52c611cd02903c741ab081a43eb1
 AUX libstroke-0.5.1-no_gtk1.patch 1046 RMD160 659d171777ba1266d18d31caa5f848a907a4e2a8 SHA1 c79acd9712fa5c6b9a9ac21621c6858ec10d84dd SHA256 c7dcbe5c09124be9af6de4c4cd7512b38181f14efab49a849e6af8db5ffc5adb
 DIST libstroke-0.5.1.tar.gz 174270 RMD160 699bae20d3be15b73567dab6191903ff4921f3b6 SHA1 48bd2b98faa8681ccd97eda7a09442845dbf1b7b SHA256 0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d
-EBUILD libstroke-0.5.1.ebuild 816 RMD160 b2362a79a7b3d70753a56aba0a3e411ec62aba01 SHA1 1ee210898b023968f6a778856bea43c98f19d8b9 SHA256 cb48e9c0045bcb95d4c0b642998dcc319dac88a67cd2f610ef5e51599a4be90d
-MISC ChangeLog 3255 RMD160 6915ebccbaec8ec2e616ab605b0537557a49a8c8 SHA1 25ffb1a10cd74fad349156c2b1ac7dd5eae59824 SHA256 2743ee7f83ba25842291e1b709964f098f378f1105a2aa78bf664c90fc90640b
+EBUILD libstroke-0.5.1.ebuild 868 RMD160 14f16384fa0d6a0dcee310b824bbfeeb8eb73ca0 SHA1 f91b50b6cfde2ce1bf48ff598f09a99fa20fdd7d SHA256 d8952850a171644af53b8d247b51c09749a54428823adfd17ae77d09d01af7db
+MISC ChangeLog 3563 RMD160 95c9d5686deb6770fa371796980a7d3877a2044b SHA1 fe67908e49cbdb289cc305bc29f6c482fde1908b SHA256 4a9ba801c6156ad7d0c33314e71bf7e980ead9cad6ce008aee8a6a6e36388381
 MISC metadata.xml 268 RMD160 719ee68464a7add9e6586311b6ceabfaf2586e22 SHA1 2a29013efa016f5a57e0e90f7e713218b4734dad SHA256 e8b205b0276da3378a045e9fb7b8a1f3151fd75289ced6235302e89ed95f208f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz2x44ACgkQAiZjviIA2XjKUgCgzNG/Jg8wxxuYFj/qBs+GgB9k
+CpwAnREVAFcxuce3HupTZZ5PLsxt2Lz9
+=JBFT
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libstroke/files/libstroke-0.5.1-autotools.patch b/dev-libs/libstroke/files/libstroke-0.5.1-autotools.patch
new file mode 100644
index 000000000000..2bd67677a89c
--- /dev/null
+++ b/dev-libs/libstroke/files/libstroke-0.5.1-autotools.patch
@@ -0,0 +1,29 @@
+Index: libstroke-0.5.1/libgstroke/Makefile.am
+===================================================================
+--- libstroke-0.5.1.orig/libgstroke/Makefile.am
++++ libstroke-0.5.1/libgstroke/Makefile.am
+@@ -5,8 +5,6 @@
+ # level Makefile.
+ AUTOMAKE_OPTIONS = foreign
+ 
+-EXTRA_DIST = 
+-
+ #SEL_BIB = libgstroke.la
+ 
+ lib_LTLIBRARIES = libgstroke.la
+Index: libstroke-0.5.1/libstroke/Makefile.am
+===================================================================
+--- libstroke-0.5.1.orig/libstroke/Makefile.am
++++ libstroke-0.5.1/libstroke/Makefile.am
+@@ -5,11 +5,6 @@
+ # level Makefile.
+ AUTOMAKE_OPTIONS = foreign
+ 
+-EXTRA_DIST = 
+-
+-#tclpath::
+-	#echo ${ENABLE_TCL}
+-
+ #if ENABLE_TCL
+ #SEL_BIB = libstroke.la libstroke_tcl.la
+ #else
diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1.ebuild
index 0e2a7543d13c..d583c2ddc24c 100644
--- a/dev-libs/libstroke/libstroke-0.5.1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 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.22 2007/09/19 09:24:33 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/libstroke-0.5.1.ebuild,v 1.23 2010/12/01 22:09:17 flameeyes Exp $
 
-WANT_AUTOMAKE=1.4
 inherit eutils autotools
 
 DESCRIPTION="A Stroke and Gesture recognition Library"
@@ -14,14 +13,16 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
+RDEPEND="x11-libs/libX11"
 DEPEND="x11-proto/xproto
-	x11-libs/libX11"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-m4_syntax.patch
-	epatch ${FILESDIR}/${P}-no_gtk1.patch
+	epatch "${FILESDIR}"/${P}-m4_syntax.patch
+	epatch "${FILESDIR}"/${P}-no_gtk1.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
 	eautoreconf || die 'eautoreconf failed'
 }