[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
Date: Thu, 13 Jan 2022 01:25:45 +0000 (UTC)	[thread overview]
Message-ID: <1642037132.4db0fd6113765ff6f6865e47bdbe8f4f2495e4f4.sam@gentoo> (raw)

commit:     4db0fd6113765ff6f6865e47bdbe8f4f2495e4f4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 01:07:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 01:25:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db0fd61

sci-libs/opencascade: fix installed environment file for non-slotted

We're no longer using slotted OCC but I don't think we fully
completed the version. I was initially going to wait but
upon reflection, I think this is the only way forward
that makes sense (updating the env.in to reflect
the earlier changes).

The old/outdated env file results in build failures
in e.g. kicad.

(Also, change ESYSROOT -> EPREFIX for the env file
as the env file is for the end result system.)

Bug: https://bugs.gentoo.org/831069
Bug: https://bugs.gentoo.org/831054
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/opencascade/files/opencascade.env.in      | 32 +++++++++++-----------
 ...7.5.2-r3.ebuild => opencascade-7.5.2-r4.ebuild} |  5 ++--
 ...7.5.3-r4.ebuild => opencascade-7.5.3-r5.ebuild} |  5 ++--
 ...de-7.6.0.ebuild => opencascade-7.6.0-r1.ebuild} |  5 ++--
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/sci-libs/opencascade/files/opencascade.env.in b/sci-libs/opencascade/files/opencascade.env.in
index d7148c241f11..28006d724806 100644
--- a/sci-libs/opencascade/files/opencascade.env.in
+++ b/sci-libs/opencascade/files/opencascade.env.in
@@ -10,8 +10,8 @@
 
 # define the root directory of Open CASCADE Technology (needed)
 CASROOT="VAR_CASROOT"
-PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin"
-LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
+PATH="VAR_CASROOT/lib/opencascade/bin"
+LDPATH="VAR_CASROOT/lib/opencascade"
 
 #############################################################################
 # The MMGT_* variables are used to determine how memory management will work
@@ -79,21 +79,21 @@ LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV"
 
 # The following CSF_* variables define various directories and files where
 # OCCT is looking for resources.
-CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so"
-CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt"
-CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures"
-CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource"
-CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource"
+CSF_GraphicShr="VAR_CASROOT/lib/opencascade/libTKOpenGl.so"
+CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt"
+CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade/resources/Textures"
+CSF_PluginDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_StandardDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_XCAFDefaults="VAR_CASROOT/share/opencascade/resources/StdResource"
+CSF_XmlOcafResource="VAR_CASROOT/share/opencascade/resources/XmlOcafResource"
 # The below values might be optional.
-CSF_IGESDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_ShadersDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders"
-CSF_SHMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage"
-CSF_STEPDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource"
-CSF_UnitsDefinition="VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat"
-CSF_XSMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage"
+CSF_IGESDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource"
+CSF_ShadersDirectory="VAR_CASROOT/share/opencascade/resources/Shaders"
+CSF_SHMessage="VAR_CASROOT/share/opencascade/resources/SHMessage"
+CSF_STEPDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource"
+CSF_UnitsDefinition="VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat"
+CSF_XSMessage="VAR_CASROOT/share/opencascade/resources/XSMessage"
 
 # TODO: check those
 # they were defined in the original ebuild but the directories and files

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
index 080f7888f0bd..7f662a01ff3a 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -135,8 +135,7 @@ src_configure() {
 
 	# prepare /etc/env.d file
 	sed -e "s|lib/|$(get_libdir)/|" \
-		-e "s|VAR_PV|${PV}|" \
-		-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
 		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
 
 	# use TBB for memory allocation optimizations

diff --git a/sci-libs/opencascade/opencascade-7.5.3-r4.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.5.3-r4.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
index 2fd61839b59b..6c9825a5afde 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -135,8 +135,7 @@ src_configure() {
 
 	# prepare /etc/env.d file
 	sed -e "s|lib/|$(get_libdir)/|" \
-		-e "s|VAR_PV|${PV}|" \
-		-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
 		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
 
 	# use TBB for memory allocation optimizations

diff --git a/sci-libs/opencascade/opencascade-7.6.0.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/opencascade/opencascade-7.6.0.ebuild
rename to sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
index e9eafc6f8515..4791baa0fb60 100644
--- a/sci-libs/opencascade/opencascade-7.6.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -141,8 +141,7 @@ src_configure() {
 	cmake_src_configure
 
 	sed -e "s|lib/|$(get_libdir)/|" \
-		-e "s|VAR_PV|${PV}|" \
-		-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+		-e "s|VAR_CASROOT|${EPREFIX}/usr|" \
 		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
 
 	# use TBB for memory allocation optimizations

next             reply	other threads:[~2022-01-13  1:26 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-13  1:25 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-12 11:47 [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/ Sam James
2024-11-25 15:32 Andreas Sturmlechner
2024-04-14 14:28 Andrew Ammerlaan
2023-07-31  8:43 Joonas Niilola
2023-01-28 22:48 Andreas Sturmlechner
2022-12-31 15:36 Sam James
2022-06-25 23:33 Sam James
2022-06-14 16:01 Joonas Niilola
2021-10-31  2:23 Sam James
2021-05-04 22:02 Sam James
2021-03-01  8:26 Joonas Niilola
2020-04-01 14:38 Joonas Niilola
2019-11-17  7:46 Joonas Niilola
2018-11-29 20:19 Andreas Sturmlechner
2018-11-29 20:19 Andreas Sturmlechner
2018-04-05 12:31 Andreas Sturmlechner
2017-06-07  7:09 Michael Weber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d7148c241f1 dfblob:28006d72480 dfblob:080f7888f0b
dfblob:7f662a01ff3 dfblob:2fd61839b59 dfblob:6c9825a5afd
dfblob:e9eafc6f851 dfblob:4791baa0fb6 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1642037132.4db0fd6113765ff6f6865e47bdbe8f4f2495e4f4.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox