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 56912139360 for ; Mon, 9 Aug 2021 05:46:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84A29E07A7; Mon, 9 Aug 2021 05:46:57 +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 5F3B3E07A7 for ; Mon, 9 Aug 2021 05:46:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 00DE3342A77 for ; Mon, 9 Aug 2021 05:46:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3736B7AF for ; Mon, 9 Aug 2021 05:46:54 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1628487928.ef75326644c79abe64864916524b5bfe8e25aa44.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-5.1.10-r1.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ef75326644c79abe64864916524b5bfe8e25aa44 X-VCS-Branch: master Date: Mon, 9 Aug 2021 05:46:54 +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: bddd02b6-c218-4b1e-8e3b-0244f62c7846 X-Archives-Hash: 40e2e3230b1c2edfed1b290f9e19f141 commit: ef75326644c79abe64864916524b5bfe8e25aa44 Author: Zoltan Puskas sinustrom info> AuthorDate: Sun Aug 8 18:32:57 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Aug 9 05:45:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef753266 sci-electronics/kicad: Fixup ebuild to support opencascade-7.5.2 OpenCascade currently is hard to handle and some version pinning is neccessary. This diff updates ebuild to support all current OpenCasade versions in Portage. Closes: https://bugs.gentoo.org/800944 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Zoltan Puskas sinustrom.info> Closes: https://github.com/gentoo/gentoo/pull/21918 Signed-off-by: Ionen Wolkens gentoo.org> sci-electronics/kicad/kicad-5.1.10-r1.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild index ea33fd63844..586e7c949bb 100644 --- a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild +++ b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) - occ? ( sci-libs/opencascade:=[vtk(+)] ) + occ? ( =sci-libs/opencascade-7.5"; then + if has_version "~sci-libs/opencascade-7.5.2"; then + mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2 + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2 + ) + elif has_version "~sci-libs/opencascade-7.5.1"; then mycmakeargs+=( -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1 -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1