app-office/libreoffice: Switch to PYTHON_MULTI_USEDEP API

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

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 d4ce61a869a096e16774f2453b5c23dda074747a..13de879df38675acbf21ff9839fa17922bd6a266 100644 (file)
--- 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 bc4dff890b8fbb694df8c134980a21f2c71cb02c..d552a76a932d42fe06751eefe3ed9e2a0c3e11b0 100644 (file)
--- 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 3c04bc1de8e6e66b83b863de877e8a052052b716..f38debf301b9f927e46a0c3e38b4092dcea0ef1b 100644 (file)
--- 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