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, 34 insertions, 23 deletions

diff --git a/kde-base/dcopjava/ChangeLog b/kde-base/dcopjava/ChangeLog
index 705297231ece..7d41d770414f 100644
--- a/kde-base/dcopjava/ChangeLog
+++ b/kde-base/dcopjava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dcopjava
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/ChangeLog,v 1.4 2004/11/24 23:23:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/ChangeLog,v 1.5 2004/12/10 20:22:02 danarmak Exp $
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  dcopjava-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/dcopjava/Manifest b/kde-base/dcopjava/Manifest
index 502309957540..4dbfde30c847 100644
--- a/kde-base/dcopjava/Manifest
+++ b/kde-base/dcopjava/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d32a1d9781a888415774cd30da6f6945 dcopjava-3.3.1.ebuild 752
-MD5 c317c5b15d4b45fce94ce157880ccb29 ChangeLog 972
+MD5 30df3dc54d80fe305901374e8e4f7014 dcopjava-3.3.1.ebuild 669
+MD5 ced57e8c563fc690454fe8cfffc121b1 ChangeLog 1126
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 ba6821665cdc96b40f48b2271478b7a1 files/digest-dcopjava-3.3.1 300
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpRgKI1lqEGTUzyQRAlYzAJ99L7TttSrwem06Hf6b4BGCgFI7ZACcDIBs
-FCqAZ0DD0FvHJSVtrystZKw=
-=SGnV
------END PGP SIGNATURE-----
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 4ed500d857695c546e771eac1fbd8a55 files/digest-dcopjava-3.3.1 300
diff --git a/kde-base/dcopjava/dcopjava-3.3.1.ebuild b/kde-base/dcopjava/dcopjava-3.3.1.ebuild
index 025fc9e5890e..738f7947d004 100644
--- a/kde-base/dcopjava/dcopjava-3.3.1.ebuild
+++ b/kde-base/dcopjava/dcopjava-3.3.1.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/dcopjava-3.3.1.ebuild,v 1.5 2004/11/17 17:44:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/dcopjava-3.3.1.ebuild,v 1.6 2004/12/10 20:22:02 danarmak Exp $
 
 # NOTE TODO install a jar file rather than a tree of class files, and use java-pkg.eclass,
 # in keeping with policy
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kdejava/configure.in.in"
+KM_MAKEFILESREV=1
 inherit kde-meta
 
 DESCRIPTION="Java bindings for DCOP"
-KEYWORDS="-*"
+KEYWORDS="~x86"
 IUSE=""
 DEPEND="virtual/jdk"
 RDEPEND="virtual/jre"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
+
 pkg_setup() {
 	ewarn "This package is consdered broken by upstream. You're on your own."
 }
@@ -23,4 +25,4 @@ pkg_setup() {
 src_compile () {
 	myconf="$myconf --with-java=`java-config --jdk-home`"
 	kde-meta_src_compile
-}
+}
\ No newline at end of file
diff --git a/kde-base/dcopjava/files/digest-dcopjava-3.3.1 b/kde-base/dcopjava/files/digest-dcopjava-3.3.1
index 60761712c541..31be1139134a 100644
--- a/kde-base/dcopjava/files/digest-dcopjava-3.3.1
+++ b/kde-base/dcopjava/files/digest-dcopjava-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 060948a94466ad7f3f149c5f97286945 dcopjava-3.3.1-0-makefiles.tar.bz2 20593
+MD5 758b4d920c76e3cc2ba3754a7377cc4a dcopjava-3.3.1-1-makefiles.tar.bz2 20530
diff --git a/kde-base/dcopjava/files/no-gtk-glib-check.diff b/kde-base/dcopjava/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/dcopjava/files/no-gtk-glib-check.diff
+++ b/kde-base/dcopjava/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],[