Drop useless USE=doc, it only regenerated documentation. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

8 files changed, 29 insertions, 304 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index d71cffdf58e3..edb0f8bfbf90 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.212 2012/10/28 15:55:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.213 2012/11/05 08:27:47 tetromino Exp $
+
+  05 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch,
+  -files/libgda-4.2.2-fix-build-order.patch, -libgda-4.2.11.ebuild,
+  -libgda-4.2.12.ebuild, libgda-4.2.13.ebuild, libgda-5.0.3-r1.ebuild:
+  Drop useless USE=doc, it only regenerated documentation. Update license. Drop
+  old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> libgda-4.2.13.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index ec8b93dddcfc..09a190018073 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f SHA512 8523c58a377f21f7cac9f5be7cef47b7564a834beea64d521122162bf71b8da2c8d83f7e4a4a5ca68ed2e979d068b131f1b59e54a0b28b63364a74b8023715b8 WHIRLPOOL f3f4dd417595896d81761c53170b82c529728c1d2a820e835dcd244d3713d8d29bffd599cf1b0f2b88c4805aca910f81e9e24130193fe9ed0b3ca6f3053e7d9f
-AUX libgda-4.2.2-fix-build-order.patch 738 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1 SHA512 cb047f9d0905a4807044ca3764ad42aab7fa3851a2e8056ba67e2e1d97184892ccbc9f3a169653e6307cf8900e20753132b21212947be3c3fea7004171e38c9a WHIRLPOOL 5a72935baf139754cef5af43335124f4c574794e60840562ebfdce7965d1846af165592658c688b46fb16e09049dbff3c3869aeceea366a851a451dd556a03bb
 AUX libgda-4.99.1-control-center-icon-collision.patch 2266 SHA256 dc52049ea4706fc8a8a91bc7c572abc275a312f7e0df15cf1b82c73ef8e4f63e SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5 WHIRLPOOL f766d52e6c9591b4a7040105f0765df63412da92e7aa60aa4921cedf2f05ba60a732d72f443358ab78735c9dd44e51ce8e12ca5c3892b9e077f04b0772412650
 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 SHA256 d89d44e62a1a483cd77f13c723f0541f39a71a5f0651197d3e25d1093567d78c SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353 WHIRLPOOL c4f2b570f5fb486a4f1a6d3575e0849a13c78fcc1d05d2b64d4cb15f0af83a54bb8d184ec14ce501ee7e7dcc10f4b3a6c32c1d458e312c13716bde7752ff71c6
 AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 SHA256 b9d20506fe89fd0219f3d737450bbba0a98e5b850cf152e570ca8a6a66740994 SHA512 7ece8431e4146963e2b3b0c0355e379b9060be809fa9a97e587f97d206d11ba475c94e6b2d3d4ff5d943baa3090b5ee33406d6a8949817cd151c0f2a35f4572d WHIRLPOOL f323df81c1aba82eb2390e58a85f4bae2b7906476449096da2fbc55b307d746384868554d37a21cd0003c3b5623eb18f34174c5ec645d3a7c2b5201a58ee595e
 AUX libgda-4.99.4-disable-broken-tests.patch 363 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c SHA512 748e26b7319ba07da1efba9c5350d0b7724aef0d940516252499474b479201fa8b726c9965c95812122cb3cda3937dc2bf96a203943cbc9a9fe5f3b45990c0f2 WHIRLPOOL 846cde3fc8c3db5bd9dc87e879cfb4599b7d0a99af7c2cbc5894946ee0fa09b24c979fa39ae4a7f094166b39a1fc8b7de0186a6179fefb438588dc7f9e38cd19
 AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d SHA512 773d69abaa3c13333e4dae2d5c3661053227e4e1ecfcc8a7fb27e6ba63a8f973ac0db559648c1cf89f975a82324b444dd65cb86429dc7f5255e11d605f05a85a WHIRLPOOL 64f05e45dc2a7cf96f7bae67ac60af6b6a6c19d4331b84126705eb033f7a16426936de9b6f087d225bb2e31adaebf52e223bc2869bf92507c4f309e3cd3f6da0
 AUX libgda-5.0.3-custom.vala 171 SHA256 28be89b84fdb22a38d7c0d9bb65e6d1a8ebfc3aa16eff424e26bdcfe95e2d0bf SHA512 5894e70dec948f1db4d85a03c6fad580e1f9cd411bcf6e424f536dc1b695841051b1f83782c249661cd5f1307b9cc772f58025d21b66f75637485feabe591ce2 WHIRLPOOL 3e8cbb33b45d7e57f0b611f35041e463fad7a9de56843afc515e14bbf5a7c05f1b4b743d445fb1b59a155f544790311b2223c3e05bbef0e2c23ccadd5e34c0a0
-DIST libgda-4.2.11.tar.xz 11253296 SHA256 2359ccea3870de1c0162689b225a2546f2f883d7c12d29a0885828cd3f5fe575 SHA512 64b46fc0a1cc52c7f30701e811b0f294a4887eed60ca76e448890f254cd1f383e305513c92b74db88cc125a200817f027c4136fba84a3cd5e84fe582ea984b8c WHIRLPOOL 24d80881edc6818262daf1ab2832380419106504740a980e6c573c71f2c9518b966ca1ee6646af265ed67bfa4f8c2fe544bd4f65295809de23918a498f54ecd1
-DIST libgda-4.2.12.tar.xz 11238088 SHA256 636c17d0a7380d77eb89c19426dc62580f900a86b9dd93cb0b03210ff77769f9 SHA512 22468f48fdf114660f884e1b55d388435ddca1f549413112fcff3e908a200e52957d5b2e161829f6fc528d8ecf28b8ff8508035b404d67736e625f5e272df8f9 WHIRLPOOL 9b1cee4a76b2682c964919edaa8ca1d10ae2b0381968821a18188d26a231393d616480aae26a79448d5cec3243fc50822e54f00dda78aa8c9c1f8df7ae3a6b9a
 DIST libgda-4.2.13.tar.xz 11247816 SHA256 25b75951f8f38fd58a403389566a0aae2f83b39d4225bc3acf5f2d68895ab4c3 SHA512 54506b65ac7127ab67168f8169aba4d366ea1c7f9e5401c27c00a7eee7ea5ce33821faef0c7f2d397455869bd98025990b527cb7ad8cca1a88d32bd699d44f22 WHIRLPOOL c958ecb735b5ba84236bd80f20f39017dca35911452ad95c65c82e4ee40eadecc683d78f7d459f65d576d520e309f19ceddf0da3054696d83261ebd141db13b8
 DIST libgda-5.0.3.tar.xz 11623340 SHA256 82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc SHA512 ee71b3be95f735aeb536b5af5c873e1175e934f930657eca567d79f12cf471d0f5714cd749e9cde483efd868db00e83fad6c1698da0a004d8653fc544f361b55 WHIRLPOOL c321c4344d50965927951050ee1e5c55205e23cc286b627b5a5fddd2bd7756fcc48b8852078b2b092f315113304ec8734d2bd048f0bbde24ad93f890e1f4ef10
-EBUILD libgda-4.2.11.ebuild 3248 SHA256 01adcc0edd3f61bfea57fd7d1d6b188ffeba691d4f80359f22834222e037917a SHA512 89cee13aa02ba0a384c7bda0008f362e45a48c6fd8dc5d22281bb1f6b77c981f7f166a63806aca462a936a1f304ea15657836dd4cbcaf133cb8fc7e885441a95 WHIRLPOOL 2e12fdd9fced6aacd935e625a86f9d2d58c894725bd1f5b96a75d7242d22967e6a1cee65af3b81a247cbe916b2344bcc66193601c893a70aafac72a3de2196af
-EBUILD libgda-4.2.12.ebuild 3212 SHA256 2f242ad0481d6d87ea97e13ec5790fd72c68953c2938bf19dce8d1ac3cf97db2 SHA512 73230d8a563492d9787c68f67a4dcb7d959f639b3ce70a18ca647f15f34bed5ed088552a8fb9b31626af7257e30fc3c3e6fecbeabd6997be084e381b43ee2071 WHIRLPOOL 5c3386630ad4bc3083dffcfd7079aa4bab8d8239df0f7b2f2fd5e9eed3162eecd06d794db29304a5d4fd6de8cd0c3c0300bad89f0e949485394d2d9266e06740
-EBUILD libgda-4.2.13.ebuild 3114 SHA256 38a6c7e0e35f9103e4bd637121e5261bf76068f52388cf5b959a667bef9354b1 SHA512 c3912713a6e7764f826c1f4c0d76bbb66bd61a0cdf21649d32a76dd1218b512a302474a838002297635770e4ca751cde749e6b196804590430128a090bfa3702 WHIRLPOOL 658d4c5c7c95d06806d39db0278caa20704f8dca319eb695c1ca0d36287fbdd85a9d9a88e723b4007cb4e10b731a126f74a7ac667e4831009922eb47b8377a59
-EBUILD libgda-5.0.3-r1.ebuild 4718 SHA256 e35e089989f635e9d3ba4bcddeed8161ec33bc3b52c56f20efda4acc1b3931ff SHA512 d0b7c3c98f11e5ece73a9a08cfa4fdaba5fa7a4ebae75d9e2fd826f3384edca8fd66c920ed8c6bb51faa447893d598c5a998ab08affc74cc5ff9019e8fa4dda6 WHIRLPOOL 10d9ddc2d9717356a9a57333c7e324d87a7d6e1809b6863203b8621eb657298791e838d1bb40da211aaddea6609af651470e10745e4acb34d816ab249011afb5
-MISC ChangeLog 32674 SHA256 bfe2b7c5bca8b2ec265b4fa7837f46eddc599ca7dbe072fc2f7943203a8af941 SHA512 1c4d322294a7df64d3ea804fcbda4e55835c76603c0aa6d931d2ca36da262b0a43cc81b725550b97f88c469b29b8e33604f3f76874860dd38e71d328f74a0aac WHIRLPOOL 12212f7eb1d3580ccae777754b508fd75af834ecc622d7bfb8dd72d53621e4126e0ce594b2fb1e900fdbde646d37a06fbc3e217395f6d52b25181d824a963335
+EBUILD libgda-4.2.13.ebuild 3083 SHA256 dc58df91043858023f3756038634878b3be2bd26099c30eb31c3ffc80be589b8 SHA512 c478a2c4712c21247959f239e13fd678f2edf2bc0deae40d70c2231c76da36c7bbc039c349aa39e25d6626563a3ab8183c597d8f804fd6962d6b67a8a78fcf20 WHIRLPOOL f8239e1964b24be3f3e7c5e912f48c19baf70788347daa79971081185c023bc3fd2b111387b16c749dc68e2992b68b039a5db280f1b6db23aefae5e966c951d2
+EBUILD libgda-5.0.3-r1.ebuild 4708 SHA256 183e3fabbae4dd5f194028b5b949a806e7141ecaacfd9bed30d20204ae144bdf SHA512 a8a357a437276530b18ea65714452eb54e1546613f2892e803f5b47f2feb64576d214b53fe54fe38722ac5b0e57b877234553defbfaafd27e91e9291f36660d8 WHIRLPOOL 36b851a205564b981162a535d8c9c172cab7e32e0ac12824de93613aa7d0225e08d8509d7ca7fcd753800c6a64c6c61de1c84e4c39c11c5283861b7306e2f458
+MISC ChangeLog 33033 SHA256 e2d2a3749e20fa95140e2be31a6ca9cc4c9673136e3ab4db209f81707a81b882 SHA512 6359e937879e1c16a7b5bbdbb809004aa1c64ec79802b8df44172e5800124635d3b717db5afadef02eec2c87a1d9e84405af7ccd6371d81ffbf209556537cd4b WHIRLPOOL 4d1f5460daa326fb20a27ce7b56b36a6be11e3eaa0a297444922c21c947418db3cb6151b85bbb6cbb2ea83dcd56511b906a042d25b9cbfab2f051de5475afbc6
 MISC metadata.xml 684 SHA256 342605fbb0210a2aca6933387fc7aaf6644b286f83008cf79bae65da35dcfed7 SHA512 a21bd1aa7e601cc37d029e921b77a767bff1d2bedf4c05256ad740eea3f1601212ff6d52699aed23abd11859d2d86cc29030f86720522dde1f08efe101af7b06 WHIRLPOOL 8ded010d4108f4466624a77d9f142a3f98c3ea73b21b03d5def5fb6403d3f54c74af6782b88f97bec9242be22a4bb4fc530c1b45fe6af50c7b86380967f6a9b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNVV4ACgkQuQc30/atMkB0YACgnBxt2QW9mMZ5gZ3sjl78lLSc
-7AoAn2zeTI+P80ibqMRO6shXIJIfwM/h
-=iBT/
+iQEcBAEBCAAGBQJQl3iEAAoJEJ0WA1zPCt1h+OgIALAcnUWfb6G01J4790EZUZcC
+9oLUPet0n0OVbRx0fsvTJAQD6yRycyBnP0wkuni/d5KeZIQ+VJuWXbQVt3H+Qsdk
+BoAtnFnPP53mq+eUSSlXpVVRNGDhPIZNZRlLOOd5gSTwANRosgRAP8ty2MysQp6f
+KZIc6th7hOU9hIUI+Gh5Yaf5StJQjzrZnyRLwo6boub4rIxXxNeEeKtQ4XJZsn0p
+DyuXnEumQ7+j3rxfL6/tKJFw6v2kuWpz4OsGUwyaWz7aTalKg6AbKCo8gc9s5b6x
+m+pkd701Xr1k7r3wX6Rsvarqq1xbfPt7s+2hGDLfL9RR0vS8R5gtG8pBGLUQ8iU=
+=sBHp
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
deleted file mode 100644
index 5e7dd6147287..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 29 Sep 2010 23:53:54 +0200
-Subject: [PATCH] Fix missing include in keyword_hash generator
-
----
- libgda/sqlite/mkkeywordhash.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c
-index dc6ce89..28f4f83 100644
---- a/libgda/sqlite/mkkeywordhash.c
-+++ b/libgda/sqlite/mkkeywordhash.c
-@@ -370,6 +370,10 @@ main (int argc, char **argv)
- 	}
- 
- 	/* Begin generating code */
-+	printf("#include <stdio.h>\n");
-+	printf("#include <string.h>\n");
-+	printf("#include <glib.h>\n");
-+
- 	printf("/* Hash score: %d */\n", bestCount);
- 	printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : "");
- 	printf("  /* zText[] encodes %d bytes of keywords in %d bytes */\n",
--- 
-1.7.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
deleted file mode 100644
index ac310890cdb0..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.2-fix-build-order.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgda/sqlite/Makefile.am.orig	2010-12-04 11:33:12.000000000 +0100
-+++ libgda/sqlite/Makefile.am	2010-12-04 11:34:50.000000000 +0100
-@@ -58,9 +58,9 @@
- 	gda-sqlite.h \
- 	keywords_hash.h \
- 	gda-symbols-util.h \
--	gda-symbols-util.c
--
--BUILT_SOURCES = xml_embedded.h keywords_hash.c
-+	gda-symbols-util.c \
-+	xml_embedded.h \
-+	keywords_hash.c
- 
- libgda_sqlite_la_SOURCES = $(sqlitesources)
- libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
-@@ -86,3 +86,4 @@
- EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
- 
- CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
-+BUILT_SOURCES = xml_embedded.h keywords_hash.c
diff --git a/gnome-extra/libgda/libgda-4.2.11.ebuild b/gnome-extra/libgda/libgda-4.2.11.ebuild
deleted file mode 100644
index 9ab19d344603..000000000000
--- a/gnome-extra/libgda/libgda-4.2.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.11.ebuild,v 1.7 2012/05/05 06:25:23 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
-
-SLOT="4"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	dev-libs/libunique:1
-	sys-libs/readline
-	sys-libs/ncurses
-	>=dev-db/sqlite-3.6.22:3
-	berkdb?	( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
-		canvas? ( x11-libs/goocanvas:0 )
-		sourceview? ( x11-libs/gtksourceview:2.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	http?	( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?	( dev-libs/json-glib )
-	ldap?	( net-nds/openldap )
-	mdb?	( >app-office/mdbtools-0.5 )
-	mysql?	( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?	( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	# Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		--disable-vala
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(use_enable introspection gda-gi)
-		$(use_enable introspection gdaui-gi)
-		$(use_with java java $JAVA_HOME)
-		$(use_enable json)
-		$(use_with ldap)
-		$(use_with mdb mdb /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)"
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-
-	export XDG_DATA_HOME="${T}/.local"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix compilation failure of keyword_hash.c, upstream #630959
-	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-}
diff --git a/gnome-extra/libgda/libgda-4.2.12.ebuild b/gnome-extra/libgda/libgda-4.2.12.ebuild
deleted file mode 100644
index 32d3213b8835..000000000000
--- a/gnome-extra/libgda/libgda-4.2.12.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.12.ebuild,v 1.7 2012/07/15 19:02:25 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
-
-SLOT="4"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	dev-libs/libunique:1
-	sys-libs/readline
-	sys-libs/ncurses
-	>=dev-db/sqlite-3.6.22:3
-	berkdb?	( sys-libs/db )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
-		canvas? ( x11-libs/goocanvas:0 )
-		sourceview? ( x11-libs/gtksourceview:2.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	http?	( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-	json?	( dev-libs/json-glib )
-	ldap?	( net-nds/openldap )
-	mdb?	( >app-office/mdbtools-0.5 )
-	mysql?	( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ssl?	( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	# Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi
-	G2CONF="${G2CONF}
-		--with-unique
-		--disable-scrollkeeper
-		--disable-static
-		--enable-system-sqlite
-		--disable-vala
-		$(use_with berkdb bdb /usr)
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with http libsoup)
-		$(use_enable introspection)
-		$(use_enable introspection gda-gi)
-		$(use_enable introspection gdaui-gi)
-		$(use_with java java $JAVA_HOME)
-		$(use_enable json)
-		$(use_with ldap)
-		$(use_with mdb mdb /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_enable ssl crypto)"
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--disable-default-binary"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix compilation failure of keyword_hash.c, upstream #630959
-	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-}
diff --git a/gnome-extra/libgda/libgda-4.2.13.ebuild b/gnome-extra/libgda/libgda-4.2.13.ebuild
index f043b0ef3086..f350c65c299a 100644
--- a/gnome-extra/libgda/libgda-4.2.13.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.13.ebuild,v 1.8 2012/10/28 15:55:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.13.ebuild,v 1.9 2012/11/05 08:27:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -10,9 +10,9 @@ inherit db-use flag-o-matic gnome2 java-pkg-opt-2
 
 DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
+IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
 
 SLOT="4"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
@@ -48,8 +48,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.35.5
 	>=app-text/gnome-doc-utils-0.9
-	>=dev-util/gtk-doc-am-1
-	doc? ( >=dev-util/gtk-doc-1 )"
+	>=dev-util/gtk-doc-am-1"
 
 # Tests are not really good
 RESTRICT="test"
diff --git a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
index e192137bd2f2..5253009a8b7a 100644
--- a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.8 2012/07/15 19:02:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.9 2012/11/05 08:27:47 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -11,15 +11,15 @@ inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
 
 DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala
+IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl" # vala
 SLOT="5"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
+	>=dev-libs/glib-2.28:2
 	>=dev-libs/libxml2-2
 	dev-libs/libxslt
 	sys-libs/readline
@@ -44,10 +44,10 @@ RDEPEND="
 	>=dev-db/sqlite-3.6.22:3"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
 	>=app-text/gnome-doc-utils-0.9
-	doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
 	java? ( virtual/jdk:1.6 )"
 #	vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )