stable bump and cleanups

6 files changed, 3 insertions, 212 deletions

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 70148a2fee46..c559819cf4a3 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -2,14 +2,10 @@ MD5 10e28d9c4f764fa78820012131af36ae ChangeLog 4266
 MD5 21d7bf915f9fdd61a090b47644a39662 libgda-0.12.1.ebuild 2570
 MD5 37f9b04c394742e1ffcb6bf1218b6358 libgda-0.2.95-r1.ebuild 3283
 MD5 ec4c66af4e7ca373e370223b7d126a4b libgda-0.2.96-r2.ebuild 3495
-MD5 c19c0993d2f98e805569ab396e6e9bcb libgda-0.90.0.ebuild 2571
-MD5 6bcaaa395f9f33c972852adc62b6f044 libgda-0.91.0.ebuild 2538
-MD5 fccb16ab9d293633d8534799a15dad21 libgda-1.0.0.ebuild 2536
+MD5 084cc2ae44169bf5200493bd49c428e9 libgda-1.0.0.ebuild 2535
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
 MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
 MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
-MD5 96d08151726366cf97edb37406a5924e files/digest-libgda-0.90.0 66
-MD5 63dee932cc061b87f2dae134b3ffe276 files/digest-libgda-0.91.0 66
 MD5 3ca3af1e56c86303037c0792d9c90d3d files/digest-libgda-1.0.0 66
 MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
diff --git a/gnome-extra/libgda/files/digest-libgda-0.90.0 b/gnome-extra/libgda/files/digest-libgda-0.90.0
deleted file mode 100644
index d04339c31769..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.90.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a2571c4bffd95bb0edb3d63189c93b4 libgda-0.90.0.tar.bz2 935196
diff --git a/gnome-extra/libgda/files/digest-libgda-0.91.0 b/gnome-extra/libgda/files/digest-libgda-0.91.0
deleted file mode 100644
index 4180d7589cb5..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.91.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fcb413d3f26724ff3f6d459c79fa4453 libgda-0.91.0.tar.bz2 986737
diff --git a/gnome-extra/libgda/libgda-0.90.0.ebuild b/gnome-extra/libgda/libgda-0.90.0.ebuild
deleted file mode 100644
index b915b775fb0f..000000000000
--- a/gnome-extra/libgda/libgda-0.90.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.5 2003/09/12 20:19:07 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="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 )
-	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.91.0.ebuild b/gnome-extra/libgda/libgda-0.91.0.ebuild
deleted file mode 100644
index c8d109cd5d92..000000000000
--- a/gnome-extra/libgda/libgda-0.91.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.91.0.ebuild,v 1.3 2003/09/08 05:11:17 msterret 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"
-
-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 )
-	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.0.ebuild b/gnome-extra/libgda/libgda-1.0.0.ebuild
index 03bab267e212..818fae856e37 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.
 # 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.1 2003/09/16 14:58:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.0.ebuild,v 1.2 2003/10/08 21:48:30 liquidx 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"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND=">=dev-libs/glib-2.0
 	>=dev-libs/libxml2-2.0