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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82343158009 for ; Thu, 29 Jun 2023 19:57:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB9E2E07AE; Thu, 29 Jun 2023 19:57:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82BFBE07AE for ; Thu, 29 Jun 2023 19:57:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 841A8340F93 for ; Thu, 29 Jun 2023 19:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02ADF51F for ; Thu, 29 Jun 2023 19:57:35 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1688068646.c9f4376eb1b1ac1134fa71e74c52b53c594635c2.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/portage-utils/portage-utils-0.95-r1.ebuild app-portage/portage-utils/portage-utils-0.96-r1.ebuild app-portage/portage-utils/portage-utils-9999.ebuild X-VCS-Directories: app-portage/portage-utils/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: c9f4376eb1b1ac1134fa71e74c52b53c594635c2 X-VCS-Branch: master Date: Thu, 29 Jun 2023 19:57:35 +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: 1ba01c40-952c-4a23-9a65-f8181ce73ca6 X-Archives-Hash: 857d842a76585b85f7bab30272e0596b commit: c9f4376eb1b1ac1134fa71e74c52b53c594635c2 Author: Ben Kohler gentoo org> AuthorDate: Wed Jun 28 15:02:30 2023 +0000 Commit: Ben Kohler gentoo org> CommitDate: Thu Jun 29 19:57:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f4376e app-portage/portage-utils: make best effort to get gcc[openmp] installed Bug: https://bugs.gentoo.org/890752 Signed-off-by: Ben Kohler gentoo.org> ...{portage-utils-9999.ebuild => portage-utils-0.95-r1.ebuild} | 10 +++++----- ...{portage-utils-9999.ebuild => portage-utils-0.96-r1.ebuild} | 10 +++++----- app-portage/portage-utils/portage-utils-9999.ebuild | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-0.95-r1.ebuild similarity index 83% copy from app-portage/portage-utils/portage-utils-9999.ebuild copy to app-portage/portage-utils/portage-utils-0.95-r1.ebuild index 2df55d2cb16d..e9bf09edc335 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-0.95-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" @@ -21,6 +21,10 @@ SLOT="0" IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" + openmp? ( || ( + sys-devel/gcc:*[openmp] + sys-libs/libomp + ) ) qmanifest? ( !static? ( app-crypt/gpgme:= @@ -50,10 +54,6 @@ DEPEND="${RDEPEND} )" BDEPEND="virtual/pkgconfig" -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-0.96-r1.ebuild similarity index 83% copy from app-portage/portage-utils/portage-utils-9999.ebuild copy to app-portage/portage-utils/portage-utils-0.96-r1.ebuild index 2df55d2cb16d..e9bf09edc335 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-0.96-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" @@ -21,6 +21,10 @@ SLOT="0" IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" + openmp? ( || ( + sys-devel/gcc:*[openmp] + sys-libs/libomp + ) ) qmanifest? ( !static? ( app-crypt/gpgme:= @@ -50,10 +54,6 @@ DEPEND="${RDEPEND} )" BDEPEND="virtual/pkgconfig" -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild index 2df55d2cb16d..a40fd823f800 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-9999.ebuild @@ -21,6 +21,10 @@ SLOT="0" IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" + openmp? ( || ( + sys-devel/gcc:*[openmp] + sys-libs/libomp + ) ) qmanifest? ( !static? ( app-crypt/gpgme:= @@ -50,10 +54,6 @@ DEPEND="${RDEPEND} )" BDEPEND="virtual/pkgconfig" -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp }