From 91385d013bd1fbc0c8a8e5bc5ec43d8e0f3906f5 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sun, 10 May 2020 21:42:25 -0700 Subject: [PATCH] dev-java/openjdk: don't die on ccache if binpkg is being used Bug: https://bugs.gentoo.org/677876 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev --- dev-java/openjdk/openjdk-11.0.7_p10.ebuild | 4 +++- dev-java/openjdk/openjdk-8.252_p09.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild index 76d41a4eb082..b5d448dd9e84 100644 --- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild @@ -96,7 +96,9 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + fi } pkg_setup() { diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild index eb54f0c8ec27..1b3576eacaf4 100644 --- a/dev-java/openjdk/openjdk-8.252_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild @@ -95,7 +95,9 @@ openjdk_check_requirements() { pkg_pretend() { openjdk_check_requirements - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" + fi } pkg_setup() { -- 2.26.2