Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2004-07-04 23:45:33 +0000
committerMarius Mauch <genone@gentoo.org>2004-07-04 23:45:33 +0000
commit3a222eb06a2b9945bf4552eb64ab736fabbed10f (patch)
tree6f710d757fd824444b7d846e694c1906dfcb13f1 /dev-util
parentfix bug #55634. (Manifest recommit) (diff)
downloadgentoo-2-3a222eb06a2b9945bf4552eb64ab736fabbed10f.tar.gz
gentoo-2-3a222eb06a2b9945bf4552eb64ab736fabbed10f.tar.bz2
gentoo-2-3a222eb06a2b9945bf4552eb64ab736fabbed10f.zip
version bump
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/gambas/ChangeLog9
-rw-r--r--dev-util/gambas/files/WebHome.html18
-rw-r--r--dev-util/gambas/files/digest-gambas-0.941
-rw-r--r--dev-util/gambas/files/digest-gambas-0.94a1
-rw-r--r--dev-util/gambas/files/non-symlink-0.94.patch115
-rw-r--r--dev-util/gambas/gambas-0.94a.ebuild (renamed from dev-util/gambas/gambas-0.94.ebuild)20
6 files changed, 150 insertions, 14 deletions
diff --git a/dev-util/gambas/ChangeLog b/dev-util/gambas/ChangeLog
index cf3436eedb28..26eb9e50bce6 100644
--- a/dev-util/gambas/ChangeLog
+++ b/dev-util/gambas/ChangeLog
@@ -1,6 +1,13 @@
# 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.14 2004/06/25 03:15:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.15 2004/07/04 23:45:33 genone Exp $
+
+*gambas-0.94 (05 Jul 2004)
+
+ 05 Jul 2004; Marius Mauch <genone@gentoo.org> +files/WebHome.html,
+ +files/non-symlink-0.94.patch, -gambas-0.94.ebuild, +gambas-0.94a.ebuild:
+ version bump to 0.94a, 0.94 was removed upstream. Also fixing absolute paths
+ (again) and the help for USE=-doc.
24 Jun 2004; Marius Mauch <genone@gentoo.org> :
version bump, disable preloading in the Makefile as some people reported
diff --git a/dev-util/gambas/files/WebHome.html b/dev-util/gambas/files/WebHome.html
new file mode 100644
index 000000000000..2c5d0c6b43b8
--- /dev/null
+++ b/dev-util/gambas/files/WebHome.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--<link rel="stylesheet" href=".rsrc/WebHome/../style.css">-->
+
+<head>
+ <title> Gambas-Wiki . Gambas . WebHome</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+ <meta name="robots" content="noindex" />
+
+</head>
+<body bgcolor="#ffffff">
+
+<h1><a name="Gambas_Documentation"> Gambas Documentation </a></h1>
+
+<p>Sorry, but to get the API documentation you have to set the <b>doc</b> USE-flag
+in make.conf or package.use (see <i>man portage</i>).</p>
+
+</body></html>
diff --git a/dev-util/gambas/files/digest-gambas-0.94 b/dev-util/gambas/files/digest-gambas-0.94
deleted file mode 100644
index 3444423deeed..000000000000
--- a/dev-util/gambas/files/digest-gambas-0.94
+++ /dev/null
@@ -1 +0,0 @@
-MD5 538f603bd7561c4a078393002cd3c47d gambas-0.94.tar.bz2 3692414
diff --git a/dev-util/gambas/files/digest-gambas-0.94a b/dev-util/gambas/files/digest-gambas-0.94a
new file mode 100644
index 000000000000..d6643696dd92
--- /dev/null
+++ b/dev-util/gambas/files/digest-gambas-0.94a
@@ -0,0 +1 @@
+MD5 00e9e481bd1d9069aad124b21f06e110 gambas-0.94a.tar.bz2 3700855
diff --git a/dev-util/gambas/files/non-symlink-0.94.patch b/dev-util/gambas/files/non-symlink-0.94.patch
new file mode 100644
index 000000000000..c3c718807e0b
--- /dev/null
+++ b/dev-util/gambas/files/non-symlink-0.94.patch
@@ -0,0 +1,115 @@
+--- 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/gambas-0.94.ebuild b/dev-util/gambas/gambas-0.94a.ebuild
index 1bf9a3067da7..2c4a130652a6 100644
--- a/dev-util/gambas/gambas-0.94.ebuild
+++ b/dev-util/gambas/gambas-0.94a.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.94.ebuild,v 1.2 2004/06/25 03:15:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-0.94a.ebuild,v 1.1 2004/07/04 23:45:33 genone Exp $
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://gambas.sourceforge.net/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86"
-IUSE="postgres mysql sdl doc curl debug"
+IUSE="postgres mysql sdl doc curl debug sqlite"
DEPEND=">=sys-devel/automake-1.7.5
>=x11-libs/qt-3.2
@@ -28,11 +28,12 @@ src_unpack() {
# replace braindead Makefile
rm Makefile*
cp "${FILESDIR}/Makefile.am-0.94" ./Makefile.am
- automake
# patches against hardcoded paths
- epatch ${FILESDIR}/non-symlink-0.90.patch
+ epatch ${FILESDIR}/non-symlink-0.94.patch
#epatch ${FILESDIR}/html-files-location-0.93.patch
#epatch ${FILESDIR}/info-location-0.90.patch
+
+ automake
}
src_compile() {
@@ -41,6 +42,7 @@ src_compile() {
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`"
@@ -65,14 +67,8 @@ src_install() {
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
- einfo "Compiling examples ..."
- cd ${D}/usr/share/doc/${PF}/examples
- for p in *; do
- cd $p
- gbc -ag
- gba
- cd ..
- done
+ 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