new version

14 files changed, 59 insertions, 249 deletions

diff --git a/gnome-extra/gnome-db/ChangeLog b/gnome-extra/gnome-db/ChangeLog
index 7dfaaf854ca8..e2d7194340e8 100644
--- a/gnome-extra/gnome-db/ChangeLog
+++ b/gnome-extra/gnome-db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-db
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/ChangeLog,v 1.2 2002/03/23 00:52:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/ChangeLog,v 1.3 2002/06/07 20:43:26 azarah Exp $
+
+*gnome-db-0.2.96 (7 Jun 2002)
+
+  7 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Update version.
 
 *gnome-db-0.2.95-r2 (22 Mar 2002)
 
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.93-r2 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.93-r2
deleted file mode 100644
index 80b9e87b1ac8..000000000000
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.93-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e8be942f84f82de4b48eee956b922d4 gnome-db-0.2.93.tar.gz 953623
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.95 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.95
deleted file mode 100644
index 96d0f7172d00..000000000000
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 134fde33eaed637635b534a9980ae769 gnome-db-0.2.95.tar.gz 954064
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.95-r1 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.95-r1
deleted file mode 100644
index 96d0f7172d00..000000000000
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.95-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 134fde33eaed637635b534a9980ae769 gnome-db-0.2.95.tar.gz 954064
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.96 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.96
new file mode 100644
index 000000000000..81c383740ecb
--- /dev/null
+++ b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.96
@@ -0,0 +1 @@
+MD5 43f933d221270048fc5ea67832b350a2 gnome-db-0.2.96.tar.gz 996431
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.93-r2.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.93-r2.ebuild
deleted file mode 100644
index 7c9bb4af64ef..000000000000
--- a/gnome-extra/gnome-db/gnome-db-0.2.93-r2.ebuild
+++ /dev/null
@@ -1,57 +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: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.93-r2.ebuild,v 1.1 2002/01/14 18:51:09 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-		 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-RDEPEND=">=gnome-base/bonobo-1.0.9-r1
-		 >=gnome-extra/libgda-${PV}
-		 >=gnome-extra/gal-0.13-r1"
-
-DEPEND="${RDEPEND}
-		>=dev-util/intltool-0.11"
-
-
-src_compile() {
-	./configure --host=${CHOST} \
-				--prefix=/usr \
-				--sysconfdir=/etc \
-				--localstatedir=/var/lib \
-				--disable-bonobotest || die
-	emake || die
-}
-
-src_install() {
-	cd ${S}/doc
-	cp Makefile Makefile.orig
-	sed -e "s:scrollkeeper-update.*::g" Makefile.orig > Makefile
-	rm -f Makefile.orig
-	cd ${S}
-
-	make prefix=${D}/usr \
-		 sysconfdir=${D}/etc \
-		 localstatedir=${D}/var/lib \
-		 localedir=${D}/usr/share/local \
-		 GNOME_sysconfdir=${D}/etc \
-		 GNOME_datadir=${D}/usr/share \
-		 GNOMEDB_oafinfodir=${D}/usr/share/oaf \
-		 GNOMEDB_oafdir=${D}/usr/share/oaf \
-		 install || die
-	dodoc AUTHORS COPYING ChangeLog README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-		
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.95.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.95.ebuild
deleted file mode 100644
index 8d1a1b193431..000000000000
--- a/gnome-extra/gnome-db/gnome-db-0.2.95.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.95.ebuild,v 1.1 2002/01/27 14:18:38 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome-db.org/pub/gnome-db/sources/latest/${P}.tar.gz
-	ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
-
-RDEPEND=">=gnome-base/bonobo-1.0.9-r1
-	 >=gnome-extra/libgda-${PV}
-	 >=gnome-extra/gal-0.13-r1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.11"
-
-
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--disable-bonobotest || die
-	emake || die
-}
-
-src_install() {
-	cd ${S}/doc
-	cp Makefile Makefile.orig
-	sed -e "s:scrollkeeper-update.*::g" Makefile.orig > Makefile
-	rm -f Makefile.orig
-	cd ${S}
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		localedir=${D}/usr/share/local \
-		GNOME_sysconfdir=${D}/etc \
-		GNOME_datadir=${D}/usr/share \
-		GNOMEDB_oafinfodir=${D}/usr/share/oaf \
-		GNOMEDB_oafdir=${D}/usr/share/oaf \
-		install || die
-	dodoc AUTHORS COPYING ChangeLog README
-}
-
-pkg_postinst() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update >/dev/null 2>&1
-}
-		
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.95-r1.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.96.ebuild
index 1f4693e3c65b..ea7259239650 100644
--- a/gnome-extra/gnome-db/gnome-db-0.2.95-r1.ebuild
+++ b/gnome-extra/gnome-db/gnome-db-0.2.96.ebuild
@@ -1,28 +1,41 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.95-r1.ebuild,v 1.1 2002/01/29 19:39:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.2.96.ebuild,v 1.1 2002/06/07 20:43:26 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Framework for creating database applications"
 SRC_URI="ftp://ftp.gnome-db.org/pub/gnome-db/sources/latest/${P}.tar.gz
 	ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
+SLOT="0"
 
 RDEPEND=">=gnome-base/bonobo-1.0.9-r1
 	 >=gnome-extra/libgda-${PV}
-	 >=gnome-extra/gal-0.13-r1"
+	 >=gnome-extra/gal-0.13-r1
+	 nls? ( sys-devel/gettext )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.11"
 
 
 src_compile() {
+	local myopts
+
+	if [ "`use nls`" ]
+	then 
+		myopts="--enable-nls"
+	else
+		myopts="--disable-nls"
+	fi
+
 	./configure --host=${CHOST} \
 		--prefix=/usr \
+		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
-		--disable-bonobotest || die
+		--disable-bonobotest \
+		${myopts} || die
 	emake || die
 }
 
@@ -35,6 +48,7 @@ src_install() {
 
 	make prefix=${D}/usr \
 		sysconfdir=${D}/etc \
+		mandir=${D}/usr/share/man \
 		localstatedir=${D}/var/lib \
 		localedir=${D}/usr/share/locale \
 		GNOME_sysconfdir=${D}/etc \
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 9e5c9d518977..bf533fb0fd00 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.2 2002/04/29 04:43:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.3 2002/06/07 20:43:21 azarah Exp $
+
+*libgda-0.2.96 (7 Jun 2002)
+
+  7 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Update to new version.  Resolve bug #1959.
 
 *libgda-0.2.95-r1 (29 Apr 2002)
 
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.93 b/gnome-extra/libgda/files/digest-libgda-0.2.93
deleted file mode 100644
index fd4427311077..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.2.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed5e317475ec71c4de25d1b4c1db16fb libgda-0.2.93.tar.gz 1285650
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.95 b/gnome-extra/libgda/files/digest-libgda-0.2.95
deleted file mode 100644
index e64c1a19887d..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.2.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4edd46fc1ead7ff1b2931fbf5a24d600 libgda-0.2.95.tar.gz 1320331
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.96 b/gnome-extra/libgda/files/digest-libgda-0.2.96
new file mode 100644
index 000000000000..a359b7677236
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-0.2.96
@@ -0,0 +1 @@
+MD5 7c52b9a76b8b7669b795393de1ddc322 libgda-0.2.96.tar.gz 1327366
diff --git a/gnome-extra/libgda/libgda-0.2.93.ebuild b/gnome-extra/libgda/libgda-0.2.93.ebuild
deleted file mode 100644
index a0fad74fb58a..000000000000
--- a/gnome-extra/libgda/libgda-0.2.93.ebuild
+++ /dev/null
@@ -1,103 +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: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.93.ebuild,v 1.2 2001/11/05 12:27:05 achim Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="gda lib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${P}.tar.gz
-	 ftp://ftp.gnome-db.org/pub/gnome-db/sources/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-db"
-
-RDEPEND="virtual/glibc
-	 >=gnome-base/gconf-1.0.4-r2
-	 >=gnome-base/oaf-0.6.6-r1
-	 >=gnome-base/bonobo-1.0.9-r1
-	 >=dev-libs/libxslt-1.0.1
-	 >=sys-libs/gdbm-1.8.0
-	 >=sys-libs/readline-4.1
-	 >=dev-perl/CORBA-ORBit-0.4.3
-	 >=dev-db/sqlite-2.0.8
-	 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 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/which"
-
-
-src_compile() {
-
-	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
-  
-  	# Wierd one, it dont detect bonobo. If someone could have a look
-	# and fix if i havent gotten to it yet.
-	myconf="$myconf --disable-bonobotest"
-
-	# Do not compile buildin sqlite
-	cp configure configure.orig
-	grep -v sqlite configure.orig >configure
-	chmod +x configure
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr	 				\
-		    --sysconfdir=/etc		 			\
-		    --localstatedir=/var/lib				\
-		    $myconf || die
-
-	# Build and use an external version of sqlite since some versions
-	# of libgda have a bug where the buildin do not compile.
-	# Also cant hurt to use the latest version of sqlite :)
-	mv ${S}/providers/gda-default-server/gda-default.h 		\
-		${S}/gda-default.h.orig
-	sed -e 's/\"build_sqlite\/sqlite\.h\"/<sqlite.h>/'		\
-		${S}/gda-default.h.orig >				\
-		${S}/providers/gda-default-server/gda-default.h || die
-	ln -s /usr/lib/libsqlite.a					\
-		${S}/providers/gda-default-server/sqlite/libsqlite.a
-	mv providers/gda-default-server/Makefile			\
-		providers/gda-default-server/Makefile.orig
-	grep -v '= sqlite' providers/gda-default-server/Makefile.orig >	\
-		providers/gda-default-server/Makefile
-
-	# Doesn't work with -j 4 (hallski)
-	make LDFLAGS="-lncurses" LIBREADLINE="-lreadline -lncurses" || die
-}
-
-src_install() {
-
-	make  prefix=${D}/usr						\
-	      sysconfdir=${D}/etc					\
-	      localstatedir=${D}/var/lib				\
-	      INSTALLMAN3DIR=${D}/usr/share/man/man3 			\
-	      GDA_oafinfodir=${D}/usr/share/oaf				\
-	      install || die
-
-	into /usr
-
-	# Not needed as we build sqlite seperately
-#	dobin providers/gda-default-server/build_sqlite/{lemon,sqlite}
-
-	dodoc AUTHORS COPYING.* ChangeLog NEWS README
-}
diff --git a/gnome-extra/libgda/libgda-0.2.95.ebuild b/gnome-extra/libgda/libgda-0.2.96.ebuild
index a8b6a42ee090..4dce7819e97d 100644
--- a/gnome-extra/libgda/libgda-0.2.95.ebuild
+++ b/gnome-extra/libgda/libgda-0.2.96.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.95.ebuild,v 1.1 2002/01/27 14:02:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-0.2.96.ebuild,v 1.1 2002/06/07 20:43:21 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gda lib"
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.gnome.org/gnome-db"
 
 RDEPEND="virtual/glibc
 	 >=gnome-base/gconf-1.0.4-r2
+	 <gnome-base/gconf-1.1
 	 >=gnome-base/oaf-0.6.6-r1
 	 >=gnome-base/bonobo-1.0.9-r1
 	 >=dev-libs/libxslt-1.0.1
@@ -24,6 +25,7 @@ RDEPEND="virtual/glibc
 	 ldap? ( >=net-nds/openldap-1.2.11 )"
 
 DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.2-r3
 	sys-apps/which"
 
 
@@ -36,10 +38,13 @@ src_compile() {
 		myconf="--with-mysql=/usr"
 	fi
 
-  	if [ "`use ldap`" ]
-	then
-    		myconf="$myconf --with-ldap=/usr"
-  	fi
+#  	if [ "`use ldap`" ]
+#	then
+#    		myconf="$myconf --with-ldap=/usr"
+#  	fi
+#
+# LDAP support is currently broken
+	myconf="$myconf --without-ldap"
 
   	if [ "`use odbc`" ]
 	then
@@ -60,25 +65,25 @@ src_compile() {
 	grep -v sqlite configure.orig >configure
 	chmod +x configure
 
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr	 				\
-		    --sysconfdir=/etc		 			\
-		    --localstatedir=/var/lib				\
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc \
+		    --localstatedir=/var/lib \
 		    $myconf || die
 
 	# Build and use an external version of sqlite since some versions
 	# of libgda have a bug where the buildin do not compile.
 	# Also cant hurt to use the latest version of sqlite :)
-	mv ${S}/providers/gda-default-server/gda-default.h 		\
+	mv ${S}/providers/gda-default-server/gda-default.h \
 		${S}/gda-default.h.orig
-	sed -e 's/\"build_sqlite\/sqlite\.h\"/<sqlite.h>/'		\
-		${S}/gda-default.h.orig >				\
+	sed -e 's/\"build_sqlite\/sqlite\.h\"/<sqlite.h>/' \
+		${S}/gda-default.h.orig > \
 		${S}/providers/gda-default-server/gda-default.h || die
-	ln -s /usr/lib/libsqlite.a					\
+	ln -s /usr/lib/libsqlite.a \
 		${S}/providers/gda-default-server/sqlite/libsqlite.a
-	mv providers/gda-default-server/Makefile			\
+	mv providers/gda-default-server/Makefile \
 		providers/gda-default-server/Makefile.orig
-	grep -v '= sqlite' providers/gda-default-server/Makefile.orig >	\
+	grep -v '= sqlite' providers/gda-default-server/Makefile.orig > \
 		providers/gda-default-server/Makefile
 
 	# Doesn't work with -j 4 (hallski)
@@ -93,15 +98,13 @@ src_install() {
 	rm Makefile.old
 	cd ${S}
 
-	make  prefix=${D}/usr						\
-	      sysconfdir=${D}/etc					\
-	      localstatedir=${D}/var/lib				\
-	      INSTALLMAN3DIR=${D}/usr/share/man/man3 			\
-	      GDA_oafinfodir=${D}/usr/share/oaf				\
+	make  prefix=${D}/usr \
+	      sysconfdir=${D}/etc \
+	      localstatedir=${D}/var/lib \
+	      INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+	      GDA_oafinfodir=${D}/usr/share/oaf \
 	      install || die
 
-	into /usr
-
 	# Not needed as we build sqlite seperately
 #	dobin providers/gda-default-server/build_sqlite/{lemon,sqlite}
 
@@ -117,3 +120,4 @@ pkg_postrm() {
 	echo ">>> Updating Scrollkeeper database..."
 	scrollkeeper-update >/dev/null 2>&1
 }
+