From a9e7bf728e975ba7af2141239d65a7f7e2262a2e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 12:27:35 +0100 Subject: [PATCH] app-office/libreoffice: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- ...ffice-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(-) rename app-office/libreoffice/{libreoffice-6.3.4.2.ebuild => libreoffice-6.3.4.2-r1.ebuild} (99%) 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 d4ce61a869a0..13de879df386 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 bc4dff890b8f..d552a76a932d 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 3c04bc1de8e6..f38debf301b9 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 -- 2.26.2