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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F27515808B for ; Tue, 8 Feb 2022 05:46:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FA35E079C; Tue, 8 Feb 2022 05:46:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79DDBE079C for ; Tue, 8 Feb 2022 05:46:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB4FE342AA1 for ; Tue, 8 Feb 2022 05:46:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 535062B8 for ; Tue, 8 Feb 2022 05:46:08 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1644299085.ed92943627a2995fd815d7ba7a383e2a85826150.sam@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.12-r1.ebuild sci-electronics/kicad/kicad-5.1.12-r2.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ed92943627a2995fd815d7ba7a383e2a85826150 X-VCS-Branch: master Date: Tue, 8 Feb 2022 05:46: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: cc89169c-9a51-4da9-87ae-f9445108b4c4 X-Archives-Hash: c28fc6bbc9f744155c965b6c881645d6 commit: ed92943627a2995fd815d7ba7a383e2a85826150 Author: Sam James gentoo org> AuthorDate: Tue Feb 8 05:44:45 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 8 05:44:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed929436 sci-electronics/kicad: fix finding opencascade Sync with logic in newer ebuilds to accommodate opencascade ebuild changes (slotting was abandoned). Closes: https://bugs.gentoo.org/832874 Thanks-to: David Flogeras gmail.com> Signed-off-by: Sam James gentoo.org> ...icad-5.1.12-r1.ebuild => kicad-5.1.12-r2.ebuild} | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/sci-electronics/kicad/kicad-5.1.12-r1.ebuild b/sci-electronics/kicad/kicad-5.1.12-r2.ebuild similarity index 88% rename from sci-electronics/kicad/kicad-5.1.12-r1.ebuild rename to sci-electronics/kicad/kicad-5.1.12-r2.ebuild index 733f5b237d03..943fd0124280 100644 --- a/sci-electronics/kicad/kicad-5.1.12-r1.ebuild +++ b/sci-electronics/kicad/kicad-5.1.12-r2.ebuild @@ -111,23 +111,10 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" ) if use occ; 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 - ) - else - #