version bump

6 files changed, 36 insertions, 32 deletions

diff --git a/dev-util/gambas/ChangeLog b/dev-util/gambas/ChangeLog
index 2819c98dd18a..4517e9e9902a 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.20 2004/12/05 00:45:01 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.21 2004/12/08 07:57:57 genone Exp $
+
+*gambas-1.0_rc4 (08 Dec 2004)
+
+  08 Dec 2004; Marius Mauch <genone@gentoo.org> files/Makefile.am-1.0_rc2,
+  -gambas-1.0_rc2.ebuild, +gambas-1.0_rc4.ebuild:
+  version bump, adding a few more dependencies that were missing, fixed the
+  Makefile (again).
 
   05 Dec 2004; Marius Mauch <genone@gentoo.org> files/Makefile.am-1.0_rc2:
   Removing the stupid symlink part from the Makefile.
diff --git a/dev-util/gambas/Manifest b/dev-util/gambas/Manifest
index a973d3e2ebc6..0c51ad69f9a8 100644
--- a/dev-util/gambas/Manifest
+++ b/dev-util/gambas/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
 MD5 3fff42865e3cad317fd7de9c28b8dc10 gambas-0.99.ebuild 1925
-MD5 4f353fae8e98dc31bee9f3f870ddc002 gambas-1.0_rc2.ebuild 1967
 MD5 659da12ee2de92c49d1f31700fd56e2e ChangeLog 4112
+MD5 64dabf30b7156a2ff917868f7c2181cf gambas-1.0_rc4.ebuild 2341
 MD5 39016f3bbaf4069a963b10796d8f48f1 files/WebHome.html 692
 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 df8d7de06c59d9a2752c774cfe744ebe files/Makefile.am-1.0_rc2 1526
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBsmg16J2i8a8J4okRArW8AJ9HVwmwNPGuEh9CL4z2B8eBfW25dwCglEL+
-5sK6whIx+2dmtUq/SZotrCI=
-=pUSs
------END PGP SIGNATURE-----
+MD5 cb40c4d6cc8de988f3e5d60e53108472 files/Makefile.am-1.0_rc2 1508
+MD5 d44e34632944c6de65049fdb24a4f608 files/digest-gambas-1.0_rc4 69
diff --git a/dev-util/gambas/files/Makefile.am-1.0_rc2 b/dev-util/gambas/files/Makefile.am-1.0_rc2
index 863cf55ba0cb..7275bca1e033 100644
--- a/dev-util/gambas/files/Makefile.am-1.0_rc2
+++ b/dev-util/gambas/files/Makefile.am-1.0_rc2
@@ -4,21 +4,21 @@ EXTRA_DIST = TODO reconf app examples spec help debian README README.REDHAT READ
 
 install-exec-local:
 	@if test "x$(ROOT)" != "x"; then \
-	 echo "Installing with ROOT=$(ROOT)"; \
-         echo; \
-        fi
+		echo "Installing with ROOT=$(ROOT)"; \
+		echo; \
+	fi
 
 	@if test "x$(DESTDIR)" != "x"; then \
-	 echo "Installing with DESTDIR=$(DESTDIR)"; \
-         echo; \
-	 ROOT=$DESTDIR; \
-        fi
+		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)
+	@$(DESTDIR)$(bindir)/gbi -a -r $(DESTDIR)$(prefix)
 	@rm -f $(DESTDIR)$(pkglibdir)/lib.gb.la
 	@rm -f $(DESTDIR)$(pkglibdir)/lib.gb.so*
 
diff --git a/dev-util/gambas/files/digest-gambas-1.0_rc2 b/dev-util/gambas/files/digest-gambas-1.0_rc2
deleted file mode 100644
index 955ca95e5640..000000000000
--- a/dev-util/gambas/files/digest-gambas-1.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09d18daa973d09d2234d80f3b0d70377 gambas-0.99.RC2.tar.bz2 3746913
diff --git a/dev-util/gambas/files/digest-gambas-1.0_rc4 b/dev-util/gambas/files/digest-gambas-1.0_rc4
new file mode 100644
index 000000000000..68b1b772aae4
--- /dev/null
+++ b/dev-util/gambas/files/digest-gambas-1.0_rc4
@@ -0,0 +1 @@
+MD5 55ab72b09cb095f66fc3aaeeb2277d07 gambas-0.99.RC4.tar.bz2 3724246
diff --git a/dev-util/gambas/gambas-1.0_rc2.ebuild b/dev-util/gambas/gambas-1.0_rc4.ebuild
index 947b20c0d700..2f9aedcf5efb 100644
--- a/dev-util/gambas/gambas-1.0_rc2.ebuild
+++ b/dev-util/gambas/gambas-1.0_rc4.ebuild
@@ -1,10 +1,10 @@
 # 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-1.0_rc2.ebuild,v 1.1 2004/11/14 08:49:54 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-1.0_rc4.ebuild,v 1.1 2004/12/08 07:57:57 genone Exp $
 
 inherit eutils
 
-MY_P="${PN}-0.99.RC2"
+MY_P="${PN}-0.99.RC4"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="a RAD tool for BASIC"
@@ -14,16 +14,19 @@ SRC_URI="http://gambas.sourceforge.net/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="postgres mysql sdl doc curl debug sqlite"
+IUSE="postgres mysql sdl doc curl debug sqlite xml xsl zlib kde"
 
 DEPEND=">=sys-devel/automake-1.7.5
 	>=x11-libs/qt-3.2
-	>=kde-base/kdelibs-3.2
-	sdl? ( media-libs/libsdl )
+	kde? ( >=kde-base/kdelibs-3.2 )
+	sdl? ( media-libs/libsdl media-libs/sdl-mixer sys-libs/gpm )
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )
 	curl? ( net-misc/curl )
-	sqlite? ( dev-db/sqlite )"
+	sqlite? ( dev-db/sqlite )
+	xml? ( dev-libs/libxml2 )
+	xsl? ( dev-libs/libxslt )
+	zlib? ( sys-libs/zlib app-arch/bzip2 )"
 
 src_unpack() {
 	unpack ${A}
@@ -40,17 +43,20 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	myconf="${myconf} --enable-kde --enable-qt"
+	myconf="${myconf} --enable-kde --enable-qt  --enable-net --enable-vb --enable-bzlib2"
 	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`"
+	myconf="${myconf} `use_enable zlib`"
+	myconf="${myconf} `use_enable xml2 libxml`"
+	myconf="${myconf} `use_enable xsl xslt`"
 
 	if use debug ; then
-		myconf="${myconf} --disable-optimization --enable-debug"
+		myconf="${myconf} --disable-optimization --enable-debug --enable-profiling"
 	else
-		myconf="${myconf} --enable-optimization --disable-debug"
+		myconf="${myconf} --enable-optimization --disable-debug --disable-profiling"
 	fi
 
 	econf ${myconf} || die
@@ -60,7 +66,7 @@ src_compile() {
 
 src_install() {
 	export PATH="${D}/usr/bin:${PATH}"
-	einstall || die
+	make DESTDIR="$D" install || die
 
 	dodoc README INSTALL NEWS AUTHORS ChangeLog TODO