commit: c9f4376eb1b1ac1134fa71e74c52b53c594635c2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Wed Jun 28 15:02:30 2023 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> 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 <bkohler <AT> 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 }
