commit: 99956560ab25b69d46b124327808015da988e7a2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Tue Jun 22 10:57:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 22 18:35:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99956560
dev-python/pyilmbase: bump to 2.5.7 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/21373 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/pyilmbase/Manifest | 1 + ...yilmbase-2.5.7-0001-disable-py2-for-boost.patch | 25 ++++++++++ ...yilmbase-2.5.7-0002-install-imathnumpy.so.patch | 22 +++++++++ .../pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch | 30 ++++++++++++ dev-python/pyilmbase/pyilmbase-2.5.7.ebuild | 55 ++++++++++++++++++++++ 5 files changed, 133 insertions(+) diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest index 9ddce510273..7aa142d0f3a 100644 --- a/dev-python/pyilmbase/Manifest +++ b/dev-python/pyilmbase/Manifest @@ -1,2 +1,3 @@ DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412 +DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40 diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch new file mode 100644 index 00000000000..73281e5ad6d --- /dev/null +++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch @@ -0,0 +1,25 @@ +From: Bernd Waibel <[email protected]> +Date: Tue, 22 Jun 2021 11:08:15 +0200 +Subject: [PATCH] disable py2 for boost + +Signed-off-by: Bernd Waibel <[email protected]> +--- + CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 291b96e..68b280d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,8 +142,6 @@ endif() + + find_package(Boost OPTIONAL_COMPONENTS + python +- python2 +- ${PYILMBASE_BOOST_PY2_COMPONENT} + python3 + ${PYILMBASE_BOOST_PY3_COMPONENT}) + set(_pyilmbase_have_perver_boost) +-- +2.32.0 + diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch new file mode 100644 index 00000000000..1aa4152dbbe --- /dev/null +++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch @@ -0,0 +1,22 @@ +From: Bernd Waibel <[email protected]> +Date: Tue, 22 Jun 2021 11:46:30 +0200 +Subject: [PATCH 1/2] install imathnumpy.so + +Signed-off-by: Bernd Waibel <[email protected]> +--- + PyImathNumpy/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/PyImathNumpy/CMakeLists.txt b/PyImathNumpy/CMakeLists.txt +index 7a70f06..2822127 100644 +--- a/PyImathNumpy/CMakeLists.txt ++++ b/PyImathNumpy/CMakeLists.txt +@@ -49,4 +49,5 @@ if(TARGET Python3::Python AND + LIBRARY_OUTPUT_NAME "imathnumpy" + DEBUG_POSTFIX "" + ) ++ install(TARGETS imathnumpy_python3 DESTINATION ${PyIlmBase_Python3_SITEARCH_REL}) + endif() +-- +2.32.0 + diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch new file mode 100644 index 00000000000..a28757cbf1d --- /dev/null +++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch @@ -0,0 +1,30 @@ +From 7469db402e2affb094585c374518765c69af703d Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <[email protected]> +Date: Tue, 22 Jun 2021 11:47:01 +0200 +Subject: [PATCH 2/2] fix pkgconfig file + +Signed-off-by: Bernd Waibel <[email protected]> +--- + config/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt +index a4139bc..45dcca4 100644 +--- a/config/CMakeLists.txt ++++ b/config/CMakeLists.txt +@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) + # use a helper function to avoid variable pollution, but pretty simple + function(pyilmbase_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) +- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) +- set(libdir ${CMAKE_INSTALL_LIBDIR}) +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(exec_prefix "\${prefix}") ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + string(REPLACE ".in" "" pcout ${pcinfile}) +-- +2.32.0 + diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild new file mode 100644 index 00000000000..53ab50f1275 --- /dev/null +++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit cmake python-single-r1 + +DESCRIPTION="IlmBase Python bindings" +HOMEPAGE="https://www.openexr.com"; +SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/openexr-${PV}/PyIlmBase" + +LICENSE="BSD" +SLOT="0/25" +KEYWORDS="~amd64 ~x86" +IUSE="exceptions test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + ~media-libs/openexr-${PV}:= + sys-libs/zlib + $(python_gen_cond_dep ' + >=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}] + >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] + ') +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch + "${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch + "${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch +) + +DOCS=( README.md ) + +src_configure() { + local mycmakeargs=( + # starting with boost-1.76.0 we ship the cmake config files + -DBoost_NO_BOOST_CMAKE=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON + -DPYILMBASE_INSTALL_PKG_CONFIG=ON + -DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions) + -DPython3_EXECUTABLE="${PYTHON}" + -DPython3_INCLUDE_DIR=$(python_get_includedir) + -DPython3_LIBRARY=$(python_get_library_path) + ) + cmake_src_configure +}
