cleanup. new version thanks to Robert Davis <rdavis@unico.com> (#48611)

12 files changed, 41 insertions, 346 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 7624a9bd0595..94492c4cce2e 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.48 2004/07/01 19:47:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.49 2004/08/05 13:36:10 liquidx Exp $
+
+*libgda-1.0.4 (05 Aug 2004)
+
+  05 Aug 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/libgda-1.0.4-freetds-0.6x.patch, -libgda-0.12.1.ebuild,
+  -libgda-0.2.95-r1.ebuild, -libgda-1.0.0.ebuild, -libgda-1.0.1.ebuild,
+  +libgda-1.0.4.ebuild:
+  cleanup. new version thanks to Robert Davis <rdavis@unico.com> (#48611)
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libgda-0.2.95-r1.ebuild, libgda-0.2.96-r2.ebuild:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index e8f5ccf00f41..d0f8d3d96b5a 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,20 +1,14 @@
 MD5 43f7c0013290d2ec9cef53c288cb4a43 libgda-0.2.96-r2.ebuild 3433
 MD5 5847f4cf80c3e2834a63e64aca54dfbf libgda-1.0.3.ebuild 2766
-MD5 87b437636029cd24d8838f5a8d4b941d libgda-0.12.1.ebuild 2572
-MD5 d1b9afb8fd72e97eead503d7ca3d79b7 libgda-1.0.0.ebuild 2542
 MD5 c97638c8c25e322203f05406fcc81f4d libgda-1.0.2.ebuild 2618
-MD5 db4406aaf5c35b7713df02981d408b26 libgda-0.2.95-r1.ebuild 3226
+MD5 45bdfdcb1d1f17f81321350336bdef38 libgda-1.0.4.ebuild 2767
 MD5 f9b7d8f8d1ddaf7b6643837a49e50c7e ChangeLog 7423
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 71dcb3cbc3db9c7e39d4da5e387ac821 libgda-1.0.1.ebuild 2567
-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 c15d8674b02051d6c9af76a12258ab8b files/digest-libgda-1.0.4 66
 MD5 adf80d651f1d75c9745c44264f58708e files/libgda-1.0.2-gcc2_fix.patch 641
 MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
-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 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
 MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
diff --git a/gnome-extra/libgda/files/digest-libgda-0.12.1 b/gnome-extra/libgda/files/digest-libgda-0.12.1
deleted file mode 100644
index afbe137e9977..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d98597ca9746d36db8e455ce7de48ac0 libgda-0.12.1.tar.bz2 902974
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.95-r1 b/gnome-extra/libgda/files/digest-libgda-0.2.95-r1
deleted file mode 100644
index e64c1a19887d..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.2.95-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4edd46fc1ead7ff1b2931fbf5a24d600 libgda-0.2.95.tar.gz 1320331
diff --git a/gnome-extra/libgda/files/digest-libgda-1.0.0 b/gnome-extra/libgda/files/digest-libgda-1.0.0
deleted file mode 100644
index 459099ad1360..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e5f5c0943600236ec16df35119af86a libgda-1.0.0.tar.bz2 1026627
diff --git a/gnome-extra/libgda/files/digest-libgda-1.0.1 b/gnome-extra/libgda/files/digest-libgda-1.0.1
deleted file mode 100644
index 6d8e03614b51..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3f7c8aed0d85e68e1dd8ae3343ce476 libgda-1.0.1.tar.bz2 1029966
diff --git a/gnome-extra/libgda/files/digest-libgda-1.0.4 b/gnome-extra/libgda/files/digest-libgda-1.0.4
new file mode 100644
index 000000000000..9bf03580bb9d
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-1.0.4
@@ -0,0 +1 @@
+MD5 c13d884dc61a3819c91422880147864d libgda-1.0.4.tar.bz2 1112201
diff --git a/gnome-extra/libgda/files/libgda-1.0.4-freetds-0.6x.patch b/gnome-extra/libgda/files/libgda-1.0.4-freetds-0.6x.patch
new file mode 100644
index 000000000000..c917ffd17c09
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.0.4-freetds-0.6x.patch
@@ -0,0 +1,15 @@
+--- providers/freetds/gda-freetds-provider.c.orig      2004-04-18 06:30:42.000000000 -0500
++++ providers/freetds/gda-freetds-provider.c 2004-04-21 12:20:57.523822128 -0500
+@@ -247,7 +247,12 @@
+	if (t_port)
+		tds_set_port(tds_cnc->login, atoi(t_port));
+	
++#ifdef HAVE_FREETDS_VER0_6X
++	tds_set_client_charset(tds_cnc->login, "iso_1");
++#else
+	tds_set_charset(tds_cnc->login, "iso_1");
++#endif
++
+	tds_set_language(tds_cnc->login, "us_english");
+	tds_set_packet(tds_cnc->login, 512);
+
diff --git a/gnome-extra/libgda/libgda-0.12.1.ebuild b/gnome-extra/libgda/libgda-0.12.1.ebuild
deleted file mode 100644
index 90bde8c90d5d..000000000000
--- a/gnome-extra/libgda/libgda-0.12.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.10 2004/06/24 22:08:15 agriffis 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="1"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc"
-
-RDEPEND=">=gnome-base/ORBit2-2.3.91
-	>=dev-libs/glib-2.0.4
-	>=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 )
-	!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 )"
-
-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
-
-}
diff --git a/gnome-extra/libgda/libgda-0.2.95-r1.ebuild b/gnome-extra/libgda/libgda-0.2.95-r1.ebuild
deleted file mode 100644
index 70725430532e..000000000000
--- a/gnome-extra/libgda/libgda-0.2.95-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.17 2004/07/14 15:56:21 agriffis Exp $
-
-IUSE="ldap odbc postgres mysql"
-
-DESCRIPTION="gda lib"
-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-db"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 sparc ppc"
-
-
-RDEPEND="virtual/libc
-	 >=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}
-	>=app-text/scrollkeeper-0.2-r3
-	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() {
-
-	cd ${S}/doc
-	cp Makefile Makefile.old
-	sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	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				\
-	      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
-}
-
-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/libgda/libgda-1.0.0.ebuild b/gnome-extra/libgda/libgda-1.0.0.ebuild
deleted file mode 100644
index 41964d16abc0..000000000000
--- a/gnome-extra/libgda/libgda-1.0.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.8 2004/06/24 22:08:15 agriffis Exp $
-
-IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
-
-inherit gnome2
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="1"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc sparc"
-
-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 )
-	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
-
-}
diff --git a/gnome-extra/libgda/libgda-1.0.1.ebuild b/gnome-extra/libgda/libgda-1.0.4.ebuild
index 01e6f54d713d..72ac3944192e 100644
--- a/gnome-extra/libgda/libgda-1.0.1.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.4.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.9 2004/06/24 22:08:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.4.ebuild,v 1.1 2004/08/05 13:36:10 liquidx Exp $
 
-IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
-
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
-SLOT="1"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha hppa"
+
+IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
 
 RDEPEND=">=dev-libs/glib-2.0
 	>=dev-libs/libxml2-2.0
@@ -42,6 +42,14 @@ MAKEOPTS="${MAKEOPTS} -j1"
 src_unpack() {
 	unpack ${A}
 	gnome2_omf_fix ${S}/doc/Makefile.in
+	cd ${S}
+	# Fix libgda's manual source. See bug #46337.
+	epatch ${FILESDIR}/${PN}-1.0.3-gtkdoc_fixes.patch
+	# Fix gcc 3.4 compilation.  See bug #49234
+	epatch ${FILESDIR}/${PN}-1.0.3-gcc3.4.patch
+	# freetds patch (#48611)
+	epatch ${FILESDIR}/${PN}-1.0.4-freetds-0.6x.patch
+
 }
 
 src_compile() {