From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- dev-libs/imath/Manifest | 5 +- ...5-0001-changes-needed-for-proper-slotting.patch | 161 --------------------- dev-libs/imath/imath-3.0.5-r1.ebuild | 94 ------------ dev-libs/imath/imath-3.1.3.ebuild | 76 ++++++++++ 4 files changed, 78 insertions(+), 258 deletions(-) delete mode 100644 dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch delete mode 100644 dev-libs/imath/imath-3.0.5-r1.ebuild create mode 100644 dev-libs/imath/imath-3.1.3.ebuild (limited to 'dev-libs/imath') diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index e0fda7659fa3..e5620258b83f 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1,7 +1,6 @@ -AUX imath-3.0.5-0001-changes-needed-for-proper-slotting.patch 7130 BLAKE2B a041a7ce654c32443457b34d9c2c4d0d919b9fe373971675ec265218dff7f8a2b470a44e7af44d27cb4d8c8c4b8f3e405b4b9762e7f8cfa8ad84db9c37f4baf0 SHA512 6407eaf9041105da66bfd70fa6e8b99813f938636dfda10b29aa078c445244b0f188f097bd4540ab3e1f1113faff6e1e7531df5ebbba28b7ab511ebbdae297a4 AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7 -DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2 DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d -EBUILD imath-3.0.5-r1.ebuild 2307 BLAKE2B ea32f43a16047b17499fdbee21978bd3ad824bdc0fa543e31f0ac63b8694f084968fe19e746a2f0d40d92b82fb2501b3342d90cfa7587e33cb775af6814e1a52 SHA512 8bf1d5a7047b62bc5036b38e1d4ae5c5ccd41ac15c6f28de89cec79a5db30ba199e50406075772aa5b74c47ca4e25bf1caccd989b89817930c512aa550dd1eb8 +DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75 EBUILD imath-3.1.1.ebuild 2246 BLAKE2B 952a2801dcad6d79c53bb5375f391e9f4e0827b1f0b9c2837a13e77df08baaeb101ed8532ec30012ae2fa05d71f75ff18a9a5e239a148358e19225058a444a2d SHA512 eb9ac6c21b0c8ce528644999da28e0beb6653b860c160961def13f933c7e0af9f3b1439b8224b916851815a6767b0b8ee2fb063a0baf41666f26328c24175e66 +EBUILD imath-3.1.3.ebuild 2020 BLAKE2B a2e3fe8154387da1b3c4da28b5ee1bf398d55ec51a7a079b9a35b5bca9ad1f62a4268d639f4615c7bb563f81a68fcebdb37ac5a860ca527f2393e1e0b914ce3a SHA512 142571ae60baeeec6004a4bdf304bc60a27b25d8ffc744fa867cb51db049019586742cdeb78a0d95c036370c18fc5ff329658291370c81eb13805cf284f42dfc MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4 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 deleted file mode 100644 index 74d0f2dff7d7..000000000000 --- a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch +++ /dev/null @@ -1,161 +0,0 @@ -From: Bernd Waibel -Date: Tue, 20 Jul 2021 19:18:20 +0200 -Subject: [PATCH] changes needed for proper slotting - -Signed-off-by: Bernd Waibel ---- - 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-r1.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild deleted file mode 100644 index f2fc31012332..000000000000 --- a/dev-libs/imath/imath-3.0.5-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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="${PN^}" - -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 ~arm ~arm64 ~hppa ~ia64 ~mips ~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? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -# blocker due to file collision #803347 -RDEPEND=" - !dev-libs/imath:0 - sys-libs/zlib - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_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 majorver=$(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}-${majorver}" - -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() { - use doc && HTML_DOCS=( "${S}/docs/_build/html/." ) - cmake_src_install - -# if use python; then -# rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die -# fi -} diff --git a/dev-libs/imath/imath-3.1.3.ebuild b/dev-libs/imath/imath-3.1.3.ebuild new file mode 100644 index 000000000000..8ce94a93b3bc --- /dev/null +++ b/dev-libs/imath/imath-3.1.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +MY_PN="${PN^}" + +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): ~x64-macos ~x86-solaris +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="BSD" +SLOT="3/29" +IUSE="doc large-stack python static-libs test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +# blocker due to file collision #803347 +RDEPEND=" + !dev-libs/imath:0 + sys-libs/zlib + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') ) + python? ( ${PYTHON_DEPS} ) +" + +PATCHES=( "${FILESDIR}"/${PN}-3.1.1-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 majorver=$(ver_cut 1) + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DDOCS=$(usex doc) + -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) + -DIMATH_HALF_USE_LOOKUP_TABLE=ON + -DIMATH_INSTALL_PKG_CONFIG=ON + -DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}" + -DIMATH_USE_CLANG_TIDY=OFF + -DIMATH_USE_NOEXCEPT=ON + ) + 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 +} -- cgit v1.2.3