gentoo resync : 21.06.2020

15 files changed, 175 insertions, 132 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7977f16cf4f8..d21461745efc 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index be61109f21b7..f1ba503a1608 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,3 +1,3 @@
 DIST glabels-3.4.1.tar.xz 3467992 BLAKE2B 87da586052995a61b1031c5598a21142e525851c5d94b2870e6f62b0d2a6227f44b55ce1aaf6a4c52bd6bb81d9005fde0e58befe26834acb37f4b6728a378cdd SHA512 d3cb98a3b8e33aaace5773a5715ebe45a28a046dd89443b97126078261954fe4713abdc70c38d0d2b932a37eef02ea266726fd28433153bb5aef33c5d5f8175f
-EBUILD glabels-3.4.1.ebuild 863 BLAKE2B 9f46a001f8f704074e8072b0db7738a1f1081891e9493db7aff586721e415ceaf848541ddb50841a9f65cc2111a83e107e74ccf3e7f0c8d5331fb4fe2da53a4c SHA512 250a0fe382f619c4b45f02daa82bf3bccca2e8deab06281bf1b0bdf100e7d3675995abc2c9379f648def6fb1b5ddab6696aa60628f43ea9e9c13c70805833318
+EBUILD glabels-3.4.1.ebuild 860 BLAKE2B 629dea57fe50daff1c51c6f9bc6f4f80cfe1b2caf25426cb39b61d5995bbca66c2477a11addafb36527beb0db3c8dc94c9bdd321e3309cf6b4a08c68e700bb7a SHA512 35d3e9013e3bb87ddef2c04392ec445913e411658fcee3efa3a2c6986388c323dbb13506eb19966b014c9a6f15ede6a1a26a35b52ccefa6bc2d9e55276059c4c
 MISC metadata.xml 628 BLAKE2B afeffa1b3692fcee50a89de00d3cd5c205b0a75516d8c92fbbc0270de1cc76f022043a6a4f59648f61dbd3a058abc964ca3a24c3f791755cc811999575026401 SHA512 d82beb6241d972fab78633ecab172c67145c6bab44cfaa458dcfaebae65f00f5200f8233e97d97b4cb2a555aa92a1bb2669726d93b0af1744408d7235c6c1e3e
diff --git a/app-office/glabels/glabels-3.4.1.ebuild b/app-office/glabels/glabels-3.4.1.ebuild
index 450de3ef95d1..23065b3be108 100644
--- a/app-office/glabels/glabels-3.4.1.ebuild
+++ b/app-office/glabels/glabels-3.4.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils gnome2
 
 DESCRIPTION="Program for creating labels and business cards"
-HOMEPAGE="http://www.glabels.org/"
+HOMEPAGE="https://glabels.org/"
 
 LICENSE="GPL-3+ LGPL-3+ CC-BY-SA-3.0 MIT"
 SLOT="0"
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index bb6c8676c592..666ca0c54866 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,5 +1,4 @@
-AUX gtg-0.3.1-desktop.patch 334 BLAKE2B 639f2eb22b67def21485d2837ef9ed03860dd6595fc69b72cb07cfb62c6132949cc298e0d72030ddbcd0990cc2b237e1db8b022f3ec26af5a3fa81a5d5b5e371 SHA512 3d3b0b1c46fe352183d7a2d5b9ee65db995a1fe8bf10e35033a7c51261700cbfb8341371553eb95e11a8d502b70caeb588a41e8377014e85f30d20df97ee8449
-AUX gtg-0.3.1-locales.patch 584 BLAKE2B a6a7e8797a0e082e77545101455ebf70b40bc72f706471f85c4ba9b0a0d5293c61bd6afdd56d478b554eca882bf309db73a5e8f9c02f9eec912022fdf710a569 SHA512 4a62d55e0bdf4cb0bfaa3edcbf7f1573645c2d5505ec98c17529437545bd5f18374a561063d5e5d163bea0064d9daa9f82a29ee2f8ebeb00833c678d47446142
-DIST gtg-0.3.1.tar.gz 7902244 BLAKE2B 843c0df194450e9fcc718f94b83973209184ab041f42751ff1a32275c839b5e0bc80fe7aa903d91ce44d5999b496cd50218d8656c060d70fcdd3f3561f4eacb0 SHA512 7d342971cd98fbe5b84ec2f2b4c918dd668d00699b6f0afb76b143acdbe79807525bcc02d2e189769c24de5a8b33d7eef4ce242e3c091fe09505daac55158f12
-EBUILD gtg-0.3.1.ebuild 1929 BLAKE2B 6cf7deef0b847b541cc38e20a38f60f083d7bb73213e02f2a9a5f0db4cc06cdb690f9e654a07c7e4d806d15fb490ed420026a013bba301844dc2a6ae1dc598ee SHA512 d8191011dc938d8f2f01193ebdd18411f3635772b9d08252a7da8046072c2b8e6c971be400c1f9877c9e66bd86fb261361b5e808f2aa74495ba071ded341de45
+AUX fix-help-open.patch 1628 BLAKE2B 47f6cc0f7a88a60408884805781410298239d064fa58c36ee57cf777a5fbb7ff0a7f032d1e5e0d30e903d14b33cea1daaadb8461099cae9e3e36aeedbc513922 SHA512 e0968c48ad22b405b0aa353da21cd199c4cc665a7d1e94ea52bba726798f4e403384a4394d87fbf4a225723c2cb1f2eb54ecd0659f5be869dd36e5ee034e477e
+DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb
+EBUILD gtg-0.4.0_pre20200613.ebuild 1537 BLAKE2B 8fde70a21d8a9163ccd1506758710b1e0c050b3dff8edb6598476d313a5edb96c161718672435f69b7564d46c4cdc433e64c145d4b57eb6d1f4f0d53a3d84633 SHA512 60062306cccbd7ccf607667076f413e90e4346c675d6ab6d03236b65d24f8ffe4cb488cbc38bca0f960f51424b894d8bb81facc690d2ccef1b5bae3cdc04c0c4
 MISC metadata.xml 886 BLAKE2B 5f0068ca29003ca7dc9988c6e648076eb612103a30c0d5bbf60faec65c7e859d8546243d42764f2b09c000c37ad05e665646aefc6493288c856e2ee96f3187ff SHA512 9676a4693ee4c934eb22673f80b13fe61531e6c82b821990d070ad7c3b709a416c14741c870c3845e5d49a1b4c91b7c8fd16b7812d5e7466ebf352f53328f945
diff --git a/app-office/gtg/files/fix-help-open.patch b/app-office/gtg/files/fix-help-open.patch
new file mode 100644
index 000000000000..a66d8e95bdd9
--- /dev/null
+++ b/app-office/gtg/files/fix-help-open.patch
@@ -0,0 +1,43 @@
+From f8f4cbf0beda0e82388748c916c6152996b12a8e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 20 Jun 2020 01:06:04 +0300
+Subject: [PATCH] Fix opening of the help files
+
+webbrowser python module just opens things in the browser for me, which
+doesn't understand what a "help:gtg" is and routes it back to external
+program dialog if lucky.
+Use Gtk.show_uri instead, which will properly open it in help handler (yelp).
+
+I believe we should be using Gtk.show_uri instead of webbrowser in other
+places as well, but that's something for a different release.
+---
+ GTG/gtk/application.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/GTG/gtk/application.py b/GTG/gtk/application.py
+index 39a8a5b3..e8091973 100644
+--- a/GTG/gtk/application.py
++++ b/GTG/gtk/application.py
+@@ -28,7 +28,6 @@ from GTG.gtk.browser.main_window import MainWindow
+ from GTG.gtk.editor.editor import TaskEditor
+ from GTG.gtk.preferences import Preferences
+ from GTG.gtk.plugins import PluginsDialog
+-from webbrowser import open as openurl
+ from GTG.core import clipboard
+ from GTG.core.plugins.engine import PluginEngine
+ from GTG.core.plugins.api import PluginAPI
+@@ -251,7 +250,10 @@ class Application(Gtk.Application):
+     def open_help(self, action, param):
+         """Open help callback."""
+ 
+-        openurl("help:gtg")
++        try:
++            Gtk.show_uri(None, "help:gtg", Gdk.CURRENT_TIME)
++        except GLib.Error:
++            log.error('Could not open help')
+ 
+     def open_backends_manager(self, action, param):
+         """Callback to open the backends manager dialog."""
+-- 
+2.20.1
+
diff --git a/app-office/gtg/files/gtg-0.3.1-desktop.patch b/app-office/gtg/files/gtg-0.3.1-desktop.patch
deleted file mode 100644
index 82db6ce36f3b..000000000000
--- a/app-office/gtg/files/gtg-0.3.1-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix desktop-file-validate warning.
-
---- a/gtg.desktop	2014-11-01 11:23:31.101881704 +0100
-+++ b/gtg.desktop	2014-11-01 11:23:37.349775014 +0100
-@@ -14,7 +14,7 @@
- StartupNotify=true
- X-Ayatana-Desktop-Shortcuts=NewTask
- 
--[NewTask Shortcut Group]
-+[X-NewTask Shortcut Group]
- Name=New Task
- Exec=gtg_new_task
- TargetEnvironment=Unity
diff --git a/app-office/gtg/files/gtg-0.3.1-locales.patch b/app-office/gtg/files/gtg-0.3.1-locales.patch
deleted file mode 100644
index 56bf5ce5e9b1..000000000000
--- a/app-office/gtg/files/gtg-0.3.1-locales.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not install unwanted locales.
-
---- a/setup.py	2014-11-01 11:21:49.679613605 +0100
-+++ b/setup.py	2014-11-01 11:26:36.305719135 +0100
-@@ -101,9 +101,15 @@
- 
- PO_DIR = 'po'
- MO_DIR = os.path.join('build', 'po')
-+LINGUAS = os.environ.get('LINGUAS', '*').split(' ')
- 
- for po in glob.glob(os.path.join(PO_DIR, '*.po')):
-     lang = os.path.basename(po[:-3])
-+
-+    # Skip unwanted locales
-+    if lang not in LINGUAS and '*' not in LINGUAS:
-+        continue
-+
-     mo = os.path.join(MO_DIR, lang, 'gtg.mo')
-     target_dir = os.path.dirname(mo)
-     if not os.path.isdir(target_dir):
diff --git a/app-office/gtg/gtg-0.3.1.ebuild b/app-office/gtg/gtg-0.3.1.ebuild
deleted file mode 100644
index 05a309c14361..000000000000
--- a/app-office/gtg/gtg-0.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime gnome2-utils distutils-r1 versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-DESCRIPTION="Personal organizer for the GNOME desktop environment"
-HOMEPAGE="http://gtgnome.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/liblarch[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# Plugins are voluntarily left automagic as application has a nice way
-	# to suggest missing dependencies. We only remove the ones that cannot
-	# work on gentoo.
-	# Backends should be enabled via USE flag when pulling extra deps
-
-	# geoloc: uses removed from tree bindings
-	sed -e "/GTG.plugins.geolocalized_tasks',/d" \
-		-e "/geolocalized-tasks.gtg-plugin/d" \
-		-i setup.py || die
-
-	# launchpad: missing dependency
-	# evolution: missing python-r1 support
-	rm GTG/backends/backend_launchpad.py \
-		GTG/backends/backend_evolution.py \
-		|| die
-
-	# Respect LINGUAS
-	epatch "${FILESDIR}"/${PN}-0.3.1-locales.patch
-
-	# Fix validation warning
-	epatch "${FILESDIR}"/${PN}-0.3.1-desktop.patch
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
new file mode 100644
index 000000000000..d9f3109d2424
--- /dev/null
+++ b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Personal organizer for the GNOME desktop environment"
+HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
+COMMIT="abe2a9110dd0fc6a46f2d095013972877ea67d78"
+SRC_URI="https://github.com/getting-things-gnome/gtg/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/gtg-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		>=dev-python/liblarch-3.0[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	')
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	test? ( $(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/cheetah3[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+		app-text/pdfjam
+		app-text/pdftk
+		dev-texlive/texlive-latex
+	)
+"
+
+PATCHES=( "${FILESDIR}"/fix-help-open.patch )
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/gtg
+	python_optimize
+}
+
+src_test() {
+	nosetests -v || die
+}
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index c7fc238bc7c9..197a5696b2e9 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -3,7 +3,7 @@ DIST homebank-5.2.8.tar.gz 2730743 BLAKE2B e5a1cd143f72cdb09b5e097853c89b2dac8ad
 DIST homebank-5.3.2.tar.gz 2906468 BLAKE2B 0672890c469e9580a2128f130230a73d5bdc9e6b50830b1c0ead4f83d7e83837a2df4f50b49218dac9da6eb89f484a6866fcc748e65d5705ba5691e9772b7977 SHA512 777ee682f816f1b3a8f5d018148d79743be9fd17301d16e9c837e9fd46f8bd67cd393bfe9ef2960d87a7066a7f80fa7b88d7826ce62d4542693d3e09d7d5e887
 DIST homebank-5.4.2.tar.gz 2974448 BLAKE2B 0b6f6ad57633ecf560f821295797e9bcc83bb7f69b7b74ad38792f091593b5ae9dc79693b9d44f46414ee3e6f9e9d4fdc2dd5a174f2a50e79177d68506a2235c SHA512 6c28fed7f7a0019be87cd86d37f52a0ddedb0c2752bd311986a4ddfe33913a34e362eadc69e9238e391009fddb45a3a2b59e1176f2ca3f1901293a1b0989223e
 EBUILD homebank-5.2.2.ebuild 999 BLAKE2B 53aec6f626399963ea20591bb4a5f0e94d25b0d47b8df2da17f8886e4231349a6f15d1183f8c58848342c813f196ec26e375c8e98cdb4a605bfcff127d462aac SHA512 0ea5bd890af50e49811afdc5d8fe1fc49ef708a96b633fe84ffce587591eea33bb83a63a2ab87ed0a0a22879d475c2c20931003c90ead0fd3ba8ade029e00ba7
-EBUILD homebank-5.2.8.ebuild 1001 BLAKE2B c3b5798f5de45411696ffd5ef135c6b99069d69a785f79ef5db9c8123158695fdde953b92b80f1de80254d9055e1619d11f982d7ca47329079656e43636af076 SHA512 29dac8daa6eab1c46904f7362506dc3709a338d7d69700a0aaa443e093ad8219435771a40e9550f655d5789351e9865d342bd1e5b183461d99bd2101440f6d42
+EBUILD homebank-5.2.8.ebuild 1000 BLAKE2B e00d26335b16c8c8259b77def0ca672c24770509f78372dc980284154c2b741d40f9926aea3a84e163ac68887abeb55ccaf29683dc66e90b361655f941b81aa4 SHA512 49255b4446750ac941565eeb23dfb3b3844da00d70220045a05a5b8d1539d72c4c0c5f35c3429225f163047438a26a4bdfaee91e6d6b107a13da02a77450b6e4
 EBUILD homebank-5.3.2.ebuild 1002 BLAKE2B 1e3ade82f00114fb00d503c99f520cbfc7afa149735c89eb9b9c668c63175ee5c5155b376f68e83a61b181ad6f91a4233e2f889492cc23e9a7a7a08e6fd2de5b SHA512 724dbdaf809d5bba8fa6f4251a2e348c6d1fc4e08411d223f6f10d97e43b42f5a8d25a5da508ed52257af967c6a68808fd5c3efbd317f7f7793ac065ec4103d5
 EBUILD homebank-5.4.2.ebuild 1002 BLAKE2B 1e3ade82f00114fb00d503c99f520cbfc7afa149735c89eb9b9c668c63175ee5c5155b376f68e83a61b181ad6f91a4233e2f889492cc23e9a7a7a08e6fd2de5b SHA512 724dbdaf809d5bba8fa6f4251a2e348c6d1fc4e08411d223f6f10d97e43b42f5a8d25a5da508ed52257af967c6a68808fd5c3efbd317f7f7793ac065ec4103d5
 MISC metadata.xml 246 BLAKE2B 1c5c874dba813702c9e2e0147a6d99d357e2570756e7e15379e972c638d820c953aa010c7a00e26efce9a5d9936c88111176a47c540a90c38c49b889239deea9 SHA512 4f7ed62ba7f03a650ba8db92de0fd24d5a5fecb9866aa28011f7bb10d13f7fcff92bae46d1b68c5d5c03fe39b45a36dc264db290c8518cb2ed77ffbca93af563
diff --git a/app-office/homebank/homebank-5.2.8.ebuild b/app-office/homebank/homebank-5.2.8.ebuild
index 11368c0110c8..e071ac7d4868 100644
--- a/app-office/homebank/homebank-5.2.8.ebuild
+++ b/app-office/homebank/homebank-5.2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.39
 	>=net-libs/libsoup-2.26
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cd00686a3d28..575e788cd8a9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,11 +5,23 @@ AUX libreoffice-6.4.2.2-poppler-0.86.patch 777 BLAKE2B 1e798ef4a66dd872963e3436e
 AUX libreoffice-6.4.3.2-boost-1.73.patch 4356 BLAKE2B 3fc87602e75c612d03cd657ec82598bd11238bb97acac2f070ee11758c229d4e481b76125206fbdc5d8966ae3f5f9586798f73136b87f2556bb9c859642eca94 SHA512 927a3ee94ca1e9eae34768b688b980ec937abccbab4d5b12409b0c459c92a7c666d4ffbb113b9173c1e29ced1cbd67df12335acca62e8377278d8b53ed89380e
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
+DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
+DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 BLAKE2B e02fced286aab6f6597b04bba37186e6f7d0793ef807c4530e15da5464e9302880278472fdc79dc27a9be15600127bebe30651a6027ef1b0a7cfc40ce56a395a SHA512 a7c3044a0a7c67881f78eddc4b3faf05e29b20755a59cdbb9a0a49bd21be5aaa95d4ea5eaabdd6f005a421981fb7c55fee590d4c9592fe363ba27ae590652bd4
+DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 BLAKE2B b9f3ef8baa6fe11b2aef25ee6ebe36d7f4c0e688022f27c6a0186a94d909c4c2166ffe5d70644207f56971888e2478e57cd1e76a252abf3825987350c4c7de45 SHA512 8eaa9eed3bff16a16483d0754756c181089eb705ea34ded7f9f6db90a591cbce3f0551f28d097bd2f44de813cb818720c430e79e516939e0398b72bf4614f4cd
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
+DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f
+DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6
 DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
+DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e
+DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec
+DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
+DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c
+DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6
 DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
+DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
+DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
 DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
@@ -18,6 +30,6 @@ DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
 EBUILD libreoffice-6.4.3.2.ebuild 15773 BLAKE2B 58373db2eb7ec7afe91cdb5cfa9632cedb8ff375ff07474aaffcbbe3c6ce150644d7d49639bfff3c2c8aa1eaa689e1ee3ac5348d8e1272bc0232d8a0a92eaf2a SHA512 15b27b4dbf1e4ba5938e506eca8265a717dd660046be6bdee4e06f8188fb9d51a9483b3b4149734419b9c6528405b47acf5f9c86e0ddec457ddad15e653adeee
 EBUILD libreoffice-6.4.4.2.ebuild 15803 BLAKE2B 01d2996181c7b6b8dbe08ca568fe8998015aedca2e66b554212865eef400a99b0b76dd694031c9f0369b846bba2c955ef7e8a836d936fa36f92f4233c4d48335 SHA512 ea3795d62c5d18bc4259dd40f454b0a1020ccc5e093f809a5b34f8886c4c1c8aac19b79682c43fa8b7fe56fcc8df76ec8795ca17c7c9273748cf700cd6a25867
-EBUILD libreoffice-6.4.9999.ebuild 15617 BLAKE2B 836265601e6c0304b513d065af4785e226a64769b1241fc1623aa0e55b046050e322f5655cf7c6cdb488a3e9c9cecc7eb29b55702c71b7a658d852e28a78295c SHA512 ba3ef44e35a535e6a6003c49707af89b861c9f212ccce4e58c8f1ef9c2d6ad827c27ceecb032359ece1db0bdc764c82b18514d1b75a28be5c5f1fe6c9950d68a
-EBUILD libreoffice-9999.ebuild 15831 BLAKE2B de4c0f66695a349885255ad12238c2c1951c5cdc9d743bacc09d564ba8df55360c22dd22fbc76e2ae853e932c9007c913dd0057b9b80bfdb3c175770b7c02969 SHA512 d3b8bca1a81b9e9f710bc70ad0f0408c482db670fd8647accbbc7b9750d67ea407093fe6fbd4074c3ed3a3eada6893378989bd90351a51eac7ae45f221bdedf9
-MISC metadata.xml 950 BLAKE2B 5faa7b51f7980157528998e0aa29a81b2beff5375d0f8acfc69b4bd32f764155a9a8facce616957208afe60d27c5f93a53a68181de5d2c54586550796c57bddd SHA512 b9473327fd3b482e079154054dc41717d0f8beb9c0b05cb27c8333d9631c3ca2d03b63b34b379c96429b4058098a351cc4ed471b400a1833e729243496b47c4a
+EBUILD libreoffice-6.4.9999.ebuild 16499 BLAKE2B 9e8d530dd8e39d33e0912442012c9ec8cf1ffba8b6284ad09812fc76b6f22c8c0daafae9274167aee9f73a88be550aa52c0eb69950d525dc6a4eba0fe01a7ee7 SHA512 ee1dd9f1b844f8f546f321ae5307c4c077b7f1a383cf2002afbe7893dff08fba52f80d2bd18a9c020d7a884b59546114ff8600fa0dd6e43f6219a46bdf06b4a0
+EBUILD libreoffice-9999.ebuild 16713 BLAKE2B 2e327cfac337d2182052ae46d0759f0fc252aa404f2f0c7c39d380d0410ace457b131e828e92fb85ca4639747234a7406ee76e54f770defa7682d10fe3cb7a12 SHA512 5ba0132582197dbace16f978bacf9e2da6355b6211beee8ac5e27469720919019da377d7c75b12c5eb8b12f6bcad72359f4a402b508521986140742d52c25ec9
+MISC metadata.xml 1065 BLAKE2B 3ff11b03c5ab432a25d91b6e727f964c82fb31f23663669dbe5f85e2b425bb99ee3d7dd2f2fe3fe95063e0403bb4561487566e213125e861711ef79912747980 SHA512 da4cf59feab680dbcfa9a3e4f7760315c9f99aaff105b9712304c64e2ae3b7c2535f96c3cfb8e9b08124b59e55b460c831a0e116d6ec5bd670cecdfc85323b18
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index e42e510981a9..727d2c010c58 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -46,6 +46,20 @@ unset DEV_URI
 ADDONS_SRC=(
 	# QR code generating library for >=libreoffice-6.4
 	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
 	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 	# no release for 8 years, should we package it?
 	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -64,11 +78,12 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
 googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
 	bluetooth? ( dbus )
 	gtk? ( dbus )
 	libreoffice_extensions_nlpsolver? ( java )
@@ -268,11 +283,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if ! use java && ! use firebird; then
-		ewarn "If you plan to use Base application you must enable either firebird or java."
-	fi
-
-	use java || ewarn "Without java, several wizards are not going to be available."
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -409,7 +423,6 @@ src_configure() {
 		--disable-online-update
 		--disable-openssl
 		--disable-pdfium
-		--disable-report-builder
 		--disable-vlc
 		--with-build-version="${gentoo_buildid}"
 		--enable-extension-integration
@@ -428,8 +441,11 @@ src_configure() {
 		--with-help="html"
 		--without-helppack-integration
 		--with-system-gpgmepp
+		--without-system-jfreereport
+		--without-system_apache_commons
 		--without-system-sane
 		--without-system-qrcodegen
+		$(use_enable base report-builder)
 		$(use_enable bluetooth sdremote-bluetooth)
 		$(use_enable coinmp)
 		$(use_enable cups)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3e5059a20356..3e8136e6a80a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -50,6 +50,20 @@ ADDONS_SRC=(
 	"${ADDONS_URI}/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz"
 	# QR code generating library for >=libreoffice-6.4
 	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
 	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 	# no release for 8 years, should we package it?
 	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -68,11 +82,12 @@ unset ADDONS_SRC
 # Extensions that need extra work:
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
-IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
 googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
 	bluetooth? ( dbus )
 	gtk? ( dbus )
 	libreoffice_extensions_nlpsolver? ( java )
@@ -272,11 +287,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if ! use java && ! use firebird; then
-		ewarn "If you plan to use Base application you must enable either firebird or java."
-	fi
-
-	use java || ewarn "Without java, several wizards are not going to be available."
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -413,7 +427,6 @@ src_configure() {
 		--disable-online-update
 		--disable-openssl
 		--disable-pdfium
-		--disable-report-builder
 		--disable-vlc
 		--with-build-version="${gentoo_buildid}"
 		--enable-extension-integration
@@ -432,8 +445,11 @@ src_configure() {
 		--with-help="html"
 		--without-helppack-integration
 		--with-system-gpgmepp
+		--without-system-jfreereport
+		--without-system_apache_commons
 		--without-system-sane
 		--without-system-qrcodegen
+		$(use_enable base report-builder)
 		$(use_enable bluetooth sdremote-bluetooth)
 		$(use_enable coinmp)
 		$(use_enable cups)
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index e13325955e7a..3afed225b936 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -11,6 +11,7 @@ compilation can take up to a day depending on the speed of your
 computer. It will however make a snappier LibreOffice than the binary 
 version</longdescription>
   <use>
+    <flag name="base">Enable full support for LibreOffice Base databases (involves additional bundled libs)</flag>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
     <flag name="mariadb">Prefer mariadb connector over mysql connector</flag>