version bump, fixing configure options

5 files changed, 100 insertions, 14 deletions

diff --git a/dev-util/gambas/ChangeLog b/dev-util/gambas/ChangeLog
index 4517e9e9902a..576ef314da5a 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.21 2004/12/08 07:57:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/ChangeLog,v 1.22 2004/12/29 17:12:10 genone Exp $
+
+*gambas-1.0_rc6 (29 Dec 2004)
+
+  29 Dec 2004; Marius Mauch <genone@gentoo.org> gambas-1.0_rc4.ebuild,
+  +gambas-1.0_rc6.ebuild:
+  Version bump, fixing old (and probably broken) configure options.
 
 *gambas-1.0_rc4 (08 Dec 2004)
 
diff --git a/dev-util/gambas/Manifest b/dev-util/gambas/Manifest
index faf2a020955d..0bfbecc9df26 100644
--- a/dev-util/gambas/Manifest
+++ b/dev-util/gambas/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
 MD5 3fff42865e3cad317fd7de9c28b8dc10 gambas-0.99.ebuild 1925
 MD5 e309b843d9a696186085f424900dd459 ChangeLog 4365
-MD5 2c4b72c89c276929fea0de1229a9999c gambas-1.0_rc4.ebuild 2344
+MD5 aa0c10abb7262920a1d8b57ebe0c59d5 gambas-1.0_rc4.ebuild 2397
+MD5 0f49998f19cb374d0cbf3c5088372945 gambas-1.0_rc6.ebuild 2397
 MD5 39016f3bbaf4069a963b10796d8f48f1 files/WebHome.html 692
 MD5 13a65dd33d4fd1d346206b80aaf3a1ff files/Makefile.am-0.97a 1528
 MD5 36441908c5da6408e450be896bf7e7b3 files/digest-gambas-0.99 65
 MD5 cb40c4d6cc8de988f3e5d60e53108472 files/Makefile.am-1.0_rc2 1508
 MD5 d44e34632944c6de65049fdb24a4f608 files/digest-gambas-1.0_rc4 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBtsLI6J2i8a8J4okRAkH2AJ946DprRYXA42CostarLjN9t+2OYACgtRnM
-frpjpy7rLiwJR4r7vFBtjhM=
-=FjQw
------END PGP SIGNATURE-----
+MD5 c5601d63fb89742f66717244a9aee121 files/digest-gambas-1.0_rc6 69
diff --git a/dev-util/gambas/files/digest-gambas-1.0_rc6 b/dev-util/gambas/files/digest-gambas-1.0_rc6
new file mode 100644
index 000000000000..5145e91663c1
--- /dev/null
+++ b/dev-util/gambas/files/digest-gambas-1.0_rc6
@@ -0,0 +1 @@
+MD5 01e6a62b167b404649d8cf8df46fb951 gambas-0.99.RC6.tar.bz2 4054811
diff --git a/dev-util/gambas/gambas-1.0_rc4.ebuild b/dev-util/gambas/gambas-1.0_rc4.ebuild
index 2f9aedcf5efb..359cbaf88b9d 100644
--- a/dev-util/gambas/gambas-1.0_rc4.ebuild
+++ b/dev-util/gambas/gambas-1.0_rc4.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-1.0_rc4.ebuild,v 1.1 2004/12/08 07:57:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gambas/gambas-1.0_rc4.ebuild,v 1.2 2004/12/29 17:12:10 genone Exp $
 
 inherit eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	myconf="${myconf} --enable-kde --enable-qt  --enable-net --enable-vb --enable-bzlib2"
+	myconf="${myconf} --enable-qt  --enable-net --enable-vb"
 	myconf="${myconf} `use_enable mysql`"
 	myconf="${myconf} `use_enable postgres`"
 	myconf="${myconf} `use_enable sqlite`"
@@ -52,6 +52,8 @@ src_compile() {
 	myconf="${myconf} `use_enable zlib`"
 	myconf="${myconf} `use_enable xml2 libxml`"
 	myconf="${myconf} `use_enable xsl xslt`"
+	myconf="${myconf} `use_enable zlib bzlib2`"
+	myconf="${myconf} `use_enable kde`"
 
 	if use debug ; then
 		myconf="${myconf} --disable-optimization --enable-debug --enable-profiling"
diff --git a/dev-util/gambas/gambas-1.0_rc6.ebuild b/dev-util/gambas/gambas-1.0_rc6.ebuild
new file mode 100644
index 000000000000..04cd8a3e583b
--- /dev/null
+++ b/dev-util/gambas/gambas-1.0_rc6.ebuild
@@ -0,0 +1,85 @@
+# 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_rc6.ebuild,v 1.1 2004/12/29 17:12:10 genone Exp $
+
+inherit eutils
+
+MY_P="${PN}-0.99.RC6"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="a RAD tool for BASIC"
+HOMEPAGE="http://gambas.sourceforge.net"
+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 xml xsl zlib kde"
+
+DEPEND=">=sys-devel/automake-1.7.5
+	>=x11-libs/qt-3.2
+	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 )
+	xml? ( dev-libs/libxml2 )
+	xsl? ( dev-libs/libxslt )
+	zlib? ( sys-libs/zlib app-arch/bzip2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i 's:-Os::' configure
+	# replace braindead Makefile (it's getting better, but 
+	# still has the stupid symlink stuff)
+	rm Makefile*
+	cp "${FILESDIR}/Makefile.am-1.0_rc2" ./Makefile.am
+
+	automake
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} --enable-qt  --enable-net --enable-vb"
+	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`"
+	myconf="${myconf} `use_enable zlib bzlib2`"
+	myconf="${myconf} `use_enable kde`"
+
+	if use debug ; then
+		myconf="${myconf} --disable-optimization --enable-debug --enable-profiling"
+	else
+		myconf="${myconf} --enable-optimization --disable-debug --disable-profiling"
+	fi
+
+	econf ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	export PATH="${D}/usr/bin:${PATH}"
+	make DESTDIR="$D" install || 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 ../doc/${PF}/html /usr/share/${PN}/help
+	dosym ../doc/${PF}/examples /usr/share/${PN}/examples
+}