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 E4DD3138359 for ; Sat, 21 Nov 2020 19:02:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C3F3E07C5; Sat, 21 Nov 2020 19:02:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 24B12E07C5 for ; Sat, 21 Nov 2020 19:02:11 +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 29214340E23 for ; Sat, 21 Nov 2020 19:02:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1F25451 for ; Sat, 21 Nov 2020 19:02:08 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1605985314.883a8fcde2ae0e61193132f7964978ec003cfb01.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-7.0.3.1.ebuild app-office/libreoffice/libreoffice-7.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 883a8fcde2ae0e61193132f7964978ec003cfb01 X-VCS-Branch: master Date: Sat, 21 Nov 2020 19:02: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: 4bd01f30-19e9-471a-b0c0-6947adafdf39 X-Archives-Hash: 6e641e6d15ff5aaba531d3451ef3b127 commit: 883a8fcde2ae0e61193132f7964978ec003cfb01 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 21 19:01:19 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Nov 21 19:01:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883a8fcd app-office/libreoffice: Enforce consistent llvm and clang Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel gentoo.org> app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 14 +++++++++++--- app-office/libreoffice/libreoffice-7.0.9999.ebuild | 14 +++++++++++--- app-office/libreoffice/libreoffice-9999.ebuild | 14 +++++++++++--- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild index b7f883af378..75e3660ccfa 100644 --- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild @@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS} net-wireless/bluez ) clang? ( - sys-devel/clang - sys-devel/llvm - sys-devel/lld + || ( + ( sys-devel/clang:10 + sys-devel/llvm:10 + =sys-devel/lld-10* ) + ( sys-devel/clang:11 + sys-devel/llvm:11 + =sys-devel/lld-11* ) + ( sys-devel/clang:12 + sys-devel/llvm:12 + =sys-devel/lld-12* ) + ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild index 735ca0fa649..5040a3e0391 100644 --- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild @@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS} net-wireless/bluez ) clang? ( - sys-devel/clang - sys-devel/llvm - sys-devel/lld + || ( + ( sys-devel/clang:10 + sys-devel/llvm:10 + =sys-devel/lld-10* ) + ( sys-devel/clang:11 + sys-devel/llvm:11 + =sys-devel/lld-11* ) + ( sys-devel/clang:12 + sys-devel/llvm:12 + =sys-devel/lld-12* ) + ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index d114626a09d..1b78e99f05f 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS} net-wireless/bluez ) clang? ( - sys-devel/clang - sys-devel/llvm - sys-devel/lld + || ( + ( sys-devel/clang:10 + sys-devel/llvm:10 + =sys-devel/lld-10* ) + ( sys-devel/clang:11 + sys-devel/llvm:11 + =sys-devel/lld-11* ) + ( sys-devel/clang:12 + sys-devel/llvm:12 + =sys-devel/lld-12* ) + ) ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups )