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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14D40138350 for ; Mon, 17 Feb 2020 17:58:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 526F1E08E5; Mon, 17 Feb 2020 17:58:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36527E08E5 for ; Mon, 17 Feb 2020 17:58:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 338B134ECC4 for ; Mon, 17 Feb 2020 17:58:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA7C5132 for ; Mon, 17 Feb 2020 17:58:08 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1581962282.2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-4.10.1-r2.ebuild app-text/calibre/calibre-4.9.1-r2.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d X-VCS-Branch: master Date: Mon, 17 Feb 2020 17:58:08 +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: fa8cad71-c7d7-485f-983b-a0949ef14cb5 X-Archives-Hash: 85b75876e2ae049fc9f2fc9e6ad78113 commit: 2d5d92de87838e2dff6a6c09cb41edcaf26a6e3d Author: Denis Pronin yandex ru> AuthorDate: Mon Feb 17 12:39:09 2020 +0000 Commit: Zac Medico gentoo 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 yandex.ru> Signed-off-by: Zac Medico 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."