gentoo resync : 28.04.2021

5 files changed, 3 insertions, 202 deletions

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 3f1d4e565540..55b867a256a6 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,9 +1,5 @@
 AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5
 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353
-AUX libgda-5.2.4-format-security.patch 1003 BLAKE2B 7b8727e080b0a82645a4f9cdbe718a814b22fd8939d613dc6100b85ce589cf1cd8760a1d515c8ffb7221ff83ce09abbc841ab6a05520c3a804c4eeefe1588359 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f
-AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a78b516e5b8ecb90f0d3d69b6b6daff7b30c2ec24842d6726804787d06e8b5858a75beb7c4b41d6cf4304d0f0f SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94
-DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
 DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231
-EBUILD libgda-5.2.8-r1.ebuild 4660 BLAKE2B aad027fbb20b3000fbde445391f5cbd477ac4846081715aab11bf6f8c471dc7271f2818df7ff535ed79af002de7d2f553be1f7a21cc45e7d153a36ff0cd2c30d SHA512 e917df80718a0c2f9d709b352927ef91351779e71e5e875c41f62c5e96f9bc14d4c9c629ffbe8c226804c7cd0e1e8b890f6d549e0e385b9a9b3c2443c72f3712
-EBUILD libgda-5.2.9.ebuild 4499 BLAKE2B 081d837b859aa8728da193b8541f064af823dc0fc38e5438970d796bbe3fd4a29617c83bb0e8f59ea15ba081e71c1b7f22ddae1d1b6f5d46ec74c2fb6a259ff2 SHA512 e5a4836bc3f7f1a19390537585f64b614826aed8ed257174af3186fd482420b73d248c40f8eca2cea8fbc4cb7451c108ed209233a90034b0111b58a146cd6fa2
+EBUILD libgda-5.2.9.ebuild 4491 BLAKE2B 7f839b0338fb7f54389028a7843283981771a299a3e7ba42f6febb27822eab833ef7f8c20d99c63245d7ea5512f8a0628172f2e0cb517e839b6a73f3d8b68d41 SHA512 bc3e067c7bb6d8cd7ee5942a290a25df67e23c0d086219a3b7a26f000b319ae700df3722410a802373e40db8ad810be257ad25ab5e0d2ada832a458d725217da
 MISC metadata.xml 682 BLAKE2B fe3f182ba64c3616542f5a03b2df9441f4eb020ab5a274907d53a04ae694c792b01b7262b1ea82162a89cf85428fe2f69c43b194775be932c379928f4e717985 SHA512 e4fc584c8234b923dffeb6af9968146cae4b319b49234be50d4aca144c326d786aaa82c17f330bab16a691036b2392acda0987c0f26993b1dc1a130e9aea3eeb
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
deleted file mode 100644
index 81c7804c512c..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Wed, 16 Apr 2014 14:59:50 +0200
-Subject: [PATCH] Markup message correction
-
----
- libgda-ui/demos/ddl_queries.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
-index a47630f..4b29377 100644
---- a/libgda-ui/demos/ddl_queries.c
-+++ b/libgda-ui/demos/ddl_queries.c
-@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data)
- 		else
- 			msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql);
- 
--		dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
--							  GTK_DIALOG_MODAL,
--							  msg_type, GTK_BUTTONS_CLOSE, msg);
-+		dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window),
-+					      GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL);
-+		gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg);
- 		g_free (sql);
- 		g_free (msg);
- 
--- 
-1.9.0
-
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
deleted file mode 100644
index f66fa8f95846..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgda-5.2.2/configure.orig	2014-05-17 14:58:33.206028742 +0200
-+++ libgda-5.2.2/configure	2014-05-17 14:58:45.937790443 +0200
-@@ -23200,6 +23259,11 @@
- 		    JTYPE="Sun JRE 1.7"
- 		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
- 		    ;;
-+                JRE1.8.*)
-+		    try_java=true
-+		    JTYPE="Sun JRE 1.8"
-+		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
-+		    ;;
-                 JREgcj-4*)
- 		    try_java=true
- 		    JTYPE="GCJ"
diff --git a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild b/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
deleted file mode 100644
index 082aba06ff1d..000000000000
--- a/gnome-extra/libgda/libgda-5.2.8-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="https://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 sourceview ssl vala"
-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"
-
-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:= )
-	ssl? ( dev-libs/openssl:0= )
-	>=dev-db/sqlite-3.10.2:3=
-	vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-# TODO: libgee shouldn't be needed at build with USE=-vala, but needs build system fixes - bug 674066
-DEPEND="${RDEPEND}
-	dev-libs/libgee:0.8
-	>=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
-}
-
-src_prepare() {
-	# Fix compilation with -Werror=format-security (from 'master')
-	eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	# They need python2
-	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
-
-	gnome2_src_prepare
-	java-pkg-opt-2_src_prepare
-	use vala && vala_src_prepare
-
-	# Support JRE 1.8 (from Fedora) - patches configure, so applied AFTER gnome2_src_prepare runs eautoreconf
-	eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
-}
-
-src_configure() {
-	# Upstream broken configure handling for UI library introspection and vala bindings if passing a choice with use_enable - https://gitlab.gnome.org/GNOME/libgda/issues/158
-	# But if we don't pass an explicit choice, it behaves as we need (only enable them if --enable-ui AND the appropriate --enable-introspection or --enable-vala)
-	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_with java java $JAVA_HOME)" \
-		$(use_enable json) \
-		$(use_with ldap) \
-		--with-ldap-libdir-name="$(get_libdir)" \
-		$(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)
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 0b8731174354..ac392e8d05d6 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 vala
+inherit db-use flag-o-matic gnome2 java-pkg-opt-2 vala
 
 DESCRIPTION="GNOME database access library"
 HOMEPAGE="https://www.gnome-db.org/"
@@ -22,7 +22,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	app-text/iso-codes