[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Michał Górny]

commit:     a9e7bf728e975ba7af2141239d65a7f7e2262a2e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 11:27:35 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:10:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e7bf72

app-office/libreoffice: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{libreoffice-6.3.4.2.ebuild => libreoffice-6.3.4.2-r1.ebuild} | 6 +++++-
 app-office/libreoffice/libreoffice-6.3.9999.ebuild                | 8 ++++++--
 app-office/libreoffice/libreoffice-9999.ebuild                    | 8 ++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild 
b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-6.3.4.2.ebuild
rename to app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
index d4ce61a869a..13de879df38 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
-       accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+       accessibility? (
+               $(python_gen_cond_dep '
+                       dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        bluetooth? (
                dev-libs/glib:2
                net-wireless/bluez

diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild 
b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index bc4dff890b8..d552a76a932 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
-       accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+       accessibility? (
+               $(python_gen_cond_dep '
+                       dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        bluetooth? (
                dev-libs/glib:2
                net-wireless/bluez

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild 
b/app-office/libreoffice/libreoffice-9999.ebuild
index 3c04bc1de8e..f38debf301b 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
-       accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+       accessibility? (
+               $(python_gen_cond_dep '
+                       dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+               ')
+       )
        bluetooth? (
                dev-libs/glib:2
                net-wireless/bluez