fix no-gtk-glib-check.diff to remove the check from another place where it appeared, and bump the KM_MAKEFILESREV for affected ebuilds

5 files changed, 31 insertions, 21 deletions

diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index 60e31c7b0f27..d20ccd99910e 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/smoke
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.2 2004/11/24 23:34:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.3 2004/12/10 20:22:03 danarmak Exp $
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  smoke-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
 
   25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
   Added missing digest entries.
diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 5294cc4c251c..2e063b5e58c9 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3693aa0d3e07e466755863c161739332 ChangeLog 704
+MD5 82759bb50e42b604ed6a7a23fbdea56d ChangeLog 855
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 32fc7234e980122f6abd6562ad8cbc94 smoke-3.3.1.ebuild 530
+MD5 9cf8b463811f0c29eac968d02a46f24e smoke-3.3.1.ebuild 451
 MD5 92a2bf7b4c3eebd09d53b684b22513af files/parallel-make.diff 1696
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 5f39b8fea4a249d11da6c26d25038fd7 files/digest-smoke-3.3.1 297
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpRqdI1lqEGTUzyQRAinJAJ4vZybga/GxHWg3aJjlhWtroRdyrgCfSnn3
-L4oxDSdXBPrSYtgO2MfyA1g=
-=uaK5
------END PGP SIGNATURE-----
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 f0e0d7875732133d86b1160e1734ad6d files/digest-smoke-3.3.1 297
diff --git a/kde-base/smoke/files/digest-smoke-3.3.1 b/kde-base/smoke/files/digest-smoke-3.3.1
index fb5d3b9202a9..624fcb471ff2 100644
--- a/kde-base/smoke/files/digest-smoke-3.3.1
+++ b/kde-base/smoke/files/digest-smoke-3.3.1
@@ -1,4 +1,4 @@
 MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
 MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 a676a142e64fe0575a0d0415101a1b00 smoke-3.3.1-0-makefiles.tar.bz2 19210
+MD5 770cf9f84dbeb49dfebd7229f76a4d77 smoke-3.3.1-1-makefiles.tar.bz2 19080
diff --git a/kde-base/smoke/files/no-gtk-glib-check.diff b/kde-base/smoke/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/smoke/files/no-gtk-glib-check.diff
+++ b/kde-base/smoke/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/smoke/smoke-3.3.1.ebuild b/kde-base/smoke/smoke-3.3.1.ebuild
index c5cc4e285e83..b0a3aaee50ab 100644
--- a/kde-base/smoke/smoke-3.3.1.ebuild
+++ b/kde-base/smoke/smoke-3.3.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.3.1.ebuild,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.3.1.ebuild,v 1.2 2004/12/10 20:22:03 danarmak Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
+KM_MAKEFILESREV=1
 inherit kde-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"