Update, cleanup

7 files changed, 20 insertions, 89 deletions

diff --git a/gnome-libs/libgda/files/digest-libgda-0.2.0 b/gnome-libs/libgda/files/digest-libgda-0.2.0
deleted file mode 100644
index 364ea11d38d6..000000000000
--- a/gnome-libs/libgda/files/digest-libgda-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58b1b943f1987cf01876ff04546f2a30 libgda-0.2.0.tar.gz
diff --git a/gnome-libs/libgda/files/digest-libgda-0.2.1 b/gnome-libs/libgda/files/digest-libgda-0.2.1
deleted file mode 100644
index fa9eaf0e0f16..000000000000
--- a/gnome-libs/libgda/files/digest-libgda-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8085ace5cfe9beb815fba386dc21164 libgda-0.2.1.tar.gz
diff --git a/gnome-libs/libgda/files/digest-libgda-0.2.1-r1 b/gnome-libs/libgda/files/digest-libgda-0.2.1-r1
deleted file mode 100644
index fa9eaf0e0f16..000000000000
--- a/gnome-libs/libgda/files/digest-libgda-0.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8085ace5cfe9beb815fba386dc21164 libgda-0.2.1.tar.gz
diff --git a/gnome-libs/libgda/files/digest-libgda-0.2.3 b/gnome-libs/libgda/files/digest-libgda-0.2.3
new file mode 100644
index 000000000000..6033f75eebcf
--- /dev/null
+++ b/gnome-libs/libgda/files/digest-libgda-0.2.3
@@ -0,0 +1 @@
+MD5 ecb2d4bc811e3bfd8ac92d34207f2975 libgda-0.2.3.tar.gz
diff --git a/gnome-libs/libgda/libgda-0.2.0.ebuild b/gnome-libs/libgda/libgda-0.2.0.ebuild
deleted file mode 100644
index 3114f3d00784..000000000000
--- a/gnome-libs/libgda/libgda-0.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gda lib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-db"
-
-DEPEND=">=gnome-base/gconf-0.11
-	>=dev-db/mysql-3.23.26
-	>=dev-db/unixODBC-1.8.13
-	>=net-nds/openldap-1.2.11"
-
-src_unpack() {
-  unpack ${A}
-}
-
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-mysql=/usr --with-ldap=/usr --with-odbc 
-  try make
-}
-
-src_install() {                               
-  cd ${S}
-  try make prefix=${D}/opt/gnome \
-	GDA_oafinfodir=${D}/opt/gnome/share/oaf install
-
-  dodoc AUTHORS COPYING.* ChangeLog NEWS README THANKS TODO
-}
-
-
-
-
diff --git a/gnome-libs/libgda/libgda-0.2.1.ebuild b/gnome-libs/libgda/libgda-0.2.1.ebuild
deleted file mode 100644
index 3114f3d00784..000000000000
--- a/gnome-libs/libgda/libgda-0.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gda lib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}"
-HOMEPAGE="http://www.gnome.org/gnome-db"
-
-DEPEND=">=gnome-base/gconf-0.11
-	>=dev-db/mysql-3.23.26
-	>=dev-db/unixODBC-1.8.13
-	>=net-nds/openldap-1.2.11"
-
-src_unpack() {
-  unpack ${A}
-}
-
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-mysql=/usr --with-ldap=/usr --with-odbc 
-  try make
-}
-
-src_install() {                               
-  cd ${S}
-  try make prefix=${D}/opt/gnome \
-	GDA_oafinfodir=${D}/opt/gnome/share/oaf install
-
-  dodoc AUTHORS COPYING.* ChangeLog NEWS README THANKS TODO
-}
-
-
-
-
diff --git a/gnome-libs/libgda/libgda-0.2.1-r1.ebuild b/gnome-libs/libgda/libgda-0.2.3.ebuild
index cc7a70aefc1d..17d69655a8b8 100644
--- a/gnome-libs/libgda/libgda-0.2.1-r1.ebuild
+++ b/gnome-libs/libgda/libgda-0.2.3.ebuild
@@ -11,23 +11,32 @@ HOMEPAGE="http://www.gnome.org/gnome-db"
 
 DEPEND=">=gnome-base/gconf-0.11
 	>=dev-perl/CORBA-ORBit-0.4.3
-	>=dev-db/mysql-3.23.26
-	>=dev-db/unixODBC-1.8.13
-	>=net-nds/openldap-1.2.11"
+	mysql? ( >=dev-db/mysql-3.23.26 )
+        postgres? ( >=dev-db/postgresql-7.1 )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	ldap? ( >=net-nds/openldap-1.2.11 )"
 
-src_unpack() {
-  unpack ${A}
-}
 
 src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-mysql=/usr --with-ldap=/usr --with-odbc 
+  local myconf 
+  if [ "`use mysql`" ] ; then
+    myconf="--with-mysql=/usr"
+  fi
+  if [ "`use ldap`" ] ; then
+    myconf="$myconf --with-ldap=/usr"
+  fi
+  if [ "`use odbc`" ]; then
+    myconf="$myconf --with-odbc"
+  fi
+  if [ "`use postgres`" ]; then
+    myconf="$myconf --with-postgres=/usr"
+  fi
+  
+  try ./configure --host=${CHOST} --prefix=/opt/gnome $myconf
   try make
 }
 
 src_install() {                               
-  cd ${S}
   try make prefix=${D}/opt/gnome PREFIX=${D}/usr \
 	GDA_oafinfodir=${D}/opt/gnome/share/oaf install