bump'n'clean

17 files changed, 82 insertions, 558 deletions

diff --git a/dev-util/gambas/ChangeLog b/dev-util/gambas/ChangeLog
index c8a68f6ee352..0c69623ee5ee 100644
--- a/dev-util/gambas/ChangeLog
+++ b/dev-util/gambas/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-util/gambas
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.18 2004/10/11 04:15:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.19 2004/11/14 08:49:54 genone Exp $
+
+*gambas-1.0_rc2 (14 Nov 2004)
+
+  14 Nov 2004; Marius Mauch <genone@gentoo.org> -files/Makefile.am-0.90,
+  -files/Makefile.am-0.93, -files/Makefile.am-0.94,
+  +files/Makefile.am-1.0_rc2, -files/gbx_exec_enum-0.92.patch,
+  -files/info-location-0.90.patch, -files/non-symlink-0.90.patch,
+  -files/non-symlink-0.94.patch, -files/non-symlink-0.95.patch,
+  -gambas-0.95.ebuild, -gambas-0.97a.ebuild, gambas-0.99.ebuild, 
+  +gambas-1.0_rc2.ebuild:
+  - version bump
+  - marking 0.99 stable
+  - cleaning old versions and old auxiliary files
 
 *gambas-0.99 (11 Oct 2004)
 
diff --git a/dev-util/gambas/Manifest b/dev-util/gambas/Manifest
index fedad1616fb2..a101c972288a 100644
--- a/dev-util/gambas/Manifest
+++ b/dev-util/gambas/Manifest
@@ -2,27 +2,18 @@
 Hash: SHA1
 
 MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
-MD5 3523437861d1510f52bf1d7a8decff79 gambas-0.95.ebuild 1939
-MD5 5fbbdaae8eaa0ce64337d2b41027fe9f ChangeLog 3449
-MD5 7b9531fe48ebda039d5be4536ed5fbf0 gambas-0.99.ebuild 1926
-MD5 0a35ef4f22d9ce374bd5029e7701f966 gambas-0.97a.ebuild 1927
-MD5 964111dfc43bdc4aab2276817f8f57df files/Makefile.am-0.90 1370
-MD5 a7abb94385567542662526650958f5f1 files/gbx_exec_enum-0.92.patch 751
-MD5 ef914d63f991882bd4c95e78c9eb069d files/info-location-0.90.patch 872
-MD5 30893adf8f34f69b90fa4e9e736b579b files/non-symlink-0.90.patch 1489
-MD5 896a5bf9a06b25d691e1f01bd04381bd files/Makefile.am-0.93 1444
-MD5 6e6d82cdd260691a8eaad33158b15a6a files/Makefile.am-0.94 1447
-MD5 da3cd57f803b4dc0717bdedde046da20 files/non-symlink-0.94.patch 2658
+MD5 86084ca7bdc135a82399fbfc9b6769b1 ChangeLog 3982
+MD5 3fff42865e3cad317fd7de9c28b8dc10 gambas-0.99.ebuild 1925
+MD5 4f353fae8e98dc31bee9f3f870ddc002 gambas-1.0_rc2.ebuild 1967
 MD5 39016f3bbaf4069a963b10796d8f48f1 files/WebHome.html 692
-MD5 ecaa2d7dc30481f5ac7ff194a37d5555 files/digest-gambas-0.95 65
-MD5 8f6c4de24a80ef81fd184b62358b8c89 files/non-symlink-0.95.patch 2384
-MD5 99c9b13466e214f7550f8a50f7736a47 files/digest-gambas-0.97a 66
 MD5 13a65dd33d4fd1d346206b80aaf3a1ff files/Makefile.am-0.97a 1528
 MD5 36441908c5da6408e450be896bf7e7b3 files/digest-gambas-0.99 65
+MD5 46576353afec6078cb608e0f93d88c42 files/digest-gambas-1.0_rc2 69
+MD5 6e75485231906f1c04df05c8cb24e502 files/Makefile.am-1.0_rc2 1725
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBagjY6J2i8a8J4okRAp/cAJ94gPV5g+F0usn5JkJ4skUXYz0a0QCgrUxe
-M35UhvonXTI15/a4B4s4/mQ=
-=N9RI
+iD8DBQFBlypd6J2i8a8J4okRAt5GAKCFxgm5aVV70xfChSbUHKiYp6x2DwCgzai3
+WqH8CdW5ODMDCSCP6mqE9kU=
+=KP8m
 -----END PGP SIGNATURE-----
diff --git a/dev-util/gambas/files/Makefile.am-0.90 b/dev-util/gambas/files/Makefile.am-0.90
deleted file mode 100644
index 2ce545a44313..000000000000
--- a/dev-util/gambas/files/Makefile.am-0.90
+++ /dev/null
@@ -1,37 +0,0 @@
-SUBDIRS = libltdl src
-EXTRA_DIST = TODO reconf app examples help README.REDHAT
-##AUTOMAKE_OPTIONS = dist-bzip2
-
-install-exec-local:
-	@echo
-	@echo "Installing the development environment..."
-	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
-	  gbc -ag; gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
-
-	# This part is producing segfaults on kde stuff, so we remove the KDE stuff
-	@rm -f $(libdir)/lib.gb.qt.kde*.component
-	@echo
-	@echo "Creating the library info files..."
-	@$(INSTALL) -d $(libdir)/gambas/info/
-	@$(bindir)/gbi -a
-	@rm -f $(libdir)/lib.gb.la
-	@rm -f $(libdir)/lib.gb.so*
-
-	@echo
-	@echo "Installing the gambas help files..."
-	@$(INSTALL) -d $(datadir)/help
-	@rm -rf $(datadir)/help
-	@cp -R $(srcdir)/help $(datadir)
-
-	@echo
-	@echo "Installing the gambas examples..."
-	@rm -rf $(datadir)/examples
-	@$(INSTALL) -d $(datadir)/examples
-	@cp -R $(srcdir)/examples $(datadir)
-	@(cd $(datadir)/examples; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
-	  gbc -ag; gba; done)
-
-dist-hook:
-	@(cd $(distdir)/app; for p in *; do rm -rf $$p/.gambas $$p/.xvpics $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; done)
-	@(cd $(distdir)/examples; for p in *; do rm -rf $$p/.gambas $$p/.xvpics  $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; done)
-
diff --git a/dev-util/gambas/files/Makefile.am-0.93 b/dev-util/gambas/files/Makefile.am-0.93
deleted file mode 100644
index 4a1482ee7eae..000000000000
--- a/dev-util/gambas/files/Makefile.am-0.93
+++ /dev/null
@@ -1,42 +0,0 @@
-SUBDIRS = libltdl src
-EXTRA_DIST = TODO reconf app examples help README README.REDHAT README.DEBIAN
-##AUTOMAKE_OPTIONS = dist-bzip2
-
-install-exec-local:
-	@echo
-	@echo "Installing the development environment..."
-	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
-	  gbc -ag; gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
-
-	@echo
-	@echo "Creating the library info files..."
-	@$(INSTALL) -d $(pkgdatadir)/info
-	@$(bindir)/gbi -a
-	@rm -f $(pkglibdir)/lib.gb.la
-	@rm -f $(pkglibdir)/lib.gb.so*
-
-	@echo
-	@echo "Installing the gambas help files..."
-	@$(INSTALL) -d $(pkgdatadir)/help
-	@rm -rf $(pkgdatadir)/help
-	@cp -R $(srcdir)/help $(pkgdatadir)
-
-	@echo
-	@echo "Installing the gambas examples..."
-	@rm -rf $(pkgdatadir)/examples
-	@$(INSTALL) -d $(pkgdatadir)/examples
-	@cp -R $(srcdir)/examples $(pkgdatadir)
-	@(cd $(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
-	  if test -e .project; then \
-	    echo "Compiling $$p..."; cd $$d/$$p; gbc -ag; gba; \
-	  fi \
-	done)
-
-dist-hook:
-	@(cd $(distdir)/app; for p in *; do rm -rf $$p/.gambas $$p/.xvpics $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/*/*~ $$p/*/*/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; done)
-	@(cd $(distdir)/examples; for p in */ */*/; do \
-	  if test -e $$p/.project; then \
-	    rm -rf $$p/.gambas $$p/.xvpics  $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/*/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; \
-	  fi \
-	done)
-
diff --git a/dev-util/gambas/files/Makefile.am-0.94 b/dev-util/gambas/files/Makefile.am-0.94
deleted file mode 100644
index 2c84c2c6005d..000000000000
--- a/dev-util/gambas/files/Makefile.am-0.94
+++ /dev/null
@@ -1,42 +0,0 @@
-SUBDIRS = libltdl src
-EXTRA_DIST = TODO reconf app examples help README README.REDHAT README.DEBIAN
-##AUTOMAKE_OPTIONS = dist-bzip2
-
-install-exec-local:
-	@echo
-	@echo "Creating the library info files..."
-	@$(INSTALL) -d $(pkgdatadir)/info
-	@$(bindir)/gbi -a -p
-	@rm -f $(pkglibdir)/lib.gb.la
-	@rm -f $(pkglibdir)/lib.gb.so*
-
-	@echo
-	@echo "Installing the development environment..."
-	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
-	  gbc -ag; gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
-
-	@echo
-	@echo "Installing the gambas help files..."
-	@$(INSTALL) -d $(pkgdatadir)/help
-	@rm -rf $(pkgdatadir)/help
-	@cp -R $(srcdir)/help $(pkgdatadir)
-
-	@echo
-	@echo "Installing the gambas examples..."
-	@rm -rf $(pkgdatadir)/examples
-	@$(INSTALL) -d $(pkgdatadir)/examples
-	@cp -R $(srcdir)/examples $(pkgdatadir)
-	@(cd $(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
-	  if test -e .project; then \
-	    echo "Compiling $$p..."; cd $$d/$$p; gbc -ag; gba; \
-	  fi \
-	done)
-
-dist-hook:
-	@(cd $(distdir)/app; for p in *; do rm -rf $$p/.gambas $$p/.xvpics $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/*/*~ $$p/*/*/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; done)
-	@(cd $(distdir)/examples; for p in */ */*/; do \
-	  if test -e $$p/.project; then \
-	    rm -rf $$p/.gambas $$p/.xvpics  $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/*/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; \
-	  fi \
-	done)
-
diff --git a/dev-util/gambas/files/Makefile.am-1.0_rc2 b/dev-util/gambas/files/Makefile.am-1.0_rc2
new file mode 100644
index 000000000000..a830a9e0bf27
--- /dev/null
+++ b/dev-util/gambas/files/Makefile.am-1.0_rc2
@@ -0,0 +1,49 @@
+SUBDIRS = libltdl src
+EXTRA_DIST = TODO reconf app examples spec help debian README README.REDHAT README.DEBIAN
+##AUTOMAKE_OPTIONS = dist-bzip2
+
+install-exec-local:
+	@if test "x$(ROOT)" != "x"; then \
+	 echo "Installing with ROOT=$(ROOT)"; \
+         echo; \
+        fi
+
+	@if test "x$(DESTDIR)" != "x"; then \
+	 echo "Installing with DESTDIR=$(DESTDIR)"; \
+         echo; \
+	 ROOT=$DESTDIR; \
+        fi
+
+	@echo
+	@echo "Creating the library info files..."
+	@rm -rf $(DESTDIR)$(pkgdatadir)/info
+	@$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/info
+	@$(DESTDIR)$(bindir)/gbi -a -r $(prefix)
+	@rm -f $(DESTDIR)$(pkglibdir)/lib.gb.la
+	@rm -f $(DESTDIR)$(pkglibdir)/lib.gb.so*
+
+	@echo
+	@echo "Installing the development environment..."
+	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
+	  $(DESTDIR)$(bindir)/gbc -ag; $(DESTDIR)$(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(DESTDIR)$(bindir); done)
+	@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
+	 rm -f $(ROOT)/usr/bin/gambas; \
+	 ln -s $(DESTDIR)$(bindir)/gambas $(ROOT)/usr/bin/gambas; \
+        fi
+
+	@echo
+	@echo "Installing the gambas help files..."
+	@$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/help
+	@rm -rf $(DESTDIR)$(pkgdatadir)/help
+	@cp -R $(srcdir)/help $(DESTDIR)$(pkgdatadir)
+
+	@echo
+	@echo "Installing the gambas examples..."
+	@rm -rf $(DESTDIR)$(pkgdatadir)/examples
+	@$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/examples
+	@cp -R $(srcdir)/examples $(DESTDIR)$(pkgdatadir)
+	@(cd $(DESTDIR)$(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
+	  if test -e .project; then \
+	    echo "Compiling $$p..."; cd $$d/$$p; $(DESTDIR)$(bindir)/gbc -ag; $(DESTDIR)$(bindir)/gba; \
+	  fi \
+	done)
diff --git a/dev-util/gambas/files/digest-gambas-0.95 b/dev-util/gambas/files/digest-gambas-0.95
deleted file mode 100644
index 17dfcf252090..000000000000
--- a/dev-util/gambas/files/digest-gambas-0.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 046e14eece120c72c0dba7587365a793 gambas-0.95.tar.bz2 3698616
diff --git a/dev-util/gambas/files/digest-gambas-0.97a b/dev-util/gambas/files/digest-gambas-0.97a
deleted file mode 100644
index fd464031c6c5..000000000000
--- a/dev-util/gambas/files/digest-gambas-0.97a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbb5dae8297d90564b3487993c88a7c2 gambas-0.97a.tar.bz2 3536657
diff --git a/dev-util/gambas/files/digest-gambas-1.0_rc2 b/dev-util/gambas/files/digest-gambas-1.0_rc2
new file mode 100644
index 000000000000..955ca95e5640
--- /dev/null
+++ b/dev-util/gambas/files/digest-gambas-1.0_rc2
@@ -0,0 +1 @@
+MD5 09d18daa973d09d2234d80f3b0d70377 gambas-0.99.RC2.tar.bz2 3746913
diff --git a/dev-util/gambas/files/gbx_exec_enum-0.92.patch b/dev-util/gambas/files/gbx_exec_enum-0.92.patch
deleted file mode 100644
index 09acc8bec34f..000000000000
--- a/dev-util/gambas/files/gbx_exec_enum-0.92.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/exec/gbx_exec_enum.c.org	2004-02-28 11:46:15.000000000 +0100
-+++ src/exec/gbx_exec_enum.c	2004-04-10 04:19:03.479686056 +0200
-@@ -41,8 +41,8 @@
-   local = &BP[code & 0xFF];
- 
-   EXEC_object(local, &class, &object, &defined);
--  EXEC_enum_data = (void *)(local[1]._void.value);
--  memset(EXEC_enum_data, 0, 8);
-+  EXEC_enum_data = (void *)(&local[1]._void.ptype);
-+  memset(EXEC_enum_data, 0, 12);
- 
-   EXEC_special(SPEC_FIRST, class, object, 0, TRUE);
- }
-@@ -58,7 +58,7 @@
-   local = &BP[PC[-1] & 0xFF];
- 
-   EXEC_object(local, &class, &object, &defined);
--  EXEC_enum_data = (void *)(local[1]._void.value);
-+  EXEC_enum_data = (void *)(&local[1]._void.ptype);
- 
-   EXEC_enum_stop = FALSE;
- 
-@@ -70,3 +70,4 @@
- 
-   return EXEC_enum_stop;
- }
-+
diff --git a/dev-util/gambas/files/info-location-0.90.patch b/dev-util/gambas/files/info-location-0.90.patch
deleted file mode 100644
index 5f5e49dbb816..000000000000
--- a/dev-util/gambas/files/info-location-0.90.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/comp/gbi.c.orig	2004-03-08 21:46:41.263561816 +0100
-+++ src/comp/gbi.c	2004-02-07 18:33:10.000000000 +0100
-@@ -633,7 +605,7 @@
-       if (strcmp(FILE_get_ext(name), ".component"))
-         continue;
- 
--      path = STR_copy(FILE_set_ext(FILE_cat(_lib_path, "info", &name[4], NULL), ".info"));
-+      path = STR_copy(FILE_set_ext(FILE_cat(_lib_path, "gambas/info", &name[4], NULL), ".info"));
-       name = STR_copy(FILE_get_basename(&name[4]));
- 
-       out = fopen(path, "w");
---- app/gambas/CComponent.class.orig	2004-03-08 22:06:19.147496240 +0100
-+++ app/gambas/CComponent.class	2004-03-08 22:00:17.712442720 +0100
-@@ -124,7 +124,7 @@
-     All[sLig].Load
-   NEXT
- 
--  sPath = Component.Path &/ "info" &/ Key & ".info"
-+  sPath = Component.Path &/ "gambas/info" &/ Key & ".info"
-   IF NOT Exist(sPath) THEN
-     PRINT "Warning: cannot find "; sPath
-     RETURN
diff --git a/dev-util/gambas/files/non-symlink-0.90.patch b/dev-util/gambas/files/non-symlink-0.90.patch
deleted file mode 100644
index d36d2a5607c9..000000000000
--- a/dev-util/gambas/files/non-symlink-0.90.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/comp/gbi.c.org	2003-10-27 21:51:41.000000000 +0100
-+++ src/comp/gbi.c	2003-11-17 23:41:29.000000000 +0100
-@@ -54,6 +54,34 @@
- #include "str.h"
- #include "gambas.h"
- 
-+/* needed to install in a different location than /usr */
-+char *which(const char *app)
-+{
-+	char *path = NULL;
-+	char *p = NULL;
-+	char *rValue = NULL;
-+		
-+	path = getenv("PATH");
-+	if (!path) {
-+		path = "/usr/bin/";
-+	}
-+	p = strtok(strdup(path), ":");
-+	while (p) {
-+		rValue = (char *)calloc(sizeof(char), strlen(p)+strlen(app)+2);
-+		strcat(rValue, p);
-+		rValue[strlen(p)] = '/';
-+		strcat(rValue, app);
-+		rValue[strlen(p)+1+strlen(app)] = '\0';
-+		if (access(rValue, X_OK) == 0) {
-+			return rValue;
-+		}
-+		p = strtok(NULL, ":");
-+		free(rValue);
-+		rValue = NULL;
-+	}
-+	return NULL;
-+}
-+																														
- 
- PRIVATE char _lib_path[MAX_PATH + 1];
- PRIVATE FILE *out;
-@@ -102,7 +129,7 @@
- 
-   /* chemin d'installation de Gambas */
- 
--  path = FILE_readlink(GAMBAS_LINK_PATH);
-+  path = which("gbx");
-   if (!path)
-   {
-     path = GAMBAS_LINK_PATH;
-@@ -422,7 +450,7 @@
-   if (strcmp(name, "gb") == 0)
-   {
-     sprintf(path, LIB_PATTERN, _lib_path, name);
--    dlib = dlopen("/usr/bin/gbx", RTLD_NOW);
-+    dlib = dlopen(which("gbx"), RTLD_NOW);
-     if (!dlib)
-       error2("Cannot open component:", dlerror());
- 
-@@ -472,7 +500,7 @@
-   sprintf(buf, "LD_PRELOAD=%s", lib);
-   putenv(buf);
-   putenv("GAMBAS_PRELOAD=1");
--  execv("/usr/bin/gbi", argv);
-+  execvp("gbi", argv);
- #endif
- }
- 
diff --git a/dev-util/gambas/files/non-symlink-0.94.patch b/dev-util/gambas/files/non-symlink-0.94.patch
deleted file mode 100644
index c3c718807e0b..000000000000
--- a/dev-util/gambas/files/non-symlink-0.94.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- src/comp/Makefile.am.org	2004-07-01 20:43:29.670993248 +0200
-+++ src/comp/Makefile.am	2004-07-01 20:43:45.909524616 +0200
-@@ -18,7 +18,8 @@
-  gbc_output.c gbc_pcode.c \
-  gb_file.h gb_file.c \
-  gbc_form.h gbc_form.c \
-- gb_str.h gb_str.c
-+ gb_str.h gb_str.c \
-+ which.c
- 
- gba_SOURCES = \
-  gb_error.h gb_error.c \
-@@ -34,7 +35,8 @@
-  gb_alloc.c gb_array.c \
-  gb_str.h gb_str.c \
-  gb_file.h gb_file.c \
-- gbi.c
-+ gbi.c \
-+ which.c
- 
- %.h: ;
- 
---- src/comp/which.c.org	2003-10-27 21:51:41.000000000 +0100
-+++ src/comp/which.c	2003-11-17 23:41:29.000000000 +0100
-@@ -0,0 +1,33 @@
-+/* needed to install in a different location than /usr */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+char *which(const char *app)
-+{
-+	char *path = NULL;
-+	char *p = NULL;
-+	char *rValue = NULL;
-+		
-+	path = getenv("PATH");
-+	if (!path) {
-+		path = "/usr/bin/";
-+	}
-+	p = strtok(strdup(path), ":");
-+	while (p) {
-+		rValue = (char *)calloc(sizeof(char), strlen(p)+strlen(app)+2);
-+		strcat(rValue, p);
-+		rValue[strlen(p)] = '/';
-+		strcat(rValue, app);
-+		rValue[strlen(p)+1+strlen(app)] = '\0';
-+		if (access(rValue, X_OK) == 0) {
-+			return rValue;
-+		}
-+		p = strtok(NULL, ":");
-+		free(rValue);
-+		rValue = NULL;
-+	}
-+	return NULL;
-+}
-+																														
---- src/comp/gbi.c.org	2003-10-27 21:51:41.000000000 +0100
-+++ src/comp/gbi.c	2003-11-17 23:41:29.000000000 +0100
-@@ -54,6 +54,7 @@
- #include "gb_str.h"
- #include "gambas.h"
- 
-+char *which(const char *app);
- 
- PRIVATE char _lib_path[MAX_PATH + 1];
- PRIVATE char _info_path[MAX_PATH + 1];
-@@ -102,7 +129,7 @@
- 
-   /* chemin d'installation de Gambas */
- 
--  path = FILE_readlink(GAMBAS_LINK_PATH);
-+  path = which("gbx");
-   if (!path)
-   {
-     path = GAMBAS_LINK_PATH;
-@@ -422,7 +450,7 @@
-   if (strcmp(name, "gb") == 0)
-   {
-     sprintf(path, LIB_PATTERN, _lib_path, name);
--    dlib = dlopen("/usr/bin/gbx", RTLD_NOW);
-+    dlib = dlopen(which("gbx"), RTLD_NOW);
-     if (!dlib)
-       error2("Cannot open component:", dlerror());
- 
-@@ -472,7 +500,7 @@
-   sprintf(buf, "LD_PRELOAD=%s", lib);
-   putenv(buf);
-   putenv("GAMBAS_PRELOAD=1");
--  execv("/usr/bin/gbi", argv);
-+  execvp("gbi", argv);
- #endif
- }
- 
---- src/comp/gbc_compile.c.org	2004-06-25 00:54:43.765214275 +0200
-+++ src/comp/gbc_compile.c	2004-06-25 00:56:02.693198071 +0200
-@@ -59,6 +59,8 @@
- PUBLIC COMPILE COMP_current;
- 
- 
-+char *which(const char *app);
-+
- PRIVATE bool read_line(FILE *f, char *dir, int max)
- {
-   char *p;
-@@ -126,7 +155,7 @@
- 
-   /* chemin d'installation de Gambas */
- 
--  path = FILE_readlink(GAMBAS_LINK_PATH);
-+  path = which("gbx");
-   if (!path)
-   {
-     path = GAMBAS_LINK_PATH;
diff --git a/dev-util/gambas/files/non-symlink-0.95.patch b/dev-util/gambas/files/non-symlink-0.95.patch
deleted file mode 100644
index 31a4be2d93d7..000000000000
--- a/dev-util/gambas/files/non-symlink-0.95.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- src/comp/Makefile.am.org	2004-07-01 20:43:29.670993248 +0200
-+++ src/comp/Makefile.am	2004-07-01 20:43:45.909524616 +0200
-@@ -18,7 +18,8 @@
-  gbc_output.c gbc_pcode.c \
-  gb_file.h gb_file.c \
-  gbc_form.h gbc_form.c \
-- gb_str.h gb_str.c
-+ gb_str.h gb_str.c \
-+ which.c
- 
- gba_SOURCES = \
-  gb_error.h gb_error.c \
-@@ -34,7 +35,8 @@
-  gb_alloc.c gb_array.c \
-  gb_str.h gb_str.c \
-  gb_file.h gb_file.c \
-- gbi.c
-+ gbi.c \
-+ which.c
- 
- %.h: ;
- 
---- src/comp/which.c.org	2003-10-27 21:51:41.000000000 +0100
-+++ src/comp/which.c	2003-11-17 23:41:29.000000000 +0100
-@@ -0,0 +1,33 @@
-+/* needed to install in a different location than /usr */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+char *which(const char *app)
-+{
-+	char *path = NULL;
-+	char *p = NULL;
-+	char *rValue = NULL;
-+		
-+	path = getenv("PATH");
-+	if (!path) {
-+		path = "/usr/bin/";
-+	}
-+	p = strtok(strdup(path), ":");
-+	while (p) {
-+		rValue = (char *)calloc(sizeof(char), strlen(p)+strlen(app)+2);
-+		strcat(rValue, p);
-+		rValue[strlen(p)] = '/';
-+		strcat(rValue, app);
-+		rValue[strlen(p)+1+strlen(app)] = '\0';
-+		if (access(rValue, X_OK) == 0) {
-+			return rValue;
-+		}
-+		p = strtok(NULL, ":");
-+		free(rValue);
-+		rValue = NULL;
-+	}
-+	return NULL;
-+}
-+																														
---- src/comp/gbi.c.org	2003-10-27 21:51:41.000000000 +0100
-+++ src/comp/gbi.c	2003-11-17 23:41:29.000000000 +0100
-@@ -54,6 +54,7 @@
- #include "gb_str.h"
- #include "gambas.h"
- 
-+char *which(const char *app);
- 
- PRIVATE char _lib_path[MAX_PATH + 1];
- PRIVATE char _info_path[MAX_PATH + 1];
-@@ -102,7 +129,7 @@
- 
-   if (!_root[0])
-   {
--    path = FILE_readlink(GAMBAS_LINK_PATH);
-+    path = which("gbx");
-     if (!path)
-     {
-       if (FILE_is_absolute(exec))
-@@ -472,7 +500,7 @@
-   sprintf(buf, "LD_PRELOAD=%s", lib);
-   putenv(buf);
-   putenv("GAMBAS_PRELOAD=1");
--  execv("/usr/bin/gbi", argv);
-+  execvp("gbi", argv);
- #endif
- }
- 
---- src/comp/gbc_compile.c.org	2004-06-25 00:54:43.765214275 +0200
-+++ src/comp/gbc_compile.c	2004-06-25 00:56:02.693198071 +0200
-@@ -59,6 +59,8 @@
- PUBLIC COMPILE COMP_current;
- 
- 
-+char *which(const char *app);
-+
- PRIVATE bool read_line(FILE *f, char *dir, int max)
- {
-   char *p;
-@@ -126,7 +155,7 @@
- 
-   /* chemin d'installation de Gambas */
- 
--  path = FILE_readlink(GAMBAS_LINK_PATH);
-+  path = which("gbx");
-   if (!path)
-   {
-     path = GAMBAS_LINK_PATH;
diff --git a/dev-util/gambas/gambas-0.95.ebuild b/dev-util/gambas/gambas-0.95.ebuild
deleted file mode 100644
index 29e433e0d058..000000000000
--- a/dev-util/gambas/gambas-0.95.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-0.95.ebuild,v 1.2 2004/08/23 08:06:00 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="a RAD tool for BASIC"
-HOMEPAGE="http://gambas.sourceforge.net"
-SRC_URI="http://gambas.sourceforge.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="postgres mysql sdl doc curl debug sqlite"
-
-DEPEND=">=sys-devel/automake-1.7.5
-	>=x11-libs/qt-3.2
-	>=kde-base/kdelibs-3.2
-	sdl? ( media-libs/libsdl )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	curl? ( net-misc/curl )
-	sqlite? ( dev-db/sqlite )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:-Os::' configure
-	# replace braindead Makefile
-	rm Makefile*
-	cp "${FILESDIR}/Makefile.am-0.94" ./Makefile.am
-	# patches against hardcoded paths
-	epatch ${FILESDIR}/non-symlink-0.95.patch
-
-	automake
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} --enable-kde --enable-qt"
-	myconf="${myconf} `use_enable mysql`"
-	myconf="${myconf} `use_enable postgres`"
-	myconf="${myconf} `use_enable sqlite`"
-	myconf="${myconf} `use_enable sdl`"
-	myconf="${myconf} `use_enable curl`"
-
-	if use debug ; then
-		myconf="${myconf} --disable-optimization --enable-debug"
-	else
-		myconf="${myconf} --enable-optimization --disable-debug"
-	fi
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	export PATH="${D}/usr/bin:${PATH}"
-	einstall || die
-
-	dodoc README INSTALL NEWS AUTHORS ChangeLog TODO
-
-	# only install the API docs and examples with USE=doc
-	if use doc; then
-		mv ${D}/usr/share/${PN}/help ${D}/usr/share/doc/${PF}/html
-		mv ${D}/usr/share/${PN}/examples ${D}/usr/share/doc/${PF}/examples
-	else
-		dohtml ${FILESDIR}/WebHome.html
-	fi
-	rm -rf ${D}/usr/share/${PN}/help ${D}/usr/share/${PN}/examples
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/help
-	dosym /usr/share/doc/${PF}/examples /usr/share/${PN}/examples
-}
diff --git a/dev-util/gambas/gambas-0.99.ebuild b/dev-util/gambas/gambas-0.99.ebuild
index f2759ee7c2cd..1fbebdce07b4 100644
--- a/dev-util/gambas/gambas-0.99.ebuild
+++ b/dev-util/gambas/gambas-0.99.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-0.99.ebuild,v 1.1 2004/10/11 04:15:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-0.99.ebuild,v 1.2 2004/11/14 08:49:54 genone Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://gambas.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="postgres mysql sdl doc curl debug sqlite"
 
 DEPEND=">=sys-devel/automake-1.7.5
diff --git a/dev-util/gambas/gambas-0.97a.ebuild b/dev-util/gambas/gambas-1.0_rc2.ebuild
index c6a54e2f56db..947b20c0d700 100644
--- a/dev-util/gambas/gambas-0.97a.ebuild
+++ b/dev-util/gambas/gambas-1.0_rc2.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-0.97a.ebuild,v 1.1 2004/08/23 08:06:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-1.0_rc2.ebuild,v 1.1 2004/11/14 08:49:54 genone Exp $
 
 inherit eutils
 
+MY_P="${PN}-0.99.RC2"
+S="${WORKDIR}/${MY_P}"
+
 DESCRIPTION="a RAD tool for BASIC"
 HOMEPAGE="http://gambas.sourceforge.net"
-SRC_URI="http://gambas.sourceforge.net/${P}.tar.bz2"
+SRC_URI="http://gambas.sourceforge.net/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,11 +29,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i 's:-Os::' configure
-	# replace braindead Makefile
+	# replace braindead Makefile (it's getting better, but 
+	# still has the stupid symlink stuff)
 	rm Makefile*
-	cp "${FILESDIR}/Makefile.am-0.97a" ./Makefile.am
-	# patches against hardcoded paths
-	#epatch ${FILESDIR}/non-symlink-0.95.patch
+	cp "${FILESDIR}/Makefile.am-1.0_rc2" ./Makefile.am
 
 	automake
 }