commit: 71d6e5e593b60dbe0d12c330b8b2f2d95369959b Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Fri May 14 08:16:40 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Jul 21 21:57:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d6e5e5
dev-libs/imath: bump to 3.0.5 Move package to a new slot, to enable parallel installations of dev-libs/imath and media-libs/ilmbase, dev-python/pyilmbase Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> dev-libs/imath/Manifest | 1 + ...5-0001-changes-needed-for-proper-slotting.patch | 161 +++++++++++++++++++++ dev-libs/imath/imath-3.0.5.ebuild | 96 ++++++++++++ 3 files changed, 258 insertions(+) diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index 6778d92c9bd..29ce5f6f448 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1 +1,2 @@ DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988 +DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2 diff --git a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch new file mode 100644 index 00000000000..74d0f2dff7d --- /dev/null +++ b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch @@ -0,0 +1,161 @@ +From: Bernd Waibel <[email protected]> +Date: Tue, 20 Jul 2021 19:18:20 +0200 +Subject: [PATCH] changes needed for proper slotting + +Signed-off-by: Bernd Waibel <[email protected]> +--- + config/CMakeLists.txt | 6 +++--- + config/Imath.pc.in | 4 ++-- + config/LibraryDefine.cmake | 8 ++++---- + src/python/PyImath.pc.in | 4 ++-- + src/python/PyImathNumpy/CMakeLists.txt | 2 +- + src/python/config/CMakeLists.txt | 4 ++-- + src/python/config/ModuleDefine.cmake | 6 +++--- + 7 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt +index d51c25b..63cc98d 100644 +--- a/config/CMakeLists.txt ++++ b/config/CMakeLists.txt +@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers) + + configure_package_config_file(ImathConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} + ) + + write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" +@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} + ) + + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/config/Imath.pc.in b/config/Imath.pc.in +index df11cfd..6eb4f40 100644 +--- a/config/Imath.pc.in ++++ b/config/Imath.pc.in +@@ -5,7 +5,7 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ ++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@ + includedir=@includedir@ + libsuffix=@LIB_SUFFIX_DASH@ + Name: Imath +@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@ + Requires: + Conflicts: + Libs: -L${libdir} -lImath${libsuffix} +-Cflags: -I${includedir} -I${includedir}/Imath ++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@ +diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake +index e9ff904..00e5176 100644 +--- a/config/LibraryDefine.cmake ++++ b/config/LibraryDefine.cmake +@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname) + install(TARGETS ${libname} + EXPORT ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + PUBLIC_HEADER + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR} +@@ -88,8 +88,8 @@ function(IMATH_DEFINE_LIBRARY libname) + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") + else() +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") ++ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")") + endif() + set(verlibname) + set(baselibname) +diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in +index 8e8de6f..1902660 100644 +--- a/src/python/PyImath.pc.in ++++ b/src/python/PyImath.pc.in +@@ -5,7 +5,7 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ ++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@ + includedir=@includedir@ + libsuffix=@LIB_SUFFIX_DASH@ + +@@ -13,4 +13,4 @@ Name: PyImath + Description: Python bindings for the Imath libraries + Version: @IMATH_VERSION@ + Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix} +-Cflags: -I${includedir} -I${includedir}/Imath ++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@ +diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt +index 7b4f6b2..8f7fd70 100644 +--- a/src/python/PyImathNumpy/CMakeLists.txt ++++ b/src/python/PyImathNumpy/CMakeLists.txt +@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND + LIBRARY_OUTPUT_NAME "imathnumpy" + DEBUG_POSTFIX "" + ) +- install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}) ++ install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR}) + endif() +diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt +index 4f796df..15d7026 100644 +--- a/src/python/config/CMakeLists.txt ++++ b/src/python/config/CMakeLists.txt +@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + COMPATIBILITY SameMajorVersion + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} + FILE ${PROJECT_NAME}Config.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake +index d9a8907..ebe1a95 100644 +--- a/src/python/config/ModuleDefine.cmake ++++ b/src/python/config/ModuleDefine.cmake +@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname) + install(TARGETS ${libname} + EXPORT ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} + ) + endfunction() + +@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname) + LIBRARY_OUTPUT_NAME "${modname}" + DEBUG_POSTFIX "" + ) +- install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}) ++ install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR}) + endif() + endif() + endfunction() +-- +2.32.0 + diff --git a/dev-libs/imath/imath-3.0.5.ebuild b/dev-libs/imath/imath-3.0.5.ebuild new file mode 100644 index 00000000000..184a8b00f47 --- /dev/null +++ b/dev-libs/imath/imath-3.0.5.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +MY_PN=Imath + +DESCRIPTION="Imath basic math package" +HOMEPAGE="https://imath.readthedocs.io"; +SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +# re-keywording needed for (according to ilmbase keywords): +# ~arm ~arm64 ~mips ~x64-macos ~x86-solaris +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="BSD" +SLOT="3/28" +IUSE="doc large-stack python static-libs test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_MULTI_USEDEP}]') ) + python? ( ${PYTHON_DEPS} ) +" + +PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch ) +DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local MY_PV=$(ver_cut 1) + local mycmakeargs=( + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) + -DIMATH_INSTALL_PKG_CONFIG=ON + -DIMATH_OUTPUT_SUBDIR="${MY_PN}-${MY_PV}" + -DIMATH_USE_CLANG_TIDY=OFF + ) + + if use python; then + mycmakeargs+=( + # temp. disable for finding libboost_python310, #803032 + #-DBoost_NO_BOOST_CMAKE=OFF + -DPYTHON=ON + -DPython3_EXECUTABLE="${PYTHON}" + -DPython3_INCLUDE_DIR=$(python_get_includedir) + -DPython3_LIBRARY=$(python_get_library_path) + ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + pushd "${S}"/docs 2>/dev/null || die + doxygen || die + emake html + popd 2>/dev/null || die + fi +} + +src_install() { + cmake_src_install + + if use doc; then + HTML_DOCS=( "${S}/docs/_build/html/." ) + einstalldocs + fi + +# if use python; then +# rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die +# fi +}
