summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl-gentoo@posteo.net>2022-03-06 10:21:06 +0100
committerJoonas Niilola <juippis@gentoo.org>2022-03-06 19:30:20 +0200
commitab5b20e5ccba9d46e15cd4bea75801f223839a82 (patch)
treea0f982db17b2f0e5b92ec1e77539bec4a96b834a /dev-libs/imath
parentmail-client/thunderbird: security stabilization on 91.6.2 for amd64 (diff)
downloadgentoo-ab5b20e5ccba9d46e15cd4bea75801f223839a82.tar.gz
gentoo-ab5b20e5ccba9d46e15cd4bea75801f223839a82.tar.bz2
gentoo-ab5b20e5ccba9d46e15cd4bea75801f223839a82.zip
dev-libs/imath: drop ~3.1.3
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/24418 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-libs/imath')
-rw-r--r--dev-libs/imath/Manifest1
-rw-r--r--dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch162
-rw-r--r--dev-libs/imath/imath-3.1.3-r1.ebuild84
-rw-r--r--dev-libs/imath/imath-3.1.3.ebuild76
4 files changed, 0 insertions, 323 deletions
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 435be67a7942..eee626f653da 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,2 +1 @@
-DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
DIST imath-3.1.4.tar.gz 572214 BLAKE2B 6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49992fb8b0e2264d51d47e9c2297940b3a484e1f59bd8b251e8ef42d81ae88282d0769c111b3cd84cd0a9354e SHA512 f9f7d8ec333e6383191543ee927dc40e870a6330225b01070bb93ad3d149c5e31bd5989d4dc52f3321490c1c5a7cab55582c6e42e34ab4ca5723170e7578e286
diff --git a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index baa6a84bfb83..000000000000
--- a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 19073a8ed52dbc02b64be4cb55a6203dbf36707e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 24 Jul 2021 22:28:34 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- 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 4868954..60b6532 100644
---- a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -87,8 +87,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}
-@@ -101,8 +101,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(STATUS \"Creating symlink ${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(STATUS \"Creating symlink ${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(STATUS \"Creating symlink ${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 7e30614..40d9032 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.1.3-r1.ebuild b/dev-libs/imath/imath-3.1.3-r1.ebuild
deleted file mode 100644
index ee484855491a..000000000000
--- a/dev-libs/imath/imath-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 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 ~riscv ~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
-}
-
-src_install() {
- cmake_src_install
-
- newenvd - 99${PN}3 <<-EOF
- LDPATH=${EPREFIX}/usr/$(get_libdir)/${MY_PN}-3
- EOF
-}
diff --git a/dev-libs/imath/imath-3.1.3.ebuild b/dev-libs/imath/imath-3.1.3.ebuild
deleted file mode 100644
index 9fde70f03b53..000000000000
--- a/dev-libs/imath/imath-3.1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 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 ~riscv ~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
-}