From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A29E0138351 for ; Sun, 9 Feb 2020 16:11:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3915E087D; Sun, 9 Feb 2020 16:11:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E6F9E087F for ; Sun, 9 Feb 2020 16:11:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27CFD34E8CA for ; Sun, 9 Feb 2020 16:11:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 338F014A for ; Sun, 9 Feb 2020 16:11:08 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1581264656.a9e7bf728e975ba7af2141239d65a7f7e2262a2e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild app-office/libreoffice/libreoffice-6.3.4.2.ebuild app-office/libreoffice/libreoffice-6.3.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a9e7bf728e975ba7af2141239d65a7f7e2262a2e X-VCS-Branch: master Date: Sun, 9 Feb 2020 16:11:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa8ed1ce-613f-4ec2-8bb8-5198e4dbed65 X-Archives-Hash: c19ce2a3287bb69cdff4639a8d4d1855 commit: a9e7bf728e975ba7af2141239d65a7f7e2262a2e Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 11:27:35 2020 +0000 Commit: Michał Górny gentoo 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 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