Fix important bug related to directory paths in gok's schemas.

6 files changed, 16 insertions, 62 deletions

diff --git a/gnome-extra/gok/ChangeLog b/gnome-extra/gok/ChangeLog
index 03374f1d9a8a..724cb16fa9d6 100644
--- a/gnome-extra/gok/ChangeLog
+++ b/gnome-extra/gok/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for gnome-extra/gok
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gok/ChangeLog,v 1.3 2003/11/04 01:07:51 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gok/ChangeLog,v 1.4 2003/11/06 21:00:09 leonardop Exp $
 
+  06 Nov 2003; L. Boshell <leonardop@gentoo.org> gok-0.8.4.ebuild :
+  Fix for some schemas that were being set incorrectly due to awkward m4
+  rules.
+  
 *gok-0.8.4 (03 Nov 2003)
 
   03 Nov 2003; L. Boshell <leonardop@gentoo.org> gok-0.8.4.ebuild :
diff --git a/gnome-extra/gok/Manifest b/gnome-extra/gok/Manifest
index b9571b13e75a..1c02d4004282 100644
--- a/gnome-extra/gok/Manifest
+++ b/gnome-extra/gok/Manifest
@@ -1,7 +1,4 @@
-MD5 e400a206458f6973d5b74aa0e52817b2 ChangeLog 438
-MD5 5cf39ffb96fdb59041c769ae6889884a gok-0.8.4.ebuild 684
+MD5 2389db8d6d71776e3a2b894e723aabdc ChangeLog 591
+MD5 379749d38fe74695f0278772310fa5d8 gok-0.8.4.ebuild 796
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 24b08db4fb18b36c5d112df37b4ae88d gok-0.8.3.ebuild 766
-MD5 5bee1f567e8eeb918044a17b56482f01 files/digest-gok-0.8.3 62
-MD5 0117b7d5af8f875f58fe5f441de2afef files/gok-0.8.3-gcc2_fix.patch 560
 MD5 6870d0680326f8c0ccf6da446b554d56 files/digest-gok-0.8.4 62
diff --git a/gnome-extra/gok/files/digest-gok-0.8.3 b/gnome-extra/gok/files/digest-gok-0.8.3
deleted file mode 100644
index 3b95f4fd6dda..000000000000
--- a/gnome-extra/gok/files/digest-gok-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 413b37447b6f7bb108d53bcf55cf3b0b gok-0.8.3.tar.bz2 712494
diff --git a/gnome-extra/gok/files/gok-0.8.3-gcc2_fix.patch b/gnome-extra/gok/files/gok-0.8.3-gcc2_fix.patch
deleted file mode 100644
index 809c89a17f58..000000000000
--- a/gnome-extra/gok/files/gok-0.8.3-gcc2_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NurB gok-0.8.3-orig/gok/gok-scanner.c gok-0.8.3/gok/gok-scanner.c
---- gok-0.8.3-orig/gok/gok-scanner.c	2003-10-10 02:12:30.000000000 -0500
-+++ gok-0.8.3/gok/gok-scanner.c	2003-10-10 02:12:53.000000000 -0500
-@@ -220,10 +220,10 @@
- 	xmlNode *retval = NULL;
- 	int      target_lang_len = strlen ((char *)target_lang);
- 	gboolean lang_is_matched = FALSE;	
--
--	gok_log_enter();
- 	gboolean is_lang_match = FALSE;
- 	gboolean is_perfect_match = FALSE;
-+
-+	gok_log_enter();
- 	/* loop through the document looking for the name string */
- 	while (pNode != NULL)
- 	{
diff --git a/gnome-extra/gok/gok-0.8.3.ebuild b/gnome-extra/gok/gok-0.8.3.ebuild
deleted file mode 100644
index a48c16b128f2..000000000000
--- a/gnome-extra/gok/gok-0.8.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gok/gok-0.8.3.ebuild,v 1.2 2003/10/10 08:51:18 leonardop Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome Onscreen Keyboard"
-HOMEPAGE="http://www.gok.ca/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/gconf-2
-	>=dev-libs/atk-1.3
-	gnome-base/gail
-	media-sound/esound
-	>=x11-libs/libwnck-1
-	>=gnome-extra/at-spi-1.3.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc2_fix.patch
-}
-
diff --git a/gnome-extra/gok/gok-0.8.4.ebuild b/gnome-extra/gok/gok-0.8.4.ebuild
index 21bc90326aba..ae8b05725788 100644
--- a/gnome-extra/gok/gok-0.8.4.ebuild
+++ b/gnome-extra/gok/gok-0.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gok/gok-0.8.4.ebuild,v 1.1 2003/11/04 01:07:51 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gok/gok-0.8.4.ebuild,v 1.2 2003/11/06 21:00:09 leonardop Exp $
 
 inherit gnome2
 
@@ -28,3 +28,11 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper"
 
 DOCS="AUTHORS ChangeLog COPYING NEWS README"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	sed -i 's:$pkgdatadir:/usr/share/gok:' gok-with-references.schemas.m4
+}