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

diff --git a/kde-base/xparts/ChangeLog b/kde-base/xparts/ChangeLog
index 4d0e426c9c60..f93623e50f13 100644
--- a/kde-base/xparts/ChangeLog
+++ b/kde-base/xparts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/xparts
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/ChangeLog,v 1.3 2004/11/24 23:35:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/ChangeLog,v 1.4 2004/12/10 20:22:03 danarmak Exp $
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  xparts-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/xparts/Manifest b/kde-base/xparts/Manifest
index 3db38258e929..046d84a5c333 100644
--- a/kde-base/xparts/Manifest
+++ b/kde-base/xparts/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b32731d39b63bd7eadad4ffa462efbd4 xparts-3.3.1.ebuild 1176
-MD5 25bd379ae89e120489e742e4b786636b ChangeLog 833
+MD5 e53ac8c35d47ae39072ac1a09defb056 xparts-3.3.1.ebuild 1098
+MD5 f2605bf34c16402f077060820c3e6a18 ChangeLog 985
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 4d7c1d1b1be1b6d9c7829ee09661e209 files/digest-xparts-3.3.1 298
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpRrFI1lqEGTUzyQRAuYBAKDFGM/IMeMpEpgcdlm286WmmNUHcQCePpQ3
-PWahhzf53S1L9fdTJMbpGJg=
-=yjuj
------END PGP SIGNATURE-----
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 664013043bb1362df44abe44210e6166 files/digest-xparts-3.3.1 298
diff --git a/kde-base/xparts/files/digest-xparts-3.3.1 b/kde-base/xparts/files/digest-xparts-3.3.1
index bec261b9f652..36d5ed04aa2b 100644
--- a/kde-base/xparts/files/digest-xparts-3.3.1
+++ b/kde-base/xparts/files/digest-xparts-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 417a805ec322808f5652e963623af24a xparts-3.3.1-0-makefiles.tar.bz2 22230
+MD5 39d295a202633a01b0532e40e6c44809 xparts-3.3.1-1-makefiles.tar.bz2 22405
diff --git a/kde-base/xparts/files/no-gtk-glib-check.diff b/kde-base/xparts/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/xparts/files/no-gtk-glib-check.diff
+++ b/kde-base/xparts/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/xparts/xparts-3.3.1.ebuild b/kde-base/xparts/xparts-3.3.1.ebuild
index 519673d4b3d5..a9f6e7b37e52 100644
--- a/kde-base/xparts/xparts-3.3.1.ebuild
+++ b/kde-base/xparts/xparts-3.3.1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.3.1.ebuild,v 1.3 2004/11/17 17:47:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.3.1.ebuild,v 1.4 2004/12/10 20:22:03 danarmak Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
 KMCOPYLIB="libdcopc dcopc"
+KM_MAKEFILESREV=1
 inherit kde-meta
 
 DESCRIPTION="Allows embedding of generic XParts as KDE KParts (broken)"
-KEYWORDS="-*"
+KEYWORDS="~x86"
 IUSE="mozilla"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
@@ -35,3 +36,4 @@ src_unpack() {
 	fi
 	cd ${S} && make -f admin/Makefile.common
 }
+