commit: 2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d Author: Denis Pronin <dannftk <AT> yandex <DOT> ru> AuthorDate: Mon Feb 17 12:39:09 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Feb 17 17:58:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5d92de
app-text/calibre: support any compiler other than gcc Closes: https://github.com/gentoo/gentoo/pull/14682 Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-text/calibre/calibre-4.10.1-r2.ebuild | 2 +- app-text/calibre/calibre-4.9.1-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-text/calibre/calibre-4.10.1-r2.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild index ff49270f891..08411595122 100644 --- a/app-text/calibre/calibre-4.10.1-r2.ebuild +++ b/app-text/calibre/calibre-4.10.1-r2.ebuild @@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig" pkg_pretend() { - if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then + if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then eerror "Calibre cannot be built with this version of gcc." eerror "You need at least gcc-6.0" die "Your C compiler is too old for this package." diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild index 9a06547f837..799b96ca85b 100644 --- a/app-text/calibre/calibre-4.9.1-r2.ebuild +++ b/app-text/calibre/calibre-4.9.1-r2.ebuild @@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig" pkg_pretend() { - if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then + if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then eerror "Calibre cannot be built with this version of gcc." eerror "You need at least gcc-6.0" die "Your C compiler is too old for this package."
