version bump, workaround for default-1.0 profile

5 files changed, 124 insertions, 5 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 8a6f8ec232ea..466eac0af780 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.21 2003/06/27 10:00:07 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.22 2003/07/05 12:27:18 liquidx Exp $
+
+*libgda-0.90.0 (05 Jul 2003)
+
+  05 Jul 2003; Alastair Tse <liquidx@gentoo.org> libgda-0.12.1.ebuild,
+  libgda-0.90.0.ebuild:
+  added workaround for default-1.0 profile's readline-4.1 (#22598).
+  and version bump.
 
   20 Jun 2003; Alastair Tse <liquidx@gentoo.org> libgda-0.11.0.ebuild,
   libgda-0.12.0.ebuild, libgda-0.12.1.ebuild:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index a06845b2e349..09b9e0960053 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,9 +1,9 @@
-MD5 cf0dca8148b81f1fd9688a7cecfc2ecb ChangeLog 3467
+MD5 84ce72d00161585595ba8bb71b76a741 ChangeLog 3681
 MD5 5ab82f7dadae03ca71999d11372c5569 libgda-0.2.95-r1.ebuild 3309
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 8f9f7b7c7813c4a410bdabf61cb18ddb libgda-0.2.96-r2.ebuild 3513
-MD5 775b162b977d776feafb5fafab81f80f libgda-0.12.1.ebuild 2424
-MD5 775b162b977d776feafb5fafab81f80f libgda-0.90.0.ebuild 2424
+MD5 1f98dc22dc9c4b9a7c77688499f80ed1 libgda-0.12.1.ebuild 2624
+MD5 fe14e5782b8d228afdcc7b818418f9aa libgda-0.90.0.ebuild 2625
 MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
 MD5 96d08151726366cf97edb37406a5924e files/digest-libgda-0.90.0 66
 MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
diff --git a/gnome-extra/libgda/files/digest-libgda-0.90.0 b/gnome-extra/libgda/files/digest-libgda-0.90.0
new file mode 100644
index 000000000000..d04339c31769
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-0.90.0
@@ -0,0 +1 @@
+MD5 1a2571c4bffd95bb0edb3d63189c93b4 libgda-0.90.0.tar.bz2 935196
diff --git a/gnome-extra/libgda/libgda-0.12.1.ebuild b/gnome-extra/libgda/libgda-0.12.1.ebuild
index 2192d555a982..954db0195c8e 100644
--- a/gnome-extra/libgda/libgda-0.12.1.ebuild
+++ b/gnome-extra/libgda/libgda-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.12.1.ebuild,v 1.2 2003/06/27 10:00:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.12.1.ebuild,v 1.3 2003/07/05 12:27:18 liquidx Exp $
 
 IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8"
 
@@ -91,5 +91,13 @@ src_compile() {
     myconf="${myconf} --without-sybase"
 	use oci8 || myconf="${myconf} --without-oracle"
 
+	# workaround for readline-4.1 profile - disables building of gda-config-tool
+	if has_version "=sys-libs/readline-4.1*"; then
+		export CONFIG_TOOL_HEADERS="wrong"
+	fi
+	
 	gnome2_src_compile ${myconf}
+	
+	unset CONFIG_TOOL_HEADERS
+	
 }
diff --git a/gnome-extra/libgda/libgda-0.90.0.ebuild b/gnome-extra/libgda/libgda-0.90.0.ebuild
new file mode 100644
index 000000000000..1ca91178cb4d
--- /dev/null
+++ b/gnome-extra/libgda/libgda-0.90.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.90.0.ebuild,v 1.1 2003/07/05 12:27:18 liquidx Exp $
+
+IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8"
+
+inherit gnome2 gnome.org
+
+DESCRIPTION="Gnome Database Access Library"
+HOMEPAGE="http://www.gnome-db.org/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~x86 ~ppc"
+
+RDEPEND=">=gnome-base/ORBit2-2.3.91
+	>=dev-libs/glib-2.0.4
+	>=gnome-base/bonobo-activation-0.7.0
+	>=gnome-base/libbonobo-2.0.0
+	>=dev-libs/libxml2-2.4.23
+	>=gnome-base/gconf-1.2.0 
+	>=dev-libs/libxslt-1.0.9
+	>=gnome-base/gnome-vfs-2.0.0
+	dev-libs/popt
+	sys-libs/readline
+	sys-libs/ncurses
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	postgres? ( >=dev-db/postgresql-7.2.1 )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	firebird? ( >=dev-db/firebird-1.0 )
+	freetds? ( >=dev-db/freetds-0.5 )
+	sqlite? ( >=dev-db/sqlite-2.4.2 )
+	mdb? ( >=app-office/mdbtools-0.5 )"
+
+DEPEND=">=dev-util/pkgconfig-0.8
+	>=dev-util/intltool-0.22
+	>=sys-devel/gettext-0.11
+	app-text/scrollkeeper
+	${RDEPEND}"
+	
+# problems with parallel builds	
+MAKEOPTS="${MAKEOPTS} -j1"	
+
+src_unpack() {
+	unpack ${A}
+	gnome2_omf_fix ${S}/doc/Makefile.in
+}
+
+src_compile() {
+
+	local myconf 
+
+	use mysql \
+		&& myconf="${myconf} --with-mysql=/usr" \
+		|| myconf="${myconf} --without-mysql"
+
+	use postgres \
+		&& myconf="${myconf} --with-postgres=/usr" \
+		|| myconf="${myconf} --without-postgres"
+
+	use odbc \
+		&& myconf="${myconf} --with-odbc=/usr" \
+		|| myconf="${myconf} --without-odbc"
+
+	use ldap \
+		&& myconf="${myconf} --with-ldap=/usr" \
+		|| myconf="${myconf} --without-ldap"
+
+	use sqlite \
+		&& myconf="$myconf --with-sqlite=/usr" \
+		|| myconf="$myconf --without-sqlite"
+
+	use freetds \
+		&& myconf="$myconf --with-tds=/usr" \
+		|| myconf="$myconf --without-tds"
+
+	use firebird \
+		&& myconf="${myconf} --with-firebird=/usr" \
+		|| myconf="${myconf} --without-firebird"
+
+	use mdb \
+		&& myconf="${myconf} --with-mdb=/usr" \
+		|| myconf="${myconf} --without-mdb"
+
+	# not in portage (http://linux.techass.com/projects/xdb/)
+	myconf="${myconf} --without-xbase"
+	myconf="${myconf} --without-msql"
+	
+	# closed source dbs 
+    myconf="${myconf} --without-ibmdb2"
+    myconf="${myconf} --without-sybase"
+	use oci8 || myconf="${myconf} --without-oracle"
+
+	# workaround for readline-4.1 profile - disables building of gda-config-tool
+	if has_version "=sys-libs/readline-4.1*"; then
+		export CONFIG_TOOL_HEADERS="wrong"
+	fi
+	
+	gnome2_src_compile ${myconf}
+	
+	unset CONFIG_TOOL_HEADERS
+	
+}