New version. Have had to put mdb dependency behind a not-alpha as mdbtools arent available on alpha. _Please_ use repoman to check for these things

9 files changed, 137 insertions, 25 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index dfc8873b2e41..42efc437f9a7 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.36 2004/01/17 02:25:17 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.37 2004/01/25 13:13:57 obz Exp $
+
+*libgda-1.0.3 (25 Jan 2004)
+
+  25 Jan 2004; Mike Gardiner <obz@gentoo.org> libgda-0.2.95-r1.ebuild,
+  libgda-0.2.96-r2.ebuild, libgda-1.0.0.ebuild, libgda-1.0.1.ebuild,
+  libgda-1.0.2.ebuild, libgda-1.0.3.ebuild:
+  New version. Have had to put mdb dependency behind a not-alpha as mdbtools
+  arent available on alpha. _Please_ use repoman to check for these things
 
   17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> libgda-0.12.1.ebuild,
   libgda-1.0.0.ebuild, libgda-1.0.1.ebuild, libgda-1.0.2.ebuild:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 8d0040e8d3f9..df88ee62a8d7 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,16 +1,18 @@
-MD5 635a8e261827548af54f9bff5d637a12 ChangeLog 5541
-MD5 37f9b04c394742e1ffcb6bf1218b6358 libgda-0.2.95-r1.ebuild 3283
-MD5 ec4c66af4e7ca373e370223b7d126a4b libgda-0.2.96-r2.ebuild 3495
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1a3df18729cfa4a2fe058f7f637fc187 libgda-0.2.96-r2.ebuild 3490
+MD5 e09ffd68a32faa7947cebbab8c09633c libgda-1.0.3.ebuild 2568
 MD5 49d9a148e3a64f425175c50936f6783b libgda-0.12.1.ebuild 2583
-MD5 e17eac76f2ad0d2ff888f22aa1a807ba libgda-1.0.1.ebuild 2567
-MD5 795b28106f9b49ffb30327a4a6e7e463 libgda-1.0.0.ebuild 2555
-MD5 f519521d2097ed240a34f39f0ccc47eb libgda-1.0.2.ebuild 2604
-MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
-MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
-MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
-MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
+MD5 e55a593f07834b5bb20ef9d072a3bf1a libgda-1.0.0.ebuild 2547
+MD5 4e5af27716973f05b40dd6dd7a68d1bf libgda-1.0.2.ebuild 2607
+MD5 c7304a5876bfb9c4f418313bff9fc365 libgda-0.2.95-r1.ebuild 3278
+MD5 ef804c38df89cfd80ef7aec8d7423944 ChangeLog 5899
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 15f232325b4ee0d8110b0cba1b799e03 libgda-1.0.1.ebuild 2571
 MD5 3ca3af1e56c86303037c0792d9c90d3d files/digest-libgda-1.0.0 66
 MD5 49ea693a813a629d57b5fe1ac8001ff6 files/digest-libgda-1.0.1 66
 MD5 46b8c0b40219635d47ca4583d42dc814 files/digest-libgda-1.0.2 66
+MD5 907142ea1e11bcf5b01f25dfa2fd2b54 files/digest-libgda-1.0.3 66
 MD5 adf80d651f1d75c9745c44264f58708e files/libgda-1.0.2-gcc2_fix.patch 641
+MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
+MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
+MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
+MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
diff --git a/gnome-extra/libgda/files/digest-libgda-1.0.3 b/gnome-extra/libgda/files/digest-libgda-1.0.3
new file mode 100644
index 000000000000..560d33c3f999
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-1.0.3
@@ -0,0 +1 @@
+MD5 eb571389cd7624f362315d5180298263 libgda-1.0.3.tar.bz2 1087558
diff --git a/gnome-extra/libgda/libgda-0.2.95-r1.ebuild b/gnome-extra/libgda/libgda-0.2.95-r1.ebuild
index 1a987ed4e627..f5b45e9e8952 100644
--- a/gnome-extra/libgda/libgda-0.2.95-r1.ebuild
+++ b/gnome-extra/libgda/libgda-0.2.95-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.95-r1.ebuild,v 1.10 2003/09/08 05:11:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.95-r1.ebuild,v 1.11 2004/01/25 13:13:57 obz Exp $
 
 IUSE="ldap odbc postgres mysql"
 
diff --git a/gnome-extra/libgda/libgda-0.2.96-r2.ebuild b/gnome-extra/libgda/libgda-0.2.96-r2.ebuild
index d92cdd462ba9..9bde16e8ffa7 100644
--- a/gnome-extra/libgda/libgda-0.2.96-r2.ebuild
+++ b/gnome-extra/libgda/libgda-0.2.96-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.96-r2.ebuild,v 1.10 2003/09/08 05:11:17 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.96-r2.ebuild,v 1.11 2004/01/25 13:13:57 obz Exp $
 
 IUSE="odbc postgres mysql"
 
diff --git a/gnome-extra/libgda/libgda-1.0.0.ebuild b/gnome-extra/libgda/libgda-1.0.0.ebuild
index 47054330e47d..66426c27a94b 100644
--- a/gnome-extra/libgda/libgda-1.0.0.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.0.ebuild,v 1.5 2004/01/17 02:25:17 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.0.ebuild,v 1.6 2004/01/25 13:13:57 obz Exp $
 
 IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
 
diff --git a/gnome-extra/libgda/libgda-1.0.1.ebuild b/gnome-extra/libgda/libgda-1.0.1.ebuild
index d5990c33884a..1fea95a98b65 100644
--- a/gnome-extra/libgda/libgda-1.0.1.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.1.ebuild,v 1.7 2004/01/17 02:25:17 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.1.ebuild,v 1.8 2004/01/25 13:13:57 obz Exp $
 
 IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
 
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.0
 	!ppc? ( 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 )"
+	!alpha? ( mdb? ( >=app-office/mdbtools-0.5 ) )"
 
 DEPEND=">=dev-util/pkgconfig-0.8
 	>=dev-util/intltool-0.22
diff --git a/gnome-extra/libgda/libgda-1.0.2.ebuild b/gnome-extra/libgda/libgda-1.0.2.ebuild
index 269e221d508b..a738e8eb3765 100644
--- a/gnome-extra/libgda/libgda-1.0.2.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.2.ebuild,v 1.3 2004/01/17 02:25:17 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.2.ebuild,v 1.4 2004/01/25 13:13:57 obz Exp $
 
 IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
 SLOT="1"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 RDEPEND=">=dev-libs/glib-2.0
 	>=dev-libs/libxml2-2.0
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.0
 	!ppc? ( 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 )"
+	!alpha? ( mdb? ( >=app-office/mdbtools-0.5 ) )"
 
 DEPEND=">=dev-util/pkgconfig-0.8
 	>=dev-util/intltool-0.22
diff --git a/gnome-extra/libgda/libgda-1.0.3.ebuild b/gnome-extra/libgda/libgda-1.0.3.ebuild
new file mode 100644
index 000000000000..af38857cf11a
--- /dev/null
+++ b/gnome-extra/libgda/libgda-1.0.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.3.ebuild,v 1.1 2004/01/25 13:13:57 obz Exp $
+
+inherit gnome2
+
+DESCRIPTION="Gnome Database Access Library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2 LGPL-2"
+
+IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+RDEPEND=">=dev-libs/glib-2.0
+	>=dev-libs/libxml2-2.0
+	>=dev-libs/libxslt-1.0.9
+	>=gnome-base/gnome-vfs-2.0
+	dev-libs/popt
+	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 )
+	!ppc? ( firebird? ( >=dev-db/firebird-1.0 ) )
+	freetds? ( >=dev-db/freetds-0.5 )
+	sqlite? ( >=dev-db/sqlite-2.4.2 )
+	!alpha? ( 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
+	doc? ( dev-util/gtk-doc )
+	${RDEPEND}"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
+
+# 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
+
+}