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, 24 deletions

diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index 82e113a676f8..96aa2e552ef5 100644
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdejava
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.3 2004/11/24 23:28:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.4 2004/12/10 20:22:02 danarmak Exp $
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  kdejava-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/kdejava/Manifest b/kde-base/kdejava/Manifest
index a3e663b09a60..82c8781cf05f 100644
--- a/kde-base/kdejava/Manifest
+++ b/kde-base/kdejava/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 430333798d12396a4e51a4f7fb829545 kdejava-3.3.1.ebuild 1268
-MD5 e105d534af8e17e11d295e3c47ce3913 ChangeLog 833
+MD5 e5a1d67530d5cdad483ac50a3f01d82d kdejava-3.3.1.ebuild 1128
+MD5 a8dcedf398f5e66929ed8d9e5c1d2a78 ChangeLog 986
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 2ad85ba33ff58d75f9cd509d86b36d15 files/digest-kdejava-3.3.1 299
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
+MD5 b81fee9818db8eac3afd9cabd5bfdfd6 files/digest-kdejava-3.3.1 299
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
 MD5 9598e813037e1a6ea89142a23ac4018a files/classpath.diff 460
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpRkHI1lqEGTUzyQRAh4wAJ0RO1PK0aZi7kq2T3LuuFgmEr+2kwCeMSKc
-kWspeGA25ThYREkEmuqYdWA=
-=Nj+a
------END PGP SIGNATURE-----
diff --git a/kde-base/kdejava/files/digest-kdejava-3.3.1 b/kde-base/kdejava/files/digest-kdejava-3.3.1
index 548224a7f975..42c14c213ef0 100644
--- a/kde-base/kdejava/files/digest-kdejava-3.3.1
+++ b/kde-base/kdejava/files/digest-kdejava-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 d353862365f9a716e9fe0c4714b30538 kdejava-3.3.1-0-makefiles.tar.bz2 63505
+MD5 c43021511eee01f564715f0b12334354 kdejava-3.3.1-1-makefiles.tar.bz2 63643
diff --git a/kde-base/kdejava/files/no-gtk-glib-check.diff b/kde-base/kdejava/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/kdejava/files/no-gtk-glib-check.diff
+++ b/kde-base/kdejava/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/kdejava/kdejava-3.3.1.ebuild b/kde-base/kdejava/kdejava-3.3.1.ebuild
index ef8a5bd1ceae..32723b8cbcdf 100644
--- a/kde-base/kdejava/kdejava-3.3.1.ebuild
+++ b/kde-base/kdejava/kdejava-3.3.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.3.1.ebuild,v 1.4 2004/11/13 10:45:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.3.1.ebuild,v 1.5 2004/12/10 20:22:02 danarmak Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
 KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
+KM_MAKEFILESREV=1
 inherit kde-meta
 
 DESCRIPTION="KDE java bindings"
 KEYWORDS="~x86"
 IUSE=""
-#COMMONDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV"
-COMMONDEPEND="~kde-base/kdebase-$PV ~kde-base/qtjava-$PV"
+COMMONDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV"
 DEPEND="$COMMONDEPEND virtual/jdk"
 RDEPEND="$COMMONDPEND virtual/jre"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/classpath.diff"
@@ -31,7 +31,7 @@ src_unpack() {
 		mv $x $x.orig
 		sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
 		rm $x.orig
-	done
+    done
 }
 
 src_compile() {