Remove vulnerable versions from glsa(200511-01)

(Portage version: 2.1_rc1-r4)
 (Signed Manifest commit)

11 files changed, 43 insertions, 952 deletions

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index cf2b1250e6e8..ea77cc47141d 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,20 +1,50 @@
-MD5 f24d69170e887d2a17dd5a57ee835da3 ChangeLog 13319
-MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
-MD5 c15d8674b02051d6c9af76a12258ab8b files/digest-libgda-1.0.4 66
-MD5 ef67c275e1a496a0f75f76369994c248 files/digest-libgda-1.2.2-r1 66
-MD5 54f4be13cca3cd9756c499a92ce5fc0b files/digest-libgda-1.2.3 66
-MD5 552028d2c6006f11a013b81e4e3fc56c files/libgda-0.2.96-gcc3.4.patch 607
-MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libgda-1.0.2-freetds_fix.patch 1338 RMD160 62f2dc9b951f8456d5c034e69abc9c3c21b2e46a SHA1 4c4dc96a4ce8a3dac26714352da9259628dd3fca SHA256 22455fe285d8a14ea52671bcaaba3fa1a8f77f3ec5ca55b19a7f05413411df79
 MD5 89d5a7588e21826826be8ecb11218b94 files/libgda-1.0.2-freetds_fix.patch 1338
-MD5 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
-MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
-MD5 b87a0e5fdf7e23d29ee4452e694140c4 files/libgda-1.0.4-firebird-provider.patch 1055
-MD5 42fbab3bc532505fcd7e85aafb9c5a41 files/libgda-1.0.4-freetds-0.6x.patch 482
+RMD160 62f2dc9b951f8456d5c034e69abc9c3c21b2e46a files/libgda-1.0.2-freetds_fix.patch 1338
+SHA256 22455fe285d8a14ea52671bcaaba3fa1a8f77f3ec5ca55b19a7f05413411df79 files/libgda-1.0.2-freetds_fix.patch 1338
+AUX libgda-1.2-syslog_format_fix.patch 630 RMD160 14a597939d54abb23ebbf65da4b3119dee7cf23e SHA1 f7e1dbfaeb0c426df6c34fb9da1d0014bec605f6 SHA256 2119d27d1dfa955c5d95cbc58c02b4c947db15fb819b97ce1b0674b0c0930002
 MD5 b8d3b0cae4aa507dd9c6cecee8d30067 files/libgda-1.2-syslog_format_fix.patch 630
+RMD160 14a597939d54abb23ebbf65da4b3119dee7cf23e files/libgda-1.2-syslog_format_fix.patch 630
+SHA256 2119d27d1dfa955c5d95cbc58c02b4c947db15fb819b97ce1b0674b0c0930002 files/libgda-1.2-syslog_format_fix.patch 630
+AUX libgda-1.2.1-mdb_fix.patch 617 RMD160 d0834957fedc6875a02b5c4d07ea23151aa48344 SHA1 1bdfa273e8d240f66baf5f87e5ac6c293e72fa3f SHA256 d2c35139c43c570685f99c69aff2832f8db930b04c3991c7f0f91d6b0bc1be32
 MD5 b4dee0ec0bc3b4333c572810d035c68f files/libgda-1.2.1-mdb_fix.patch 617
+RMD160 d0834957fedc6875a02b5c4d07ea23151aa48344 files/libgda-1.2.1-mdb_fix.patch 617
+SHA256 d2c35139c43c570685f99c69aff2832f8db930b04c3991c7f0f91d6b0bc1be32 files/libgda-1.2.1-mdb_fix.patch 617
+AUX libgda-1.2.2-freetds_fixes.patch 1771 RMD160 dda830caeb7c609a7a23453ef5f540c1586e3767 SHA1 0bb5ad6fc7072b128cab07f13045ac3579f8e462 SHA256 b69939f99e820918d9631cacaec2eb7b0abaf1bf11bff4d51198906f3c8b27f2
 MD5 c95ffd3e34df767ced0741bb1ba184e2 files/libgda-1.2.2-freetds_fixes.patch 1771
-MD5 efe942efcc3bbe2a6ae347a7e6808a57 libgda-0.2.96-r2.ebuild 3487
-MD5 bd149dbad4eeac269f4e8b27e06507c5 libgda-1.0.4.ebuild 2937
+RMD160 dda830caeb7c609a7a23453ef5f540c1586e3767 files/libgda-1.2.2-freetds_fixes.patch 1771
+SHA256 b69939f99e820918d9631cacaec2eb7b0abaf1bf11bff4d51198906f3c8b27f2 files/libgda-1.2.2-freetds_fixes.patch 1771
+DIST libgda-1.2.2.tar.bz2 1242035
+DIST libgda-1.2.3.tar.bz2 1075643 RMD160 d429dcce511084287cc63a2d1df93f7ca6d9316c SHA256 17add29bb2d7b57da5874f8a28c1a0af4b6f965ad992fef25002b6c33318f303
+EBUILD libgda-1.2.2-r1.ebuild 2254 RMD160 e32f7f96fca843f17fac94600af7a3edce2ceb14 SHA1 51123057938827829d1e8b6657ac94d5f570075c SHA256 1695724cd483582f547e1da79845a6e9d6020ae4c2f50c5c90a29da177d83b1d
 MD5 3a955c39d43b49a850a20873b50cccd5 libgda-1.2.2-r1.ebuild 2254
+RMD160 e32f7f96fca843f17fac94600af7a3edce2ceb14 libgda-1.2.2-r1.ebuild 2254
+SHA256 1695724cd483582f547e1da79845a6e9d6020ae4c2f50c5c90a29da177d83b1d libgda-1.2.2-r1.ebuild 2254
+EBUILD libgda-1.2.3.ebuild 1999 RMD160 5f2b41f85dd753bcf9f6d65dba57618e418bb559 SHA1 6ef63cb6dd4e8c47859d9190b78291f5a615dba2 SHA256 12501f3cdabeea6f7295e2e6597dd98b7a23d34d96f6eb06b679f891331dd30e
 MD5 80edd7bfe252cb41217739d6447f20e3 libgda-1.2.3.ebuild 1999
+RMD160 5f2b41f85dd753bcf9f6d65dba57618e418bb559 libgda-1.2.3.ebuild 1999
+SHA256 12501f3cdabeea6f7295e2e6597dd98b7a23d34d96f6eb06b679f891331dd30e libgda-1.2.3.ebuild 1999
+MISC ChangeLog 13704 RMD160 ea8e067f69c5f366c22c0498bbc8dce565a9677a SHA1 37ecbdb1818d74914245297e80be451c228644f5 SHA256 dc9e782975080049e7717aea0c96c9ca6c2db61b835955afc2055c96c07cd63a
+MD5 60a5403c7d6a02f4493e349a66210946 ChangeLog 13704
+RMD160 ea8e067f69c5f366c22c0498bbc8dce565a9677a ChangeLog 13704
+SHA256 dc9e782975080049e7717aea0c96c9ca6c2db61b835955afc2055c96c07cd63a ChangeLog 13704
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+MD5 ef67c275e1a496a0f75f76369994c248 files/digest-libgda-1.2.2-r1 66
+RMD160 0b178e11c309c672a120afb36f6c4866aac66317 files/digest-libgda-1.2.2-r1 66
+SHA256 aa84c5e5b42a9b36925a99199f8072a3e626dfcd66a5db2997b6905c63c77eae files/digest-libgda-1.2.2-r1 66
+MD5 0585ea86d6d935b35b23b5b574db7c87 files/digest-libgda-1.2.3 244
+RMD160 9fc9ec61243574b939d96986ec33522214d63c01 files/digest-libgda-1.2.3 244
+SHA256 f0c3c9e2af594dd3621ac1914aec3c9695204b2d2bf0ce035931fd31cac4c9f2 files/digest-libgda-1.2.3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEcfMFomPajV0RnrERAkWtAJ96xm2romsGv0nps9+B6zoJ78Y6wgCfaQfG
+aCqsRKmWQ4CfKXstXIXCLI0=
+=FME5
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.96-r2 b/gnome-extra/libgda/files/digest-libgda-0.2.96-r2
deleted file mode 100644
index a359b7677236..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-0.2.96-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c52b9a76b8b7669b795393de1ddc322 libgda-0.2.96.tar.gz 1327366
diff --git a/gnome-extra/libgda/files/digest-libgda-1.0.4 b/gnome-extra/libgda/files/digest-libgda-1.0.4
deleted file mode 100644
index 9bf03580bb9d..000000000000
--- a/gnome-extra/libgda/files/digest-libgda-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c13d884dc61a3819c91422880147864d libgda-1.0.4.tar.bz2 1112201
diff --git a/gnome-extra/libgda/files/libgda-0.2.96-gcc3.4.patch b/gnome-extra/libgda/files/libgda-0.2.96-gcc3.4.patch
deleted file mode 100644
index a215f213ae0c..000000000000
--- a/gnome-extra/libgda/files/libgda-0.2.96-gcc3.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -NurdB libgda-0.2.96/providers/gda-mysql-server/gda-mysql-connection.c libgda-0.2.96-patched/providers/gda-mysql-server/gda-mysql-connection.c
---- libgda-0.2.96/providers/gda-mysql-server/gda-mysql-connection.c	2001-09-28 16:18:52.000000000 -0500
-+++ libgda-0.2.96-patched/providers/gda-mysql-server/gda-mysql-connection.c	2005-06-03 00:03:17.000000000 -0500
-@@ -539,7 +539,7 @@
- 			case GDA_Connection_OBJECT_CATALOG:
- 				/* N/A */
- 				break;
--			default:
-+			default: ;
- 			}
- 		}
- 
-@@ -683,7 +683,7 @@
- 			break;
- 		case GDA_Connection_COLUMN_NAME:
- 			break;
--		default:
-+		default: ;
- 		}
- 	}
- 
diff --git a/gnome-extra/libgda/files/libgda-0.2.96-gentoo.patch b/gnome-extra/libgda/files/libgda-0.2.96-gentoo.patch
deleted file mode 100644
index a5bd58cbd6d3..000000000000
--- a/gnome-extra/libgda/files/libgda-0.2.96-gentoo.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Nru libgda-0.2.96/bindings/c++/gdaBatch.cpp libgda-0.2.96-new/bindings/c++/gdaBatch.cpp
---- libgda-0.2.96/bindings/c++/gdaBatch.cpp	Fri Dec  7 15:07:48 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaBatch.cpp	Wed Jul  3 15:01:30 2002
-@@ -127,7 +127,7 @@
- }
- 
- GdaBatch*
--Batch::getCStruct (bool refn = true) const
-+Batch::getCStruct (bool refn) const
- {
- 	if (refn)
- 	  ref ();
-diff -Nru libgda-0.2.96/bindings/c++/gdaCommand.cpp libgda-0.2.96-new/bindings/c++/gdaCommand.cpp
---- libgda-0.2.96/bindings/c++/gdaCommand.cpp	Fri Dec  7 15:07:48 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaCommand.cpp	Wed Jul  3 15:01:57 2002
-@@ -139,7 +139,7 @@
- */
- 
- GdaCommand*
--Command::getCStruct (bool refn = true) const
-+Command::getCStruct (bool refn) const
- {
- 	if (refn)
- 		ref ();
-diff -Nru libgda-0.2.96/bindings/c++/gdaConnection.cpp libgda-0.2.96-new/bindings/c++/gdaConnection.cpp
---- libgda-0.2.96/bindings/c++/gdaConnection.cpp	Fri Dec  7 15:07:48 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaConnection.cpp	Wed Jul  3 15:02:59 2002
-@@ -294,7 +294,7 @@
- 	return gda_connection_get_version (_gda_connection);
- }
- 
--GdaConnection* Connection::getCStruct (bool refn = true) const
-+GdaConnection* Connection::getCStruct (bool refn) const
- {
- 	if (refn) ref ();
- 	return _gda_connection;
-diff -Nru libgda-0.2.96/bindings/c++/gdaConnection.h libgda-0.2.96-new/bindings/c++/gdaConnection.h
---- libgda-0.2.96/bindings/c++/gdaConnection.h	Fri Dec  7 15:07:48 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaConnection.h	Wed Jul  3 15:01:08 2002
-@@ -20,6 +20,8 @@
- #ifndef __gda_bindings_cpp_gdaConnectionH
- #define __gda_bindings_cpp_gdaConnectionH
- 
-+using namespace std;
-+
- namespace gda {
- 
- class Recordset;
-diff -Nru libgda-0.2.96/bindings/c++/gdaError.cpp libgda-0.2.96-new/bindings/c++/gdaError.cpp
---- libgda-0.2.96/bindings/c++/gdaError.cpp	Fri Dec  7 15:07:48 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaError.cpp	Wed Jul  3 15:03:35 2002
-@@ -98,7 +98,7 @@
- }
- 
- GdaError*
--Error::getCStruct (bool refn = true) const
-+Error::getCStruct (bool refn) const
- {
- 	if (refn) ref ();
- 	return _gda_error;
-diff -Nru libgda-0.2.96/bindings/c++/gdaField.cpp libgda-0.2.96-new/bindings/c++/gdaField.cpp
---- libgda-0.2.96/bindings/c++/gdaField.cpp	Tue Dec 11 14:16:14 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaField.cpp	Wed Jul  3 15:04:11 2002
-@@ -428,7 +428,7 @@
- }
- 
- GdaField*
--Field::getCStruct (bool refn = true) const
-+Field::getCStruct (bool refn) const
- {
- 	if (refn) ref ();
- 	return _gda_field;
-diff -Nru libgda-0.2.96/bindings/c++/gdaHelpers.h libgda-0.2.96-new/bindings/c++/gdaHelpers.h
---- libgda-0.2.96/bindings/c++/gdaHelpers.h	Sun Nov 18 11:21:55 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaHelpers.h	Wed Jul  3 15:05:34 2002
-@@ -19,6 +19,8 @@
- //#ifndef __gda_helpers_cpp_gdaHelpersH
- //#define __gda_helpers_cpp_gdaHelpersH
- 
-+using namespace std;
-+
- namespace gda {
- string gda_return_string (gchar* pszString);
- };
-diff -Nru libgda-0.2.96/bindings/c++/gdaRecordset.cpp libgda-0.2.96-new/bindings/c++/gdaRecordset.cpp
---- libgda-0.2.96/bindings/c++/gdaRecordset.cpp	Fri Dec  7 15:07:48 2001
-+++ libgda-0.2.96-new/bindings/c++/gdaRecordset.cpp	Wed Jul  3 15:06:00 2002
-@@ -254,7 +254,7 @@
- }
- 
- GdaRecordset*
--Recordset::getCStruct (bool refn = true) const
-+Recordset::getCStruct (bool refn) const
- {
- 	if (refn) ref ();
- 	return _gda_recordset;
diff --git a/gnome-extra/libgda/files/libgda-1.0.3-gcc3.4.patch b/gnome-extra/libgda/files/libgda-1.0.3-gcc3.4.patch
deleted file mode 100644
index df07f34bb07f..000000000000
--- a/gnome-extra/libgda/files/libgda-1.0.3-gcc3.4.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- libgda/gda-util.c.old	2004-04-29 02:19:25.721878904 +0100
-+++ libgda/gda-util.c	2004-04-29 02:19:47.399583392 +0100
-@@ -60,7 +60,7 @@
- 	case GDA_VALUE_TYPE_TIME : return "time";
- 	case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
- 	case GDA_VALUE_TYPE_TINYINT : return "tinyint";
--	default:
-+	default:;
- 	}
- 
- 	return "string";
---- libgda/gda-value.c.old	2004-04-29 02:19:25.724878448 +0100
-+++ libgda/gda-value.c	2004-04-29 02:20:24.490944648 +0100
-@@ -2072,7 +2072,7 @@
- 	case GDA_VALUE_TYPE_TYPE :
- 		retval = g_strdup (gda_type_to_string (value->value.v_type));
- 		break;
--	default:
-+	default:;
- 		retval = g_strdup ("");
- 	}
-         	
-@@ -2222,7 +2222,7 @@
- 		else
- 			retval = g_strdup ("false");
- 		break;
--	default:
-+	default:;
- 		retval = gda_value_stringify (value);
- 	}
-         	
---- libsql/lexer.c.old	2004-04-29 02:19:25.726878144 +0100
-+++ libsql/lexer.c	2004-04-29 02:20:41.545351984 +0100
-@@ -1165,7 +1165,7 @@
- 		break;
- 		}
- 
--	default:
-+	default:;
- 		YY_FATAL_ERROR(
- 			"fatal flex scanner internal error--no action found" );
- 	} /* end of action switch */
---- providers/ldap/gda-ldap-provider.c.old	2004-04-29 02:50:51.237237000 +0100
-+++ providers/ldap/gda-ldap-provider.c	2004-04-29 02:32:49.725651752 +0100
-@@ -275,7 +275,7 @@
- 	switch (feature) {
- 	case GDA_CONNECTION_FEATURE_SQL :
- 		return TRUE;
--	default :
-+	default :;
- 	}
- 
- 	return FALSE;
-@@ -466,7 +466,7 @@
- 		return get_ldap_tables (cnc, params);
- 	case GDA_CONNECTION_SCHEMA_TYPES :
- 		return get_ldap_types (cnc, params);
--	default :
-+	default :;
- 	}
- 
- 	return NULL;
---- providers/mdb/gda-mdb-provider.c.old	2004-04-29 02:50:51.244235936 +0100
-+++ providers/mdb/gda-mdb-provider.c	2004-04-29 02:31:22.540905848 +0100
-@@ -389,7 +389,7 @@
- 			g_strfreev (arr);
- 		}
- 		break;
--	default :
-+	default :;
- 	}
- 
- 	return reclist;
-@@ -438,7 +438,7 @@
- 	case GDA_CONNECTION_FEATURE_PROCEDURES :
- 	case GDA_CONNECTION_FEATURE_SQL :
- 		return TRUE;
--	default :
-+	default :;
- 	}
- 
- 	return FALSE;
---- providers/mysql/gda-mysql-provider.c.old	2004-04-29 02:19:25.779870088 +0100
-+++ providers/mysql/gda-mysql-provider.c	2004-04-29 02:34:15.204656968 +0100
-@@ -510,7 +510,7 @@
- 
- 		g_free (str);
- 		break;
--	default:
-+	default:;
- 	}
- 
- 	return reclist;
-@@ -655,7 +655,7 @@
- 	case GDA_CONNECTION_FEATURE_SQL :
- 	case GDA_CONNECTION_FEATURE_TRANSACTIONS :
- 		return TRUE;
--	default :
-+	default :;
- 	}
- 
- 	return FALSE;
-@@ -1187,7 +1187,7 @@
- 		return get_mysql_tables (cnc, params);
- 	case GDA_CONNECTION_SCHEMA_TYPES :
- 		return get_mysql_types (cnc, params);
--	default :
-+	default :;
- 	}
- 
- 	return NULL;
---- providers/oracle/gda-oracle-provider.c.old	2004-04-29 02:19:25.793867960 +0100
-+++ providers/oracle/gda-oracle-provider.c	2004-04-29 02:35:03.048383616 +0100
-@@ -825,7 +825,7 @@
- 		reclist = process_sql_commands (reclist, cnc, str, NULL, options);
- 		g_free (str);
- 		break;
--	default:
-+	default:;
- 	}
- 	/* don't know what to do here yet. */
- 	return reclist;
-@@ -1044,7 +1044,7 @@
- 	case GDA_CONNECTION_FEATURE_USERS :
- 	case GDA_CONNECTION_FEATURE_VIEWS :
- 		return TRUE;
--	default :
-+	default :;
- 	}
- 
- 	return FALSE;
---- providers/oracle/utils.c.old	2004-04-29 02:19:25.791868264 +0100
-+++ providers/oracle/utils.c	2004-04-29 02:27:26.541783168 +0100
-@@ -110,7 +110,7 @@
- 			break;
- 		case OCI_HTYPE_ENV:
- 			gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line));
--		default:
-+		default:;
- 		}
- 		break;
- 	default:
---- providers/sqlite/gda-sqlite-provider.c.old	2004-04-29 02:19:25.795867656 +0100
-+++ providers/sqlite/gda-sqlite-provider.c	2004-04-29 02:28:07.584543720 +0100
-@@ -586,7 +586,7 @@
- 	case GDA_CONNECTION_FEATURE_TRIGGERS :
- 	case GDA_CONNECTION_FEATURE_VIEWS :
- 		return TRUE;
--	default:
-+	default:;
- 	}
- 
- 	return FALSE;
-@@ -772,7 +772,7 @@
- 		return get_tables (cnc);
- 	case GDA_CONNECTION_SCHEMA_TYPES :
- 		return get_types ();
--	default:
-+	default:;
- 	}
- 
- 	return NULL;
---- providers/xml/gda-xml-provider.c.old	2004-04-29 02:19:25.735876776 +0100
-+++ providers/xml/gda-xml-provider.c	2004-04-29 02:31:47.992036688 +0100
-@@ -681,7 +681,7 @@
- 		return get_tables (cnc, xmldb);
- 	case GDA_CONNECTION_SCHEMA_TYPES :
- 		return get_types (cnc);
--	default :
-+	default :;
- 	}
- 
- 	return NULL;
diff --git a/gnome-extra/libgda/files/libgda-1.0.3-gtkdoc_fixes.patch b/gnome-extra/libgda/files/libgda-1.0.3-gtkdoc_fixes.patch
deleted file mode 100644
index 9c853647b5a9..000000000000
--- a/gnome-extra/libgda/files/libgda-1.0.3-gtkdoc_fixes.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff -NurB libgda-1.0.3-orig/doc/C/libgda-docs.sgml libgda-1.0.3/doc/C/libgda-docs.sgml
---- libgda-1.0.3-orig/doc/C/libgda-docs.sgml	2004-04-01 04:22:09.000000000 -0500
-+++ libgda-1.0.3/doc/C/libgda-docs.sgml	2004-04-01 06:04:12.000000000 -0500
-@@ -2,7 +2,7 @@
- 
- <!ENTITY LIBGDA          "<application>libgda</application>">
- <!ENTITY GNOMEDB         "<application>GNOME-DB</application>">
--<!ENTITY igalia          '<ulink url="http://www.igalia.com">Igalia, S.L.</ulink>'>
-+<!ENTITY igalia          '<emphasis><ulink url="http://www.igalia.com">Igalia, S.L.</ulink></emphasis>'>
- <!ENTITY API             "<acronym>API</acronym>">
- <!ENTITY DBMS            "<acronym>DBMS</acronym>">
- <!ENTITY DSN             "<acronym>DSN</acronym>">
-@@ -28,7 +28,6 @@
- <!ENTITY GDADATAMODELHASH "<xref linkend='libgda-GdaDataModelHash'>">
- <!ENTITY fullexample SYSTEM "examples/full_example.c" CDATA linespecific>
- <!ENTITY migration.sgml SYSTEM "migration.sgml">
--<!ENTITY libgda-batch SYSTEM "sgml/gda-batch.sgml">
- <!ENTITY libgda-blob SYSTEM "sgml/gda-blob.sgml">
- <!ENTITY libgda-client SYSTEM "sgml/gda-client.sgml">
- <!ENTITY libgda-command SYSTEM "sgml/gda-command.sgml">
-@@ -391,23 +390,23 @@
- 	    will need to install a few packages in the following way:
- 	  </para>
-           <PROGRAMLISTING>
--            <SYSTEMITEM CLASS="prompt">$</SYSTEMITEM> <USERINPUT> apt-get install <EMPHASIS>package-names</EMPHASIS></USERINPUT>
-+            <SYSTEMITEM CLASS="prompt">$</SYSTEMITEM> <USERINPUT> apt-get install <REPLACEABLE>package-names</REPLACEABLE></USERINPUT>
-           </PROGRAMLISTING>
-           <para>
-             These are the packages you will need for this:
-           </para>
-           <ITEMIZEDLIST>
--            <LISTITEM>libgda2-1</LISTITEM>
--            <LISTITEM>libgda2-common</LISTITEM>
--            <LISTITEM>libgda2-dev</LISTITEM>
--            <LISTITEM>libgda2-doc</LISTITEM>
--            <LISTITEM>libgda2-dbg</LISTITEM>
-+          <LISTITEM><para>libgda2-1</para></LISTITEM>
-+            <LISTITEM><para>libgda2-common</para></LISTITEM>
-+            <LISTITEM><para>libgda2-dev</para></LISTITEM>
-+            <LISTITEM><para>libgda2-doc</para></LISTITEM>
-+            <LISTITEM><para>libgda2-dbg</para></LISTITEM>
-           </ITEMIZEDLIST>
-           <para>
-             You can obtain information about any packages with:
-           </para>
-           <PROGRAMLISTING>
--            <SYSTEMITEM CLASS="prompt">$</SYSTEMITEM> <USERINPUT> apt-cache show <EMPHASIS>package-names</EMPHASIS></USERINPUT>
-+            <SYSTEMITEM CLASS="prompt">$</SYSTEMITEM> <USERINPUT> apt-cache show <replaceable>package-names</replaceable></USERINPUT>
-           </PROGRAMLISTING>
-           <para>
-             If you cannot find this packages, you must include in
-@@ -637,8 +636,8 @@
-               <LINK LINKEND="installation-provider">providers specific information</LINK>.
-             </para>
-             <para>
--              There was a little bug<footnote>It can be fixed, but it
--              is better not to run the risk of it.</footnote>, and it
-+              There was a little bug<footnote><para>It can be fixed, but it
-+              is better not to run the risk of it.</para></footnote>, and it
- 	      is that <LINK
- 	      LINKEND="gda-config-save-data-source">gda_config_save_data_source()</LINK> 
-               does not create the configuration directory <filename
-@@ -1141,7 +1140,7 @@
-         <para>
-           The command type we most commonly use is <LINK
-           LINKEND="GdaCommandType">GDA_COMMAND_TYPE_SQL</LINK> because we will only
--          focus on &SQL; queries<footnote>There are other command types, as &XML; and so on.
-+          focus on &SQL; queries<footnote><para>There are other command types, as &XML; and so on.</para>
-           </footnote>
-         </para>
-         <PROGRAMLISTINGCO>
-@@ -1244,13 +1243,13 @@
-           LINKEND="data-model">data models</LINK>). You have two ways to do this:
-         </para>
-         <ITEMIZEDLIST>
--          <LISTITEM>
-+          <LISTITEM><para>
-             <LINK LINKEND="gda-connection-execute-single-command">
--              gda_data_model_execute_single_command()</LINK>
-+              gda_data_model_execute_single_command()</LINK></para>
-           </LISTITEM>
--          <LISTITEM>
-+          <LISTITEM><para>
-             <LINK LINKEND="gda-connection-execute-command">
--              gda_data_model_execute_command()</LINK>
-+              gda_data_model_execute_command()</LINK></para>
-           </LISTITEM>
-         </ITEMIZEDLIST>
-         <para>
-@@ -1340,29 +1339,29 @@
-         Let's see the functions we need:
-       </para>
-       <ITEMIZEDLIST>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-get-n-rows">gda_data_model_get_n_rows()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-get-n-rows">gda_data_model_get_n_rows()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-get-n-columns">gda_data_model_get_n_columns()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-get-n-columns">gda_data_model_get_n_columns()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-describe-column">gda_data_model_describe_column()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-describe-column">gda_data_model_describe_column()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-get-column-title">gda_data_model_get_column_title()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-get-column-title">gda_data_model_get_column_title()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-get-column-position">gda_data_model_get_column_position()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-get-column-position">gda_data_model_get_column_position()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-get-row">gda_data_model_get_row()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-get-row">gda_data_model_get_row()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-data-model-get-value-at">gda_data_model_get_value_at()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-data-model-get-value-at">gda_data_model_get_value_at()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-row-get-value">gda_row_get_value()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-row-get-value">gda_row_get_value()</LINK></para>
-         </LISTITEM>
-       </ITEMIZEDLIST>
-       <para>
-@@ -1514,7 +1513,7 @@
-         </para>
-       </sect2>
-     </sect1>
--    <sect1 ID="gdavalue">
-+    <sect1 ID="manage-gdavalue">
-       <title>Managing values</title>
-       <para>
-         Values returned by functions of managing data are <LINK
-@@ -1524,20 +1523,20 @@
-         of them:
-       </para>
-       <ITEMIZEDLIST>
--        <LISTITEM>
--          <LINK LINKEND="gda-value-free">gda_value_free()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-value-free">gda_value_free()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-value-is-null">gda_value_is_null()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-value-is-null">gda_value_is_null()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-value-copy">gda_value_copy()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-value-copy">gda_value_copy()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-value-compare">gda_value_compare()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-value-compare">gda_value_compare()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-value-stringify">gda_value_stringify()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-value-stringify">gda_value_stringify()</LINK></para>
-         </LISTITEM>
-       </ITEMIZEDLIST>
-       <para>
-@@ -1637,20 +1636,20 @@
-         classes, and they are:
-       </para>
-       <ITEMIZEDLIST>
--        <LISTITEM>
--          <LINK LINKEND="gda-transaction-new">gda_transaction_new ()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-transaction-new">gda_transaction_new ()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-connection-begin-transaction">gda_connection_begin_transaction ()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-connection-begin-transaction">gda_connection_begin_transaction ()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-connection-commit-transaction">gda_connection_commit_transaction ()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-connection-commit-transaction">gda_connection_commit_transaction ()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-connection-rollback-transaction">gda_connection_rollback_transaction ()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-connection-rollback-transaction">gda_connection_rollback_transaction ()</LINK></para>
-         </LISTITEM>
--        <LISTITEM>
--          <LINK LINKEND="gda-command-set-transaction">gda_command_set_transaction ()</LINK>
-+        <LISTITEM><para>
-+          <LINK LINKEND="gda-command-set-transaction">gda_command_set_transaction ()</LINK></para>
-         </LISTITEM>
-       </ITEMIZEDLIST>
-       <para>
-@@ -1809,17 +1808,17 @@
-       Here you see the functions to manage errors:
-     </para>
-     <ITEMIZEDLIST>
--      <LISTITEM>
--        <LINK LINKEND="gda-error-get-description">gda_error_get_description()</LINK>
-+      <LISTITEM><para>
-+        <LINK LINKEND="gda-error-get-description">gda_error_get_description()</LINK></para>
-       </LISTITEM>
--      <LISTITEM>
--        <LINK LINKEND="gda-error-get-number">gda_error_get_number()</LINK>
-+      <LISTITEM><para>
-+        <LINK LINKEND="gda-error-get-number">gda_error_get_number()</LINK></para>
-       </LISTITEM>
--      <LISTITEM>
--        <LINK LINKEND="gda-error-get-source">gda_error_get_source()</LINK>
-+      <LISTITEM><para>
-+        <LINK LINKEND="gda-error-get-source">gda_error_get_source()</LINK></para>
-       </LISTITEM>
--      <LISTITEM>
--        <LINK LINKEND="gda-error-get-sqlstate">gda_error_get_sqlstate()</LINK>
-+      <LISTITEM><para>
-+        <LINK LINKEND="gda-error-get-sqlstate">gda_error_get_sqlstate()</LINK></para>
-       </LISTITEM>
-     </ITEMIZEDLIST>
-     <para>
-@@ -1920,9 +1919,9 @@
-         <para>
-           There is no problem about calling several times to this
-           function because if you save an existing data source, it
--          is replaced, so it could be advisable<footnote>But you must think
-+          is replaced, so it could be advisable<footnote><para>But you must think
-           of security if you distribute the source code because people would see
--          the passwords of your databases.</footnote> to save the data source
-+          the passwords of your databases.</para></footnote> to save the data source
-           each time you want to create the connection.
-         </para>
-       </sect2>
-@@ -1971,9 +1970,9 @@
-           A normal query is a query that return data. This is made as a
-           <LINK LINKEND="libgda-GdaDataModel">data model</LINK>, analogous
-           to <EMPHASIS>GdaRecordset</EMPHASIS> in the old
--          version<footnote>Now you have a <LINK
-+          version<footnote><para>Now you have a <LINK
-           LINKEND="libgda-provider-recordset">GdaRecordset</LINK> class,
--          but it is not recommended.</footnote>.
-+          but it is not recommended.</para></footnote>.
-         </para>
-         <para>
-           As you can see in the following example, the function we use to
-@@ -1987,11 +1986,11 @@
-         </para>
-         <para>
-           As in the case of <LINK
--          INKEND="gda-connection-execute-non-query">non queries</LINK>, you
-+          LINKEND="gda-connection-execute-non-query">non queries</LINK>, you
-           must not use several semicolon-separated sentences, because you
--          have a special function to do this<footnote><LINK
-+          have a special function to do this<footnote><para><LINK
-           LINKEND="gda-connection-execute-command">gda_connection_execute_command
--          ()</LINK></footnote>, but it is not recommended.
-+          ()</LINK></para></footnote>, but it is not recommended.
-         </para>
-       </sect2>
-     </sect1>
-@@ -2037,6 +2036,7 @@
-           changes using &SQL;, so we consider data models not to be
-           modifiable.
-         </para>
-+      </sect2>
-       <sect2>
-         <title>Accessing directly to columns</title>
-         <para>
-@@ -2080,7 +2080,6 @@
-       The following sections describe the API available for &GDA; applications.
-     </para>
-     &libgda-init;
--    &libgda-batch;
-     &libgda-blob;
-     &libgda-client;
-     &libgda-command;
-@@ -2268,7 +2267,7 @@
- 		<entry>Tables</entry>
- 		<entry><parameter>GDA_CONNECTION_SCHEMA_TABLES</parameter></entry>
- 		<entry>"name" (name of table, optional)</entry>
--		<entry>name, owner, comments, SQL definition
-+		<entry>name, owner, comments, SQL definition</entry>
- 	      </row>
- 	      <row>
- 		<entry>Tables' parents</entry>
-@@ -2355,7 +2354,7 @@
- 	  <para>describe_column</para>
- 	  <para>
- 	    Returns information about a given column, in the form of
--	    a <xref linkend="GdaFieldAttributes">GdaFieldAttributes</xref>.
-+	    a <link linkend="GdaFieldAttributes">GdaFieldAttributes</link>.
- 	  </para>
- 	</listitem>
- 	<listitem>
-@@ -2363,10 +2362,10 @@
- 	  <para>
- 	    Retrieves a row from the data model. This function is very important
- 	    for the implementation of editable data models. What this function
--	    returns is a <xref linkend"GdaRow">GdaRow</xref>, which providers
--	    should uniquely identify (via <xref linkend="gda-row-set-id">gda_row_set_id</xref>).
-+	    returns is a <link linkend="GdaRow">GdaRow</link>, which providers
-+	    should uniquely identify (via <link linkend="gda-row-set-id">gda_row_set_id</link>).
- 	    This is needed so that later on, client applications can use the same
--	    <xref linkend="GdaRow">GdaRow</xref> returned by this method in
-+	    <link linkend="GdaRow">GdaRow</link> returned by this method in
- 	    the <function>update_row</function> and <function>remove_row</function>
- 	    methods.
- 	  </para>
-@@ -2387,9 +2386,9 @@
- 	  </para>
- 	  <para>
- 	    Before a data model can be edited, client applications must call the
--	    <xref linkend="gda-data-model-begin-edit">gda_data_model_begin_edit</xref>
-+	    <link linkend="gda-data-model-begin-edit">gda_data_model_begin_edit</link>
- 	    function, which emits the "begin_edit" signal on the
--	    <xref linkend="GdaDataModel">GdaDataModel</xref> class. So, providers
-+	    <link linkend="GdaDataModel">GdaDataModel</link> class. So, providers
- 	    should connect to this signal to be informed when the data model
- 	    starts being editing. In the callback connected to that signal,
- 	    it should start a transaction, for instance.
-@@ -2430,7 +2429,10 @@
- 	</listitem>
-       </itemizedlist>
-     </sect1>
--    &libgda-server-provider;
-+    <sect1 id="libgda-server-provider-details">
-+      <title>Details</title>
-+      &libgda-server-provider;
-+    </sect1>
-   </chapter>
- 
-   <chapter id="libgda-xql">
diff --git a/gnome-extra/libgda/files/libgda-1.0.4-firebird-provider.patch b/gnome-extra/libgda/files/libgda-1.0.4-firebird-provider.patch
deleted file mode 100644
index cfede126522a..000000000000
--- a/gnome-extra/libgda/files/libgda-1.0.4-firebird-provider.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- providers/firebird/gda-firebird-provider.c_old	2004-11-19 08:23:39.164945104 +0900
-+++ providers/firebird/gda-firebird-provider.c	2004-11-19 08:24:18.867909336 +0900
-@@ -346,6 +346,20 @@
- 	return model;
- }
- 
-+isc_tr_handle *
-+gda_firebird_command_get_transaction (GdaCommand *cmd)
-+{
-+	GdaTransaction *xaction;
-+	isc_tr_handle *itr;
-+
-+	xaction = gda_command_get_transaction (cmd);
-+	if (!GDA_IS_TRANSACTION (xaction))
-+		return NULL;
-+
-+	itr = g_object_get_data (G_OBJECT (xaction), TRANSACTION_DATA);
-+	return itr;
-+}
-+
- /* execute_command handler for the GdaFirebirdProvider class */
- static GList *
- gda_firebird_provider_execute_command (GdaServerProvider *provider,
-@@ -547,16 +561,3 @@
- 	gda_connection_add_error (cnc, error);
- }
- 
--isc_tr_handle *
--gda_firebird_command_get_transaction (GdaCommand *cmd)
--{
--	GdaTransaction *xaction;
--	isc_tr_handle *itr;
--
--	xaction = gda_command_get_transaction (cmd);
--	if (!GDA_IS_TRANSACTION (xaction))
--		return NULL;
--
--	itr = g_object_get_data (G_OBJECT (xaction), TRANSACTION_DATA);
--	return itr;
--}
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
deleted file mode 100644
index c917ffd17c09..000000000000
--- a/gnome-extra/libgda/files/libgda-1.0.4-freetds-0.6x.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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.2.96-r2.ebuild b/gnome-extra/libgda/libgda-0.2.96-r2.ebuild
deleted file mode 100644
index b161ac443ec2..000000000000
--- a/gnome-extra/libgda/libgda-0.2.96-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.19 2005/06/03 06:20:25 leonardop Exp $
-
-inherit eutils
-
-IUSE="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/gconf-1.1
-	 >=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*
-	 mysql? ( >=dev-db/mysql-3.23.26 )
-	 postgres? ( >=dev-db/postgresql-7.1 )
-	 odbc? ( >=dev-db/unixODBC-2.0.6 )"
-
-# ldap support is currently broken (this fixes bug #4019)
-#	 ldap? ( >=net-nds/openldap-1.2.11 )"
-# stroke@gentoo.org
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.2-r3
-	sys-apps/which"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	# Fix compilation issues. See bug #94768.
-	epatch ${FILESDIR}/${P}-gcc3.4.patch
-}
-
-src_compile() {
-
-	local myconf
-
-	if use mysql
-	then
-		myconf="--with-mysql=/usr"
-	fi
-
-#  	if use ldap
-#	then
-#    		myconf="$myconf --with-ldap=/usr"
-#  	fi
-#
-# LDAP support is currently broken
-
-	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
-
-	# 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.4.ebuild b/gnome-extra/libgda/libgda-1.0.4.ebuild
deleted file mode 100644
index c73741c10344..000000000000
--- a/gnome-extra/libgda/libgda-1.0.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.4.ebuild,v 1.12 2006/01/31 16:16:04 blubb Exp $
-
-inherit gnome2 eutils
-
-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="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-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 )
-	x86? ( firebird? ( dev-db/firebird ) )
-	freetds? ( >=dev-db/freetds-0.5 )
-	sqlite? ( =dev-db/sqlite-2* )
-	!ia64? ( 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
-	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
-	# firebird function reorder (#71708)
-	epatch ${FILESDIR}/${PN}-1.0.4-firebird-provider.patch
-}
-
-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
-
-}