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/dcopperl/ChangeLog b/kde-base/dcopperl/ChangeLog
index 7a491e6c6e53..7c83a8ed33ed 100644
--- a/kde-base/dcopperl/ChangeLog
+++ b/kde-base/dcopperl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dcopperl
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/ChangeLog,v 1.2 2004/11/24 23:24:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/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,
+  dcopperl-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/dcopperl/Manifest b/kde-base/dcopperl/Manifest
index 6ae343c642a7..b9f06948daf6 100644
--- a/kde-base/dcopperl/Manifest
+++ b/kde-base/dcopperl/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3e0c8a941ae39bd918efbc2201bdf647 ChangeLog 687
+MD5 a464ddc53a77a49a170699d695d4d9c5 ChangeLog 841
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 a7fff037a278427f07efa0419e9eef46 dcopperl-3.3.1.ebuild 388
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 df0918c1d7277a5bf2feca32bd2189ed files/digest-dcopperl-3.3.1 300
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpRg3I1lqEGTUzyQRApOvAJsHKZvtJUM+iIBPJF2wJhdpHjbDzgCgxMwO
-CrfL6VeA8HWcZtQMVmvgBdM=
-=1Jhj
------END PGP SIGNATURE-----
+MD5 99ee49e5c9627f0692e3c050a68b809c dcopperl-3.3.1.ebuild 303
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 66090ca70d479ca4663427eb774febb6 files/digest-dcopperl-3.3.1 300
diff --git a/kde-base/dcopperl/dcopperl-3.3.1.ebuild b/kde-base/dcopperl/dcopperl-3.3.1.ebuild
index b8722244af6d..887334c9e4b8 100644
--- a/kde-base/dcopperl/dcopperl-3.3.1.ebuild
+++ b/kde-base/dcopperl/dcopperl-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/dcopperl/dcopperl-3.3.1.ebuild,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.3.1.ebuild,v 1.2 2004/12/10 20:22:02 danarmak Exp $
 
 KMNAME=kdebindings
+KM_MAKEFILESREV=1
 inherit kde-meta
 
 DESCRIPTION="Perl bindings for DCOP"
diff --git a/kde-base/dcopperl/files/digest-dcopperl-3.3.1 b/kde-base/dcopperl/files/digest-dcopperl-3.3.1
index e8529211cd77..4808bd17d745 100644
--- a/kde-base/dcopperl/files/digest-dcopperl-3.3.1
+++ b/kde-base/dcopperl/files/digest-dcopperl-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 e497e5c33bd1b869dbdde138add51b2a dcopperl-3.3.1-0-makefiles.tar.bz2 15353
+MD5 431c6a2740503226e6961c1e31421ac2 dcopperl-3.3.1-1-makefiles.tar.bz2 15289
diff --git a/kde-base/dcopperl/files/no-gtk-glib-check.diff b/kde-base/dcopperl/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/dcopperl/files/no-gtk-glib-check.diff
+++ b/kde-base/dcopperl/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],[