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 <gyakovlev@gentoo.org>

diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
index 76d41a4eb0823ce8b26bac1ed0ead550a9fd65b9..b5d448dd9e84342e96d8197c8f635d52f4b10cfb 100644 (file)
--- 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 eb54f0c8ec27f90d5ea8520a427ce30a225212c8..1b3576eacaf4290ccca249466b751ab0da022886 100644 (file)
--- 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() {