3 files changed, 186 insertions, 3 deletions
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 99a9b294cd92..7915b020bfd0 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -6,5 +6,6 @@ AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc895240
 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
 EBUILD libgda-5.2.4-r2.ebuild 4949 BLAKE2B 554ec6cc79bb402d73d9cc86c59a16f49d235388abd83ab085a77f75dd4f6ca9b99461220e24436059a5e0add9bdca99a9ba37c407229ee6baf43c47780cde30 SHA512 c59cbf63e1f5f8256a2b54bf3b31eebab3ae05fc90e24f7519ec9e3dc76c3380779a23c0c3501a2f2880b7972528f0948d49d53738976043a6b6754a07a6c184
-EBUILD libgda-5.2.8.ebuild 5064 BLAKE2B 49382d9e5de106d987193134ea65aaa03cb9b6fae17d1b85be929111d8066e9249cbf0e4bbebcac125f3903f4e938c9f34e4234024cf8981ad4475f1e158fb81 SHA512 0424e4bccac3f59bfbef3953cac7240954987fb99c53dc8fe991b06e16fc10805c29ed215ba702ec70d59c7c4dd63b7631502ef6f41f41f8b5488f56f17e8543
+EBUILD libgda-5.2.4-r3.ebuild 4963 BLAKE2B dbbc3c6d0b3b711d6f5e60c5a08f37927712074a6661151f2334b0f608d428f1453fff11294e2745d917c6f3be7d0cea631bc0a2f7980c2bc915a26ae0cee6fc SHA512 5fb2610e1645a6f7179fa900349f03fb4bbed2144c7c6a1250b9970f2f4e0d1de432ec73973321489d12b43068669a7a3ddf45f38cbbaba8af25dfcad9f97329
+EBUILD libgda-5.2.8-r1.ebuild 5076 BLAKE2B b68c1ec7999643711241bb045343cd5dbfc3a473fb7904f632ea7ccfb1a703ab1b569e084e95ed2de744fc19b672a1fc251a23e946468245cc44725d8eff5f1f SHA512 6057b4628285f3ac518a25641b47f211b06c6c3ec797a245ca417631cbb43dbb3f2975bb6f198c3596172640817d0c06dd769e1319ea047c59ee6ea9a4fb1df4
 MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/libgda-5.2.4-r3.ebuild b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
new file mode 100644
index 000000000000..17ea3fb66a19
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4-r3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+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 canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
+REQUIRED_USE="
+	reports? ( ${PYTHON_REQUIRED_USE} )
+	canvas? ( gtk )
+	graphviz? ( gtk )
+	sourceview? ( gtk )
+	vala? ( introspection )
+"
+# 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:0=
+	sys-libs/ncurses:0=
+	berkdb? ( sys-libs/db:* )
+	firebird? ( dev-db/firebird )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0= )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	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? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	reports? (
+		${PYTHON_DEPS}
+		dev-java/fop
+		dev-python/reportlab )
+	ssl? ( <dev-libs/openssl-1.1:0= )
+	>=dev-db/sqlite-3.6.22:3=
+	vala? ( dev-libs/libgee:0.8 )
+"
+
+# java dep shouldn't rely on slots, bug #450004
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.9
+	app-text/yelp-tools
+	dev-util/glib-utils
+	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
+# firebird support bindist-restricted because it is not GPL compatible
+RESTRICT="
+	test
+	firebird? ( bindist )
+"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix compilation with -Werror=format-security (from 'master')
+	eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+	# Support JRE 1.8 (from Fedora)
+	eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
+
+	# Fix vala test,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=761424
+	eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
+
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	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
+	eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	eapply "${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_configure() {
+	local myconf=( )
+	if use introspection ; then
+		myconf+=( $(use_enable gtk gdaui-gi) )
+	else
+		myconf+=( --disable-gdaui-gi )
+	fi
+	if use vala ; then
+		myconf+=( $(use_enable gtk gdaui-vala) )
+	else
+		myconf+=( --disable-gdaui-vala )
+	fi
+
+	gnome2_src_configure \
+		--with-help \
+		--disable-default-binary \
+		--disable-static \
+		--enable-system-sqlite \
+		$(use_with berkdb bdb /usr) \
+		$(use_with canvas goocanvas) \
+		$(use_enable debug) \
+		$(use_with firebird firebird /usr) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with graphviz) \
+		$(use_with gtk ui) \
+		$(use_with http libsoup) \
+		$(use_enable introspection) \
+		$(use_enable introspection gda-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 oci8 oracle) \
+		$(use_with postgres postgres /usr) \
+		$(use_enable ssl crypto) \
+		$(use_with sourceview gtksourceview) \
+		$(use_enable vala) \
+		$(use_enable vala vala-extensions) \
+		${myconf[@]}
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	java-pkg-opt-2_pkg_preinst
+}
+
+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/libgda-5.2.8.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
index 6570bb39df71..afb0f66db4ce 100644
--- a/gnome-extra/libgda/libgda-5.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,7 @@ RDEPEND="
 	json? ( dev-libs/json-glib )
 	ldap? ( net-nds/openldap:= )
 	mdb? ( >app-office/mdbtools-0.5:= )
-	mysql? ( virtual/mysql:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:= )
 	reports? (
 		${PYTHON_DEPS}