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 C749A158088 for ; Sat, 15 Jan 2022 22:15:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76C632BC006; Sat, 15 Jan 2022 22:15:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 3E4DE2BC006 for ; Sat, 15 Jan 2022 22:15:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 20AC434311D for ; Sat, 15 Jan 2022 22:15:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08EA1246 for ; Sat, 15 Jan 2022 22:14:58 +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: <1642284887.0ea126f6c797701fe675896e6a8bca989d9b82bb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/opencascade-7.5.2-r4.ebuild sci-libs/opencascade/opencascade-7.5.2-r5.ebuild sci-libs/opencascade/opencascade-7.5.3-r5.ebuild sci-libs/opencascade/opencascade-7.5.3-r6.ebuild X-VCS-Directories: sci-libs/opencascade/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0ea126f6c797701fe675896e6a8bca989d9b82bb X-VCS-Branch: master Date: Sat, 15 Jan 2022 22:14:58 +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: 25212581-b49d-4400-a806-a0176b7d32eb X-Archives-Hash: a93292064a1abd51f09b51e8fc96ece1 commit: 0ea126f6c797701fe675896e6a8bca989d9b82bb Author: Bernd Waibel posteo net> AuthorDate: Sat Jan 15 14:52:19 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 15 22:14:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea126f6 sci-libs/opencascade: fix installation paths for 7.5 Use the same path as for the 7.6 series /usr/$(get_libdir)/${PN} instead of /usr/$(get_libdir)/${P}, so the changed environment files works for all versions. Bugs: https://bugs.gentoo.org/831054 Bugs: https://bugs.gentoo.org/831069 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Signed-off-by: Sam James gentoo.org> ...de-7.5.2-r4.ebuild => opencascade-7.5.2-r5.ebuild} | 19 ++++++++++++------- ...de-7.5.3-r5.ebuild => opencascade-7.5.3-r6.ebuild} | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild similarity index 90% rename from sci-libs/opencascade/opencascade-7.5.2-r4.ebuild rename to sci-libs/opencascade/opencascade-7.5.2-r5.ebuild index 98fad573f3a8..f4c5fd8ff1e3 100644 --- a/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild @@ -88,15 +88,20 @@ src_configure() { local mycmakeargs=( -DBUILD_DOC_Overview=$(usex doc) -DBUILD_Inspector=$(usex examples) - -DBUILD_WITH_DEBUG=$(usex debug) - -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" + + -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_LIB="$(get_libdir)/${P}" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_WITH_VERSION=ON + -DINSTALL_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF -DINSTALL_SAMPLES=$(usex examples) -DINSTALL_TEST_CASES=NO + -DUSE_D3D=NO -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FREEIMAGE=$(usex freeimage) @@ -160,7 +165,7 @@ src_install() { # remove examples if use !examples; then - rm -r "${ED}/usr/share/${P}/samples" || die + rm -r "${ED}/usr/share/${PN}/samples" || die fi docompress -x /usr/share/doc/${PF}/overview/html diff --git a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild similarity index 90% rename from sci-libs/opencascade/opencascade-7.5.3-r5.ebuild rename to sci-libs/opencascade/opencascade-7.5.3-r6.ebuild index 55ca127b2053..57cdfcf646b6 100644 --- a/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild @@ -88,15 +88,20 @@ src_configure() { local mycmakeargs=( -DBUILD_DOC_Overview=$(usex doc) -DBUILD_Inspector=$(usex examples) - -DBUILD_WITH_DEBUG=$(usex debug) - -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}" + + -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" -DINSTALL_DIR_DOC="share/doc/${PF}" - -DINSTALL_DIR_LIB="$(get_libdir)/${P}" - -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin" - -DINSTALL_DIR_WITH_VERSION=ON + -DINSTALL_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF -DINSTALL_SAMPLES=$(usex examples) -DINSTALL_TEST_CASES=NO + -DUSE_D3D=NO -DUSE_FFMPEG=$(usex ffmpeg) -DUSE_FREEIMAGE=$(usex freeimage) @@ -160,7 +165,7 @@ src_install() { # remove examples if use !examples; then - rm -r "${ED}/usr/share/${P}/samples" || die + rm -r "${ED}/usr/share/${PN}/samples" || die fi docompress -x /usr/share/doc/${PF}/overview/html