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

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/
Date: Mon, 10 Jan 2022 01:04:01 +0000 (UTC)	[thread overview]
Message-ID: <1641776549.62acc9193ee2728e613bb511a483ee16c8947ec1.sam@gentoo> (raw)

commit:     62acc9193ee2728e613bb511a483ee16c8947ec1
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Dec 13 05:01:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 10 01:02:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62acc919

sci-libs/opencascade: use single slot/subslot for 7.5.2

Instead of using different slots for different versions, the package now
uses a single slot with subslots. This is to simplify dependency handling
in revdeps.

Allow to build against sci-libs/vtk-9.1.0

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...7.5.2-r2.ebuild => opencascade-7.5.2-r3.ebuild} | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
similarity index 87%
rename from sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
rename to sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
index cf90cc0c8aa1..080f7888f0bd 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta
 S="${WORKDIR}/occt-V${MY_PV}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV_MAJ}"
+SLOT="0/${PV_MAJ}"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
 
@@ -25,7 +25,6 @@ REQUIRED_USE="?? ( optimize tbb )"
 RESTRICT="test"
 
 RDEPEND="
-	app-eselect/eselect-opencascade
 	dev-lang/tcl:=
 	dev-lang/tk:=
 	dev-tcltk/itcl
@@ -49,13 +48,11 @@ RDEPEND="
 	tbb? ( <dev-cpp/tbb-2021.4.0 )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	dev-cpp/eigen
 	dev-libs/rapidjson
-"
-BDEPEND="
-	app-eselect/eselect-opencascade
 	doc? ( app-doc/doxygen )
 	examples? ( dev-qt/linguist-tools:5 )
 "
@@ -119,7 +116,13 @@ src_configure() {
 	fi
 
 	if use vtk; then
-		if has_version ">=sci-libs/vtk-9.0.0"; then
+		if has_version ">=sci-libs/vtk-9.1.0"; then
+			mycmakeargs+=(
+				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1
+				-D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+			)
+		elif has_version ">=sci-libs/vtk-9.0.0"; then
 			mycmakeargs+=(
 				-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
 				-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
@@ -134,11 +137,11 @@ src_configure() {
 	sed -e "s|lib/|$(get_libdir)/|" \
 		-e "s|VAR_PV|${PV}|" \
 		-e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
-		< "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+		< "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die
 
 	# use TBB for memory allocation optimizations
 	if use tbb; then
-		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || die
+		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die
 	fi
 
 	# use internal optimized memory manager and don't clear memory with this
@@ -146,16 +149,14 @@ src_configure() {
 	if use optimize ; then
 		sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
 			-e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
-			-i "${T}"/${PV_MAJ} || die
+			-i "${T}"/99${PN} || die
 	fi
 }
 
 src_install() {
 	cmake_src_install
 
-	# respect slotting
-	insinto "/etc/env.d/${PN}"
-	doins "${T}/${PV_MAJ}"
+	doenvd "${T}/99${PN}"
 
 	# remove examples
 	if use !examples; then
@@ -164,8 +165,3 @@ src_install() {
 
 	docompress -x /usr/share/doc/${PF}/overview/html
 }
-
-pkg_postinst() {
-	eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
-	einfo "You can switch between available ${PN} implementations using eselect ${PN}"
-}

next             reply	other threads:[~2022-01-10  1:04 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-10  1:04 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-23 21:08 [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ Sam James
2024-11-23 16:08 Sam James
2024-11-23 16:08 Sam James
2024-08-25 15:44 Sam James
2024-08-25 15:44 Sam James
2024-04-14 14:28 Andrew Ammerlaan
2024-04-14 14:28 Andrew Ammerlaan
2024-03-26 20:25 Sam James
2024-03-23  8:34 Sam James
2023-07-31  8:43 Joonas Niilola
2023-02-06 19:49 Sam James
2023-01-27  7:46 Joonas Niilola
2023-01-04  5:50 Sam James
2023-01-04  5:50 Sam James
2022-12-31 15:36 Sam James
2022-12-19 14:49 Andreas Sturmlechner
2022-12-19 14:47 Andreas Sturmlechner
2022-12-13 14:11 Andrew Ammerlaan
2022-09-27 13:57 Andrew Ammerlaan
2022-09-25  7:20 Joonas Niilola
2022-08-14 16:06 Florian Schmaus
2022-07-27 19:03 Conrad Kostecki
2022-07-26 14:22 Joonas Niilola
2022-06-21 10:14 Andrew Ammerlaan
2022-06-14 16:01 Joonas Niilola
2022-06-14 16:01 Joonas Niilola
2022-06-03 11:01 Joonas Niilola
2022-05-19 12:12 Joonas Niilola
2022-03-16 22:54 Sam James
2022-03-16 22:51 Sam James
2022-03-16 22:51 Sam James
2022-03-16 22:51 Sam James
2022-01-16  1:31 Sam James
2022-01-16  0:24 Sam James
2022-01-15 22:14 Sam James
2022-01-15 22:14 Sam James
2022-01-15 22:14 Sam James
2022-01-13  1:25 Sam James
2021-11-06  6:03 Sam James
2021-11-06  6:03 Sam James
2021-11-06  6:03 Sam James
2021-11-06  6:03 Sam James
2021-11-04  7:35 Ionen Wolkens
2021-10-29 22:23 Sam James
2021-10-24  4:06 Sam James
2021-06-04  7:38 Joonas Niilola
2021-06-04  7:38 Joonas Niilola
2021-05-04 22:02 Sam James
2021-03-01  8:26 Joonas Niilola
2021-02-22 18:57 Sam James
2021-02-18  9:36 Joonas Niilola
2021-02-07 17:07 Conrad Kostecki
2020-10-26 10:15 Joonas Niilola
2020-04-27 14:42 Matthias Maier
2020-04-26 11:00 David Seifert
2020-04-01 14:38 Joonas Niilola
2020-01-03 19:08 Andreas Sturmlechner
2019-04-21 18:24 Andreas Sturmlechner
2019-02-06 22:38 Patrice Clement
2019-01-15 23:13 Patrice Clement
2018-04-05 12:31 Andreas Sturmlechner
2017-12-22 11:44 Michael Weber
2017-12-22 11:37 Michael Weber
2017-11-06  1:58 Andreas Sturmlechner
2017-06-04 22:52 Michael Weber
2017-01-31  8:37 Robin H. Johnson
2016-11-19 17:56 David Seifert
2016-11-06 10:29 David Seifert
2016-09-26 12:04 Michael Weber
2016-06-17 15:14 Michael Weber
2015-08-23 11:15 Michael Weber
2015-08-09 13:58 Michael Weber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:cf90cc0c8aa dfblob:080f7888f0b )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/" )
	(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=1641776549.62acc9193ee2728e613bb511a483ee16c8947ec1.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