Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyilmbase/files/, dev-python/pyilmbase/
Date: Tue, 22 Jun 2021 18:35:27
Message-Id: 1624386907.99956560ab25b69d46b124327808015da988e7a2.sam@gentoo
1 commit: 99956560ab25b69d46b124327808015da988e7a2
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Tue Jun 22 10:57:33 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 22 18:35:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99956560
7
8 dev-python/pyilmbase: bump to 2.5.7
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
12 Closes: https://github.com/gentoo/gentoo/pull/21373
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 dev-python/pyilmbase/Manifest | 1 +
16 ...yilmbase-2.5.7-0001-disable-py2-for-boost.patch | 25 ++++++++++
17 ...yilmbase-2.5.7-0002-install-imathnumpy.so.patch | 22 +++++++++
18 .../pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch | 30 ++++++++++++
19 dev-python/pyilmbase/pyilmbase-2.5.7.ebuild | 55 ++++++++++++++++++++++
20 5 files changed, 133 insertions(+)
21
22 diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
23 index 9ddce510273..7aa142d0f3a 100644
24 --- a/dev-python/pyilmbase/Manifest
25 +++ b/dev-python/pyilmbase/Manifest
26 @@ -1,2 +1,3 @@
27 DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
28 DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
29 +DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
30
31 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
32 new file mode 100644
33 index 00000000000..73281e5ad6d
34 --- /dev/null
35 +++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
36 @@ -0,0 +1,25 @@
37 +From: Bernd Waibel <waebbl-gentoo@××××××.net>
38 +Date: Tue, 22 Jun 2021 11:08:15 +0200
39 +Subject: [PATCH] disable py2 for boost
40 +
41 +Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
42 +---
43 + CMakeLists.txt | 2 --
44 + 1 file changed, 2 deletions(-)
45 +
46 +diff --git a/CMakeLists.txt b/CMakeLists.txt
47 +index 291b96e..68b280d 100644
48 +--- a/CMakeLists.txt
49 ++++ b/CMakeLists.txt
50 +@@ -142,8 +142,6 @@ endif()
51 +
52 + find_package(Boost OPTIONAL_COMPONENTS
53 + python
54 +- python2
55 +- ${PYILMBASE_BOOST_PY2_COMPONENT}
56 + python3
57 + ${PYILMBASE_BOOST_PY3_COMPONENT})
58 + set(_pyilmbase_have_perver_boost)
59 +--
60 +2.32.0
61 +
62
63 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
64 new file mode 100644
65 index 00000000000..1aa4152dbbe
66 --- /dev/null
67 +++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
68 @@ -0,0 +1,22 @@
69 +From: Bernd Waibel <waebbl-gentoo@××××××.net>
70 +Date: Tue, 22 Jun 2021 11:46:30 +0200
71 +Subject: [PATCH 1/2] install imathnumpy.so
72 +
73 +Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
74 +---
75 + PyImathNumpy/CMakeLists.txt | 1 +
76 + 1 file changed, 1 insertion(+)
77 +
78 +diff --git a/PyImathNumpy/CMakeLists.txt b/PyImathNumpy/CMakeLists.txt
79 +index 7a70f06..2822127 100644
80 +--- a/PyImathNumpy/CMakeLists.txt
81 ++++ b/PyImathNumpy/CMakeLists.txt
82 +@@ -49,4 +49,5 @@ if(TARGET Python3::Python AND
83 + LIBRARY_OUTPUT_NAME "imathnumpy"
84 + DEBUG_POSTFIX ""
85 + )
86 ++ install(TARGETS imathnumpy_python3 DESTINATION ${PyIlmBase_Python3_SITEARCH_REL})
87 + endif()
88 +--
89 +2.32.0
90 +
91
92 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
93 new file mode 100644
94 index 00000000000..a28757cbf1d
95 --- /dev/null
96 +++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
97 @@ -0,0 +1,30 @@
98 +From 7469db402e2affb094585c374518765c69af703d Mon Sep 17 00:00:00 2001
99 +From: Bernd Waibel <waebbl-gentoo@××××××.net>
100 +Date: Tue, 22 Jun 2021 11:47:01 +0200
101 +Subject: [PATCH 2/2] fix pkgconfig file
102 +
103 +Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
104 +---
105 + config/CMakeLists.txt | 6 +++---
106 + 1 file changed, 3 insertions(+), 3 deletions(-)
107 +
108 +diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
109 +index a4139bc..45dcca4 100644
110 +--- a/config/CMakeLists.txt
111 ++++ b/config/CMakeLists.txt
112 +@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
113 + # use a helper function to avoid variable pollution, but pretty simple
114 + function(pyilmbase_pkg_config_help pcinfile)
115 + set(prefix ${CMAKE_INSTALL_PREFIX})
116 +- set(exec_prefix ${CMAKE_INSTALL_BINDIR})
117 +- set(libdir ${CMAKE_INSTALL_LIBDIR})
118 +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
119 ++ set(exec_prefix "\${prefix}")
120 ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
121 ++ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
122 + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
123 + set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
124 + string(REPLACE ".in" "" pcout ${pcinfile})
125 +--
126 +2.32.0
127 +
128
129 diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
130 new file mode 100644
131 index 00000000000..53ab50f1275
132 --- /dev/null
133 +++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
134 @@ -0,0 +1,55 @@
135 +# Copyright 1999-2021 Gentoo Authors
136 +# Distributed under the terms of the GNU General Public License v2
137 +
138 +EAPI=7
139 +
140 +PYTHON_COMPAT=( python3_{7..9} )
141 +inherit cmake python-single-r1
142 +
143 +DESCRIPTION="IlmBase Python bindings"
144 +HOMEPAGE="https://www.openexr.com"
145 +SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
146 +S="${WORKDIR}/openexr-${PV}/PyIlmBase"
147 +
148 +LICENSE="BSD"
149 +SLOT="0/25"
150 +KEYWORDS="~amd64 ~x86"
151 +IUSE="exceptions test"
152 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
153 +RESTRICT="!test? ( test )"
154 +
155 +RDEPEND="
156 + ${PYTHON_DEPS}
157 + ~media-libs/openexr-${PV}:=
158 + sys-libs/zlib
159 + $(python_gen_cond_dep '
160 + >=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
161 + >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
162 + ')
163 +"
164 +DEPEND="${RDEPEND}"
165 +BDEPEND="
166 + virtual/pkgconfig
167 +"
168 +
169 +PATCHES=(
170 + "${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
171 + "${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
172 + "${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
173 +)
174 +
175 +DOCS=( README.md )
176 +
177 +src_configure() {
178 + local mycmakeargs=(
179 + # starting with boost-1.76.0 we ship the cmake config files
180 + -DBoost_NO_BOOST_CMAKE=OFF
181 + -DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
182 + -DPYILMBASE_INSTALL_PKG_CONFIG=ON
183 + -DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
184 + -DPython3_EXECUTABLE="${PYTHON}"
185 + -DPython3_INCLUDE_DIR=$(python_get_includedir)
186 + -DPython3_LIBRARY=$(python_get_library_path)
187 + )
188 + cmake_src_configure
189 +}