From 644d7162189ca013ad1c969e13468d998bfbb0c0 Mon Sep 17 00:00:00 2001 From: Charlie Shepherd Date: Fri, 1 Dec 2006 23:38:22 +0000 Subject: [PATCH] Remove gtk1 dependency and patch gtk1 stuff out of Makefile.am. Thanks to Renato Caldas for the patch; bug 156361 Package-Manager: portage-2.1.2_rc2-r2 --- dev-libs/libstroke/ChangeLog | 8 ++++- dev-libs/libstroke/Manifest | 36 ++++++++++--------- .../libstroke/files/digest-libstroke-0.5.1 | 2 ++ .../files/libstroke-0.5.1-m4_syntax.patch | 31 ---------------- .../files/libstroke-0.5.1-no_gtk1.patch | 33 +++++++++++++++++ dev-libs/libstroke/libstroke-0.5.1.ebuild | 19 +++++----- 6 files changed, 71 insertions(+), 58 deletions(-) create mode 100644 dev-libs/libstroke/files/libstroke-0.5.1-no_gtk1.patch 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 + 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 -libstroke-0.4.ebuild: diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest index 2f996413f93f..833f95666c51 100644 --- a/dev-libs/libstroke/Manifest +++ b/dev-libs/libstroke/Manifest @@ -1,20 +1,24 @@ -AUX libstroke-0.5.1-m4_syntax.patch 2203 RMD160 51a13f7c7bb4614ceb74ae291f7ddc96d5412f7a SHA1 f7fdc7b46b1c9fab9f9c47e5e268a4e3529e99ce SHA256 94a76afb0b714e8fcf0e30d0605d0d639c4553c2c8a9ceb50f382dcc38afc1ea -MD5 442280d6a75b0d2f47a7435d6f6b5c64 files/libstroke-0.5.1-m4_syntax.patch 2203 -RMD160 51a13f7c7bb4614ceb74ae291f7ddc96d5412f7a files/libstroke-0.5.1-m4_syntax.patch 2203 -SHA256 94a76afb0b714e8fcf0e30d0605d0d639c4553c2c8a9ceb50f382dcc38afc1ea files/libstroke-0.5.1-m4_syntax.patch 2203 -DIST libstroke-0.5.1.tar.gz 174270 -EBUILD libstroke-0.5.1.ebuild 742 RMD160 f1b028783d2525e3dc5743dea5f5f96a2b870048 SHA1 f3a6f4fe9c951c9605d903ea60533ae84fd5cfa0 SHA256 c71fecdb7dd40e6ef0903b3dcda15cb3331da6565214d3c1fefce9a356e92124 -MD5 a7a0fb3b842f1ae73055d2ab9d502c7e libstroke-0.5.1.ebuild 742 -RMD160 f1b028783d2525e3dc5743dea5f5f96a2b870048 libstroke-0.5.1.ebuild 742 -SHA256 c71fecdb7dd40e6ef0903b3dcda15cb3331da6565214d3c1fefce9a356e92124 libstroke-0.5.1.ebuild 742 -MISC ChangeLog 2342 RMD160 863473f2b4cd2fa9b63ea5456cb55591db9df275 SHA1 3826eb22ad4d86300fa09a15c8fb0fa9afbc3ec7 SHA256 ec4c7b1c96b34d8a6133f3571ddb889885d4aeb1ff185a172dd13e9a760d64d6 -MD5 228d91367296d3efa54be7eebdf07495 ChangeLog 2342 -RMD160 863473f2b4cd2fa9b63ea5456cb55591db9df275 ChangeLog 2342 -SHA256 ec4c7b1c96b34d8a6133f3571ddb889885d4aeb1ff185a172dd13e9a760d64d6 ChangeLog 2342 +AUX libstroke-0.5.1-m4_syntax.patch 1100 RMD160 ae4fec7d09a69ba259625de4fbe6d61acb4196df SHA1 51ec0b973dcf1f62a787ae21dd8746afe8a1fc30 SHA256 ce1ec607f570d5248294df0127d2b31dda1f52c611cd02903c741ab081a43eb1 +MD5 7a0e4bb90e06dd189fc677faf1673171 files/libstroke-0.5.1-m4_syntax.patch 1100 +RMD160 ae4fec7d09a69ba259625de4fbe6d61acb4196df files/libstroke-0.5.1-m4_syntax.patch 1100 +SHA256 ce1ec607f570d5248294df0127d2b31dda1f52c611cd02903c741ab081a43eb1 files/libstroke-0.5.1-m4_syntax.patch 1100 +AUX libstroke-0.5.1-no_gtk1.patch 1046 RMD160 659d171777ba1266d18d31caa5f848a907a4e2a8 SHA1 c79acd9712fa5c6b9a9ac21621c6858ec10d84dd SHA256 c7dcbe5c09124be9af6de4c4cd7512b38181f14efab49a849e6af8db5ffc5adb +MD5 22e4e383f8d7682cd0f2d5ef6c91f90e files/libstroke-0.5.1-no_gtk1.patch 1046 +RMD160 659d171777ba1266d18d31caa5f848a907a4e2a8 files/libstroke-0.5.1-no_gtk1.patch 1046 +SHA256 c7dcbe5c09124be9af6de4c4cd7512b38181f14efab49a849e6af8db5ffc5adb files/libstroke-0.5.1-no_gtk1.patch 1046 +DIST libstroke-0.5.1.tar.gz 174270 RMD160 699bae20d3be15b73567dab6191903ff4921f3b6 SHA1 48bd2b98faa8681ccd97eda7a09442845dbf1b7b SHA256 0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d +EBUILD libstroke-0.5.1.ebuild 796 RMD160 f11b8f0a9e87671e02c50d69593603601643b7ab SHA1 7b2ccb4a7bb827a333305386dc2630ff32d69080 SHA256 b20a059b5f649f51ea8c116ea0fde58416625e7ac70be5ad558010aa874c603d +MD5 c8ef89d9fcc6c7bef7533e07f68412d1 libstroke-0.5.1.ebuild 796 +RMD160 f11b8f0a9e87671e02c50d69593603601643b7ab libstroke-0.5.1.ebuild 796 +SHA256 b20a059b5f649f51ea8c116ea0fde58416625e7ac70be5ad558010aa874c603d libstroke-0.5.1.ebuild 796 +MISC ChangeLog 2629 RMD160 282041a5bf5d7d26d361cb3756daae3f9e7a05ac SHA1 8a623e9fbb03dd1f39c5c7fa017990db5ce8c371 SHA256 9124d8605da850edb3a443bc2a31a9c7852603245c8acb35736ca53124932e19 +MD5 7ffcca930f07a8287abf2aa2f5620b81 ChangeLog 2629 +RMD160 282041a5bf5d7d26d361cb3756daae3f9e7a05ac ChangeLog 2629 +SHA256 9124d8605da850edb3a443bc2a31a9c7852603245c8acb35736ca53124932e19 ChangeLog 2629 MISC metadata.xml 225 RMD160 d6f2b917ec03bda238f5d0de165092976b04a68f SHA1 5b29c5913449fef5b6accfa86f83a1c091915321 SHA256 ef49ed0988724c20373ad61a01189f8ae45fec631e1194215931610d4d5accb5 MD5 a5c50833bcc05f696a75e5dc8bb9eb4d metadata.xml 225 RMD160 d6f2b917ec03bda238f5d0de165092976b04a68f metadata.xml 225 SHA256 ef49ed0988724c20373ad61a01189f8ae45fec631e1194215931610d4d5accb5 metadata.xml 225 -MD5 f326e3b555cd7ab918577090c330cc42 files/digest-libstroke-0.5.1 67 -RMD160 fdfb0948dbc1e4c93bd81571f1dbb3802364fc5a files/digest-libstroke-0.5.1 67 -SHA256 01e879b19255dce625a6218f088c8fc0a75455de9bf9dcbacf66480b8decb469 files/digest-libstroke-0.5.1 67 +MD5 63c6565ce495fe4a218a84b0bc582d7a files/digest-libstroke-0.5.1 247 +RMD160 51e01b8f5f9ca060f7437f270e1bc53e25239ef9 files/digest-libstroke-0.5.1 247 +SHA256 9a293a5582692711ea5cda80bbcccfbff965fe2f9db318edc6882701f10fe9af files/digest-libstroke-0.5.1 247 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 } -- 2.26.2