version bump

5 files changed, 190 insertions, 11 deletions

diff --git a/dev-util/gambas/ChangeLog b/dev-util/gambas/ChangeLog
index 26eb9e50bce6..05a05997dd5d 100644
--- a/dev-util/gambas/ChangeLog
+++ b/dev-util/gambas/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2004/07/04 23:45:33 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.16 2004/07/19 22:02:04 genone Exp $
+
+*gambas-0.95 (20 Jul 2004)
+
+  20 Jul 2004; Marius Mauch <genone@gentoo.org> +files/non-symlink-0.95.patch,
+  +gambas-0.95.ebuild:
+  version bump
 
 *gambas-0.94 (05 Jul 2004)
 
diff --git a/dev-util/gambas/Manifest b/dev-util/gambas/Manifest
index e3cdd198ee3f..12037cc5e043 100644
--- a/dev-util/gambas/Manifest
+++ b/dev-util/gambas/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8745381afa71feefa57c01cc21771fc9 gambas-0.91.ebuild 1860
 MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
 MD5 da0dd90ceea7e78ff0180ec1d54bfd49 gambas-0.93b.ebuild 2058
 MD5 a9d77188b8f222dcfc6036908f51da18 ChangeLog 3017
 MD5 063396393fb7269cab150fb5e4d82320 gambas-0.94a.ebuild 2012
+MD5 063396393fb7269cab150fb5e4d82320 gambas-0.95.ebuild 2012
 MD5 964111dfc43bdc4aab2276817f8f57df files/Makefile.am-0.90 1370
 MD5 59e95678efba2286221a1040cf515aa3 files/digest-gambas-0.91 65
 MD5 a7abb94385567542662526650958f5f1 files/gbx_exec_enum-0.92.patch 751
@@ -17,10 +15,4 @@ MD5 6e6d82cdd260691a8eaad33158b15a6a files/Makefile.am-0.94 1447
 MD5 0da68c6735405f53dc2a1365d5b929fa files/digest-gambas-0.94a 66
 MD5 da3cd57f803b4dc0717bdedde046da20 files/non-symlink-0.94.patch 2658
 MD5 39016f3bbaf4069a963b10796d8f48f1 files/WebHome.html 692
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA6Jaq6J2i8a8J4okRAovvAKC9rGoKu23nmmw+fuCbhsjW4iVXCwCeLz/4
-yCeH/5zjfnSvd7pYZmvBYBM=
-=tRx3
------END PGP SIGNATURE-----
+MD5 a70e52834210d33ecde4e6933afe6e39 files/digest-gambas-0.95 65
diff --git a/dev-util/gambas/files/digest-gambas-0.95 b/dev-util/gambas/files/digest-gambas-0.95
new file mode 100644
index 000000000000..8acb7fda3799
--- /dev/null
+++ b/dev-util/gambas/files/digest-gambas-0.95
@@ -0,0 +1 @@
+MD5 c43629a98a824692aca2bdc01f01978c gambas-0.95.tar.bz2 3698503
diff --git a/dev-util/gambas/files/non-symlink-0.95.patch b/dev-util/gambas/files/non-symlink-0.95.patch
new file mode 100644
index 000000000000..31a4be2d93d7
--- /dev/null
+++ b/dev-util/gambas/files/non-symlink-0.95.patch
@@ -0,0 +1,106 @@
+--- 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
new file mode 100644
index 000000000000..225f5a603092
--- /dev/null
+++ b/dev-util/gambas/gambas-0.95.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2004/07/19 22:02:04 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 )"
+
+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
+}