Version bump to a 5.2 pre-release, which is needed for some gnome-3.6 applications. Update description. Switch to global introspection flag.

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

6 files changed, 168 insertions, 18 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index edb0f8bfbf90..27dcc164f75e 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,14 @@
 # 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.213 2012/11/05 08:27:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.214 2012/12/17 08:01:40 tetromino Exp $
+
+*libgda-5.1.1-r1 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgda-4.2.13.ebuild, libgda-5.0.3-r1.ebuild, +libgda-5.1.1-r1.ebuild,
+  metadata.xml:
+  Version bump to a 5.2 pre-release, which is needed for some gnome-3.6
+  applications. Update description. Switch to global introspection flag.
 
   05 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch,
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 09a190018073..020a9216e034 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -9,18 +9,20 @@ AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 SHA256 81c6089b0899ef43428
 AUX libgda-5.0.3-custom.vala 171 SHA256 28be89b84fdb22a38d7c0d9bb65e6d1a8ebfc3aa16eff424e26bdcfe95e2d0bf SHA512 5894e70dec948f1db4d85a03c6fad580e1f9cd411bcf6e424f536dc1b695841051b1f83782c249661cd5f1307b9cc772f58025d21b66f75637485feabe591ce2 WHIRLPOOL 3e8cbb33b45d7e57f0b611f35041e463fad7a9de56843afc515e14bbf5a7c05f1b4b743d445fb1b59a155f544790311b2223c3e05bbef0e2c23ccadd5e34c0a0
 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.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
+DIST libgda-5.1.1.tar.xz 11848808 SHA256 41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1 SHA512 db699a07e8bd541baaf425e76e8e06f252ed4714ae51d8f1b95c644357ba3084dcf93cd0b784fa4165a0a817420012131bc6352347b8842f8b95adf5fcac8c5a WHIRLPOOL bc9f02b512a98268a01b1e2586213b02a95c8bee6fb5da039289d8130acb50dd3c467aa239b2cf5f7a37708546978c1731caa7af5c9d06ba04cb3e732aa734d4
+EBUILD libgda-4.2.13.ebuild 3084 SHA256 0c62b2eb9a28bd9171b640d4822543a8e3b12b3c86e95eda16b66b7ff49876fb SHA512 f52006e896e7b5cf0365091bd360db2b46072eef90c0e8df6edea3bcafc3e458c78270529c7b916a2c5a01efb314aef04889866756810abfe3b6a63a596b569a WHIRLPOOL 2ba71cbc8c746bd95214d31503fcf3ac7badd7a9be2faf9d3fa58665f9604ce205433890e3dc837368ba43af4a46d4068492c813f783813de816a0c5268cdbbb
+EBUILD libgda-5.0.3-r1.ebuild 4709 SHA256 902e25377accf9bb7e66467789a09f1be725a1fb4e00a0650514aa86730de0d8 SHA512 3be584cf6e950c273de9a63dfeea74f535dedf4a1da94bf8b609043e26682da70cf2e974fc780d70463acb130d4304d05bdeadbc20d411aaadfd980a60a18c29 WHIRLPOOL 7bc9d59494af35cd63f97735ac29ea9b60b65d3416fb3fd92df2b581efed652461326f54227430d4df54674557caf4397646d9e55c477d781aaa3b0d042200d8
+EBUILD libgda-5.1.1-r1.ebuild 4273 SHA256 bd7268d9e9bad443032ea60bfc3f7d6cec36f91bb6c9485ffa5220239fc075dd SHA512 770bdc55792d7e4e9d0cb3223ab8fca4f18970a9ad964b3bff7f2aad6f96663b161e0cea1dc8f2ca82ad6c5a91fce1cb1dadeb45472ba85ab0107fb46a9819f5 WHIRLPOOL b0e2cdc882c1c2a5a18e090b5fd5e3838fb197bfa0b33b7a4546d6c4e75a7e0aab41f2e412d1d4fe0af5dbcab852f46e75ba0d05eacafc9f5aff2e85fd00ade4
+MISC ChangeLog 33359 SHA256 bb3c61c3f78fab0ca32da21f4864f7c1a74b56812a870a047f3f4c4bc1c830c5 SHA512 e904173ed0ca9f48fe2e2d767044c2d8c166e035a2e222d429806ad7a8557ff65f211c2c3b727deb7ae5d2fbe8dab6368ed862ac7c25f0da4ecb3030a8988c16 WHIRLPOOL 36d601635b588c1fd53b17bb20b76840fabf3ec673a7d9c2848935799e8e40468ac716224eb42576fe04272730afda502c84d0a754096416efb0b615ca48a3e5
+MISC metadata.xml 659 SHA256 262bbfb08128fa0e336b652b9cf3dad63aae2a831ff2b28cc3ae6c7e0fa2dd94 SHA512 97763c60e6531b41f8d12886bed66c009c175ce90c4ee77faee17310ddb3541f536262836d11d4c81e8e517f58deb945baae749b548e8be92e8a45b414162cf6 WHIRLPOOL 59a375bed494d6edfca039fb11d06ee7ef70202d170809763dfb82a6c02fb9c96edcd0fc2ae33d2f4fbafc14e844f7bee1fd75be008b0bc5fa07894b2a427248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQl3iEAAoJEJ0WA1zPCt1h+OgIALAcnUWfb6G01J4790EZUZcC
-9oLUPet0n0OVbRx0fsvTJAQD6yRycyBnP0wkuni/d5KeZIQ+VJuWXbQVt3H+Qsdk
-BoAtnFnPP53mq+eUSSlXpVVRNGDhPIZNZRlLOOd5gSTwANRosgRAP8ty2MysQp6f
-KZIc6th7hOU9hIUI+Gh5Yaf5StJQjzrZnyRLwo6boub4rIxXxNeEeKtQ4XJZsn0p
-DyuXnEumQ7+j3rxfL6/tKJFw6v2kuWpz4OsGUwyaWz7aTalKg6AbKCo8gc9s5b6x
-m+pkd701Xr1k7r3wX6Rsvarqq1xbfPt7s+2hGDLfL9RR0vS8R5gtG8pBGLUQ8iU=
-=sBHp
+iQEcBAEBCAAGBQJQztFmAAoJEJ0WA1zPCt1h6RMIAJ3ur15exLNprcmBCgSe3QdQ
+ODyVm4t7dPo3PVVoBuDJM2vLFdVvQ+Nc/Kq9hxelY/1Vjylv9rgDMWvav+moOpw+
+ObmRwlaNbVmh8KaAqn4RpermFJ8O81ruERqiqLdiLRwksDSEmoXobRlmZyMtvNEO
+YQ+QPlQ9/gL9GugKduq+NeFIBXNbHlKCWjD8mPBd3kAMJ6eYkPBoE5dK1kuAt1rK
+6+9tM/iNv9U7HzJshD670/+1VKpxCIADjCJU7vL4jjyCNL72y0HfZiEcurkJzZhB
+f5qDpyz/eUevhza98m5lmnenWH1PPz+/6+qHNOCja61O3ejIHSAj5mrYczIH/R0=
+=dp1V
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-4.2.13.ebuild b/gnome-extra/libgda/libgda-4.2.13.ebuild
index f350c65c299a..08a696f4ff47 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.9 2012/11/05 08:27:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.13.ebuild,v 1.10 2012/12/17 08:01:40 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 
 inherit db-use flag-o-matic gnome2 java-pkg-opt-2
 
-DESCRIPTION="Gnome Database Access Library"
+DESCRIPTION="GNOME database access library"
 HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2+ LGPL-2+"
 
diff --git a/gnome-extra/libgda/libgda-5.0.3-r1.ebuild b/gnome-extra/libgda/libgda-5.0.3-r1.ebuild
index 5253009a8b7a..e1074b4fb4e0 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.9 2012/11/05 08:27:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3-r1.ebuild,v 1.10 2012/12/17 08:01:41 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2"
 
 inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
 
-DESCRIPTION="Gnome Database Access Library"
+DESCRIPTION="GNOME database access library"
 HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2+ LGPL-2+"
 
diff --git a/gnome-extra/libgda/libgda-5.1.1-r1.ebuild b/gnome-extra/libgda/libgda-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..7c9f2b05451b
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.1.1-r1.ebuild
@@ -0,0 +1,141 @@
+# 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.1.1-r1.ebuild,v 1.1 2012/12/17 08:01:41 tetromino Exp $
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+#VALA_MIN_API_VERSION="0.16"
+#VALA_MAX_API_VERSION="0.16" # configure explicitly checks for 0.16
+#VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 # vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb bindist canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl" # vala
+REQUIRED_USE="canvas? ( gtk )
+	firebird? ( !bindist )
+	graphviz? ( gtk )
+	sourceview? ( gtk )"
+# firebird license is not GPL compatible
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	sys-libs/readline:=
+	sys-libs/ncurses:=
+	berkdb?   ( sys-libs/db )
+	!bindist? ( firebird? ( dev-db/firebird ) )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0= )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	gnome-keyring? ( app-crypt/libsecret )
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+	json?     ( dev-libs/json-glib )
+	ldap?     ( net-nds/openldap:= )
+	mdb?      ( >app-office/mdbtools-0.5:= )
+	mysql?    ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql-base:= )
+	reports? (
+		${PYTHON_DEPS}
+		dev-java/fop
+		dev-python/reportlab )
+	ssl?      ( dev-libs/openssl:= )
+	>=dev-db/sqlite-3.6.22:3=
+"
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.9
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	java? ( virtual/jdk:1.6 )"
+#	vala? ( $(vala_depend) )
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+RESTRICT="test"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-static
+		--enable-system-sqlite
+		$(use_with berkdb bdb /usr)
+		$(use_with canvas goocanvas)
+		$(use_with firebird firebird /usr)
+		$(use_with gnome-keyring)
+		$(use_with graphviz)
+		$(use_with gtk ui)
+		$(use_with http libsoup)
+		$(use_enable introspection)
+		$(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)
+		$(use_with sourceview gtksourceview)
+		--disable-default-binary
+		--disable-vala"
+	# vala bindings fail to build
+
+	use berkdb && append-cppflags "-I$(db_includedir)"
+	use oci8 || G2CONF="${G2CONF} --without-oracle"
+
+	use reports ||
+		sed -e '/SUBDIRS =/ s/trml2html//' \
+			-e '/SUBDIRS =/ s/trml2pdf//' \
+			-i libgda-report/RML/Makefile.{am,in} || die
+
+	# Prevent file collisions with libgda:4
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+	# Move files with mv (since epatch can't handle rename diffs) and
+	# update pre-generated gtk-doc files (for non-git versions of libgda)
+	local f
+	for f in tools/browser/doc/gda-browser* ; do
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+			-i ${f} || die "sed ${f} failed"
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in control-center/data/*_gda-control-center.png ; do
+		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+			die "mv ${f} failed"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+	java-pkg-opt-2_src_prepare
+	# use vala && vala_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	if use reports; then
+		for t in trml2{html,pdf}; do
+			python_scriptinto /usr/share/libgda-5.0/gda_${t}
+			python_doscript libgda-report/RML/${t}/${t}.py
+		done
+	fi
+}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 0dccce1fcd47..a420d4f99c6b 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -5,11 +5,10 @@
 <use>
 	<flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
 	<flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
 	<flag name="json">Enable support for JSON format</flag>
 	<flag name="mdb">Enable support for Microsoft Access database using 
 		<pkg>app-office/mdbtools</pkg></flag>
+	<flag name="reports">Install tools for generating graphical reports</flag>
 	<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
 </use>
 </pkgmetadata>