Remove gtk1 dependency and patch gtk1 stuff out of Makefile.am. Thanks to Renato Caldas for the patch; bug 156361

(Portage version: 2.1.2_rc2-r2)

5 files changed, 51 insertions, 42 deletions

diff --git a/dev-libs/libstroke/ChangeLog b/dev-libs/libstroke/ChangeLog
index 1b011ed2ddbb..8d93502e242a 100644
--- a/dev-libs/libstroke/ChangeLog
+++ b/dev-libs/libstroke/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libstroke
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.18 2006/09/03 02:28:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/ChangeLog,v 1.19 2006/12/01 23:38:22 masterdriverz Exp $
+
+  01 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  files/libstroke-0.5.1-m4_syntax.patch,
+  +files/libstroke-0.5.1-no_gtk1.patch, libstroke-0.5.1.ebuild:
+  Remove gtk1 dependency and patch gtk1 stuff out of Makefile.am. Thanks to
+  Renato Caldas for the patch; bug 156361
 
   03 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -libstroke-0.4.ebuild:
diff --git a/dev-libs/libstroke/files/digest-libstroke-0.5.1 b/dev-libs/libstroke/files/digest-libstroke-0.5.1
index 65731eb69eea..b7bc87f4368f 100644
--- a/dev-libs/libstroke/files/digest-libstroke-0.5.1
+++ b/dev-libs/libstroke/files/digest-libstroke-0.5.1
@@ -1 +1,3 @@
 MD5 51b9a4e309ac15cfcab96191eed03cb2 libstroke-0.5.1.tar.gz 174270
+RMD160 699bae20d3be15b73567dab6191903ff4921f3b6 libstroke-0.5.1.tar.gz 174270
+SHA256 0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d libstroke-0.5.1.tar.gz 174270
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
index 2e4cafc99161..4462e8d359fb 100644
--- a/dev-libs/libstroke/files/libstroke-0.5.1-m4_syntax.patch
+++ b/dev-libs/libstroke/files/libstroke-0.5.1-m4_syntax.patch
@@ -1,34 +1,3 @@
-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}
diff --git a/dev-libs/libstroke/files/libstroke-0.5.1-no_gtk1.patch b/dev-libs/libstroke/files/libstroke-0.5.1-no_gtk1.patch
new file mode 100644
index 000000000000..a099fb991620
--- /dev/null
+++ b/dev-libs/libstroke/files/libstroke-0.5.1-no_gtk1.patch
@@ -0,0 +1,33 @@
+--- libstroke-0.5.1/configure.in	2001-08-07 07:08:05.000000000 +0100
++++ libstroke-0.5.1b/configure.in	2006-11-28 01:49:26.000000000 +0000
+@@ -81,16 +81,9 @@
+ [  --with-mouse-footprints  Draw mouse footprints in X],
+ [AC_DEFINE(STROKE_MOUSE_FOOTPRINTS)])
+ 
+-dnl check for GTK
+-dnl we won't build libgstroke if it's not found
+-AC_MSG_CHECKING(gtk+ library)
+-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
+-  AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
+-  AC_MSG_WARN(
+-***** NOTE: The GNOME stroke support won't be built
+-)
+-  HAVE_LIBGTK=no,
+-)
++GTK_CFLAGS=""
++AC_SUBST(GTK_CFLAGS)
++HAVE_LIBGTK=no
+ AM_CONDITIONAL(HAVE_LIBGTK,        test "x$HAVE_LIBGTK" = "xyes")
+ 
+ 
+--- libstroke-0.5.1/Makefile.am	2001-08-07 07:03:12.000000000 +0100
++++ libstroke-0.5.1b/Makefile.am	2006-11-28 02:00:55.000000000 +0000
+@@ -10,7 +10,7 @@
+ EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke
+ 
+ m4datadir=$(datadir)/aclocal
+-m4data_DATA=libstroke.m4 libgstroke.m4
++m4data_DATA=libstroke.m4
+ 
+ MOSTLYCLEANFILES = core *~
+ CLEANFILES = core *~
diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1.ebuild
index ae8e1732bc14..332e8543cba7 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-2006 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.16 2006/01/22 16:05:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libstroke/libstroke-0.5.1.ebuild,v 1.17 2006/12/01 23:38:22 masterdriverz Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A Stroke and Gesture recognition Library"
 HOMEPAGE="http://www.etla.net/libstroke/"
@@ -13,18 +13,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	=x11-libs/gtk+-1*
-	|| ( x11-proto/xproto
-	     virtual/x11
-	)"
+DEPEND="|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
-	unpack ${A}
+	unpack "${A}"
+	cd "${S}"
 	epatch ${FILESDIR}/${P}-m4_syntax.patch
+	epatch ${FILESDIR}/${P}-no_gtk1.patch
+	eautoreconf || die 'eautoreconf failed'
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc CREDITS ChangeLog README{,.libgstroke}
+	emake DESTDIR=${D} install || die
+	dodoc CREDITS ChangeLog README
 }