| 1 |
commit: a9e7bf728e975ba7af2141239d65a7f7e2262a2e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 7 11:27:35 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 16:10:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e7bf72 |
| 7 |
|
| 8 |
app-office/libreoffice: Switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{libreoffice-6.3.4.2.ebuild => libreoffice-6.3.4.2-r1.ebuild} | 6 +++++- |
| 13 |
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 8 ++++++-- |
| 14 |
app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++++-- |
| 15 |
3 files changed, 17 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild |
| 18 |
similarity index 99% |
| 19 |
rename from app-office/libreoffice/libreoffice-6.3.4.2.ebuild |
| 20 |
rename to app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild |
| 21 |
index d4ce61a869a..13de879df38 100644 |
| 22 |
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild |
| 23 |
+++ b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild |
| 24 |
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 25 |
x11-libs/libXinerama |
| 26 |
x11-libs/libXrandr |
| 27 |
x11-libs/libXrender |
| 28 |
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) |
| 29 |
+ accessibility? ( |
| 30 |
+ $(python_gen_cond_dep ' |
| 31 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
| 32 |
+ ') |
| 33 |
+ ) |
| 34 |
bluetooth? ( |
| 35 |
dev-libs/glib:2 |
| 36 |
net-wireless/bluez |
| 37 |
|
| 38 |
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild |
| 39 |
index bc4dff890b8..d552a76a932 100644 |
| 40 |
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild |
| 41 |
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2019 Gentoo Authors |
| 44 |
+# Copyright 1999-2020 Gentoo Authors |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI=7 |
| 48 |
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 49 |
x11-libs/libXinerama |
| 50 |
x11-libs/libXrandr |
| 51 |
x11-libs/libXrender |
| 52 |
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) |
| 53 |
+ accessibility? ( |
| 54 |
+ $(python_gen_cond_dep ' |
| 55 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
| 56 |
+ ') |
| 57 |
+ ) |
| 58 |
bluetooth? ( |
| 59 |
dev-libs/glib:2 |
| 60 |
net-wireless/bluez |
| 61 |
|
| 62 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 63 |
index 3c04bc1de8e..f38debf301b 100644 |
| 64 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 65 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2019 Gentoo Authors |
| 68 |
+# Copyright 1999-2020 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=7 |
| 72 |
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 73 |
x11-libs/libXinerama |
| 74 |
x11-libs/libXrandr |
| 75 |
x11-libs/libXrender |
| 76 |
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] ) |
| 77 |
+ accessibility? ( |
| 78 |
+ $(python_gen_cond_dep ' |
| 79 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
| 80 |
+ ') |
| 81 |
+ ) |
| 82 |
bluetooth? ( |
| 83 |
dev-libs/glib:2 |
| 84 |
net-wireless/bluez |
Archives