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, 32 insertions, 22 deletions

diff --git a/kde-base/kalyptus/ChangeLog b/kde-base/kalyptus/ChangeLog
index a1134517f129..274b763a4901 100644
--- a/kde-base/kalyptus/ChangeLog
+++ b/kde-base/kalyptus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalyptus
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/ChangeLog,v 1.2 2004/11/24 23:26:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/ChangeLog,v 1.3 2004/12/10 20:22:02 danarmak Exp $
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  kalyptus-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/kalyptus/Manifest b/kde-base/kalyptus/Manifest
index b898a025c0b3..1906fa2272cb 100644
--- a/kde-base/kalyptus/Manifest
+++ b/kde-base/kalyptus/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ffd2d44a8faec5d57750043616ddbced kalyptus-3.3.1.ebuild 628
-MD5 074a22514ec4947d33ae30020bf0c2a0 ChangeLog 687
+MD5 83eae45aa34d0231729bcd9bd52c37b2 kalyptus-3.3.1.ebuild 541
+MD5 2706fe56b0bd4b091380204c71bbf757 ChangeLog 841
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 f4530f6b83e1d96225f07d7110c61535 files/digest-kalyptus-3.3.1 300
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpRiOI1lqEGTUzyQRAv+MAJ0elRg+sN4n5ddWBnnkzC758KUkHgCeMP7/
-ZAzEmYVXg9K3cBqHLvdMBqg=
-=qAz/
------END PGP SIGNATURE-----
+MD5 bbba5db186b90fc32c95076950623940 files/digest-kalyptus-3.3.1 300
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
diff --git a/kde-base/kalyptus/files/digest-kalyptus-3.3.1 b/kde-base/kalyptus/files/digest-kalyptus-3.3.1
index 7904fc33cc2e..0a49002f33ae 100644
--- a/kde-base/kalyptus/files/digest-kalyptus-3.3.1
+++ b/kde-base/kalyptus/files/digest-kalyptus-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 1872eddf083146934b75db6d8c16b8c3 kalyptus-3.3.1-0-makefiles.tar.bz2 13052
+MD5 002877d19b150f0c7664597d84f695ba kalyptus-3.3.1-1-makefiles.tar.bz2 12973
diff --git a/kde-base/kalyptus/files/no-gtk-glib-check.diff b/kde-base/kalyptus/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/kalyptus/files/no-gtk-glib-check.diff
+++ b/kde-base/kalyptus/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/kalyptus/kalyptus-3.3.1.ebuild b/kde-base/kalyptus/kalyptus-3.3.1.ebuild
index 0b87efaddad3..f042b085e026 100644
--- a/kde-base/kalyptus/kalyptus-3.3.1.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.3.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.3.1.ebuild,v 1.2 2004/11/07 02:59:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.3.1.ebuild,v 1.3 2004/12/10 20:22:02 danarmak Exp $
 
 KMNAME=kdebindings
+KM_MAKEFILESREV=1
 inherit kde-meta
 
 DESCRIPTION="KDE bindings generator for C, ObjC and Java"
@@ -21,4 +22,4 @@ src_compile () {
 src_install() {
 	cd $S/kalyptus
 	make install DESTDIR=$D
-}
+}
\ No newline at end of file