1 |
commit: 06799a550f46ca1e22380b0ade02f526e98d6bcf |
2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
3 |
AuthorDate: Sat Jul 24 20:09:13 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 1 06:39:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06799a55 |
7 |
|
8 |
dev-libs/imath: bump to 3.1.1 |
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/21774 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
dev-libs/imath/Manifest | 1 + |
16 |
...1-0001-changes-needed-for-proper-slotting.patch | 162 +++++++++++++++++++++ |
17 |
dev-libs/imath/imath-3.1.1.ebuild | 92 ++++++++++++ |
18 |
3 files changed, 255 insertions(+) |
19 |
|
20 |
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest |
21 |
index 1cdecf3c54b..5190cfb234c 100644 |
22 |
--- a/dev-libs/imath/Manifest |
23 |
+++ b/dev-libs/imath/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2 |
26 |
+DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d |
27 |
|
28 |
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 |
29 |
new file mode 100644 |
30 |
index 00000000000..baa6a84bfb8 |
31 |
--- /dev/null |
32 |
+++ b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch |
33 |
@@ -0,0 +1,162 @@ |
34 |
+From 19073a8ed52dbc02b64be4cb55a6203dbf36707e Mon Sep 17 00:00:00 2001 |
35 |
+From: Bernd Waibel <waebbl-gentoo@××××××.net> |
36 |
+Date: Sat, 24 Jul 2021 22:28:34 +0200 |
37 |
+Subject: [PATCH] changes needed for proper slotting |
38 |
+ |
39 |
+Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
40 |
+--- |
41 |
+ config/CMakeLists.txt | 6 +++--- |
42 |
+ config/Imath.pc.in | 4 ++-- |
43 |
+ config/LibraryDefine.cmake | 8 ++++---- |
44 |
+ src/python/PyImath.pc.in | 4 ++-- |
45 |
+ src/python/PyImathNumpy/CMakeLists.txt | 2 +- |
46 |
+ src/python/config/CMakeLists.txt | 4 ++-- |
47 |
+ src/python/config/ModuleDefine.cmake | 6 +++--- |
48 |
+ 7 files changed, 17 insertions(+), 17 deletions(-) |
49 |
+ |
50 |
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt |
51 |
+index d51c25b..63cc98d 100644 |
52 |
+--- a/config/CMakeLists.txt |
53 |
++++ b/config/CMakeLists.txt |
54 |
+@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers) |
55 |
+ |
56 |
+ configure_package_config_file(ImathConfig.cmake.in |
57 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake |
58 |
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
59 |
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} |
60 |
+ ) |
61 |
+ |
62 |
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" |
63 |
+@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" |
64 |
+ |
65 |
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake |
66 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake |
67 |
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
68 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} |
69 |
+ ) |
70 |
+ |
71 |
+ install(EXPORT ${PROJECT_NAME} |
72 |
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
73 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} |
74 |
+ FILE ${PROJECT_NAME}Targets.cmake |
75 |
+ NAMESPACE ${PROJECT_NAME}:: |
76 |
+ EXPORT_LINK_INTERFACE_LIBRARIES |
77 |
+diff --git a/config/Imath.pc.in b/config/Imath.pc.in |
78 |
+index df11cfd..6eb4f40 100644 |
79 |
+--- a/config/Imath.pc.in |
80 |
++++ b/config/Imath.pc.in |
81 |
+@@ -5,7 +5,7 @@ |
82 |
+ |
83 |
+ prefix=@prefix@ |
84 |
+ exec_prefix=@exec_prefix@ |
85 |
+-libdir=@libdir@ |
86 |
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@ |
87 |
+ includedir=@includedir@ |
88 |
+ libsuffix=@LIB_SUFFIX_DASH@ |
89 |
+ Name: Imath |
90 |
+@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@ |
91 |
+ Requires: |
92 |
+ Conflicts: |
93 |
+ Libs: -L${libdir} -lImath${libsuffix} |
94 |
+-Cflags: -I${includedir} -I${includedir}/Imath |
95 |
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@ |
96 |
+diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake |
97 |
+index 4868954..60b6532 100644 |
98 |
+--- a/config/LibraryDefine.cmake |
99 |
++++ b/config/LibraryDefine.cmake |
100 |
+@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname) |
101 |
+ install(TARGETS ${libname} |
102 |
+ EXPORT ${PROJECT_NAME} |
103 |
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
104 |
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
105 |
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
106 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} |
107 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} |
108 |
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
109 |
+ PUBLIC_HEADER |
110 |
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR} |
111 |
+@@ -101,8 +101,8 @@ function(IMATH_DEFINE_LIBRARY libname) |
112 |
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") |
113 |
+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_BINDIR}/${baselibname} -> ${verlibname}\")") |
114 |
+ else() |
115 |
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") |
116 |
+- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")") |
117 |
++ 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})") |
118 |
++ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")") |
119 |
+ endif() |
120 |
+ set(verlibname) |
121 |
+ set(baselibname) |
122 |
+diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in |
123 |
+index 8e8de6f..1902660 100644 |
124 |
+--- a/src/python/PyImath.pc.in |
125 |
++++ b/src/python/PyImath.pc.in |
126 |
+@@ -5,7 +5,7 @@ |
127 |
+ |
128 |
+ prefix=@prefix@ |
129 |
+ exec_prefix=@exec_prefix@ |
130 |
+-libdir=@libdir@ |
131 |
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@ |
132 |
+ includedir=@includedir@ |
133 |
+ libsuffix=@LIB_SUFFIX_DASH@ |
134 |
+ |
135 |
+@@ -13,4 +13,4 @@ Name: PyImath |
136 |
+ Description: Python bindings for the Imath libraries |
137 |
+ Version: @IMATH_VERSION@ |
138 |
+ Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix} |
139 |
+-Cflags: -I${includedir} -I${includedir}/Imath |
140 |
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@ |
141 |
+diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt |
142 |
+index 7b4f6b2..8f7fd70 100644 |
143 |
+--- a/src/python/PyImathNumpy/CMakeLists.txt |
144 |
++++ b/src/python/PyImathNumpy/CMakeLists.txt |
145 |
+@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND |
146 |
+ LIBRARY_OUTPUT_NAME "imathnumpy" |
147 |
+ DEBUG_POSTFIX "" |
148 |
+ ) |
149 |
+- install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}) |
150 |
++ install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR}) |
151 |
+ endif() |
152 |
+diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt |
153 |
+index 4f796df..15d7026 100644 |
154 |
+--- a/src/python/config/CMakeLists.txt |
155 |
++++ b/src/python/config/CMakeLists.txt |
156 |
+@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" |
157 |
+ COMPATIBILITY SameMajorVersion |
158 |
+ ) |
159 |
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake |
160 |
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
161 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} |
162 |
+ ) |
163 |
+ install(EXPORT ${PROJECT_NAME} |
164 |
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
165 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR} |
166 |
+ FILE ${PROJECT_NAME}Config.cmake |
167 |
+ NAMESPACE ${PROJECT_NAME}:: |
168 |
+ EXPORT_LINK_INTERFACE_LIBRARIES |
169 |
+diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake |
170 |
+index 7e30614..40d9032 100644 |
171 |
+--- a/src/python/config/ModuleDefine.cmake |
172 |
++++ b/src/python/config/ModuleDefine.cmake |
173 |
+@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname) |
174 |
+ install(TARGETS ${libname} |
175 |
+ EXPORT ${PROJECT_NAME} |
176 |
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
177 |
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
178 |
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
179 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} |
180 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} |
181 |
+ ) |
182 |
+ endfunction() |
183 |
+ |
184 |
+@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname) |
185 |
+ LIBRARY_OUTPUT_NAME "${modname}" |
186 |
+ DEBUG_POSTFIX "" |
187 |
+ ) |
188 |
+- install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}) |
189 |
++ install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR}) |
190 |
+ endif() |
191 |
+ endif() |
192 |
+ endfunction() |
193 |
+-- |
194 |
+2.32.0 |
195 |
+ |
196 |
|
197 |
diff --git a/dev-libs/imath/imath-3.1.1.ebuild b/dev-libs/imath/imath-3.1.1.ebuild |
198 |
new file mode 100644 |
199 |
index 00000000000..d941bc77d92 |
200 |
--- /dev/null |
201 |
+++ b/dev-libs/imath/imath-3.1.1.ebuild |
202 |
@@ -0,0 +1,92 @@ |
203 |
+# Copyright 1999-2021 Gentoo Authors |
204 |
+# Distributed under the terms of the GNU General Public License v2 |
205 |
+ |
206 |
+EAPI=7 |
207 |
+ |
208 |
+PYTHON_COMPAT=( python3_{8..10} ) |
209 |
+ |
210 |
+inherit cmake python-single-r1 |
211 |
+ |
212 |
+MY_PN="${PN^}" |
213 |
+ |
214 |
+DESCRIPTION="Imath basic math package" |
215 |
+HOMEPAGE="https://imath.readthedocs.io" |
216 |
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
217 |
+# re-keywording needed for (according to ilmbase keywords): |
218 |
+# ~mips ~x64-macos ~x86-solaris |
219 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
220 |
+S="${WORKDIR}/${MY_PN}-${PV}" |
221 |
+ |
222 |
+LICENSE="BSD" |
223 |
+SLOT="3/29" |
224 |
+IUSE="doc large-stack python static-libs test" |
225 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
226 |
+RESTRICT="!test? ( test )" |
227 |
+ |
228 |
+# blocker due to file collision #803347 |
229 |
+RDEPEND=" |
230 |
+ !dev-libs/imath:0 |
231 |
+ sys-libs/zlib |
232 |
+ python? ( |
233 |
+ ${PYTHON_DEPS} |
234 |
+ $(python_gen_cond_dep ' |
235 |
+ dev-libs/boost:=[python,${PYTHON_USEDEP}] |
236 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
237 |
+ ') |
238 |
+ ) |
239 |
+" |
240 |
+DEPEND="${RDEPEND}" |
241 |
+BDEPEND=" |
242 |
+ virtual/pkgconfig |
243 |
+ doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') ) |
244 |
+ python? ( ${PYTHON_DEPS} ) |
245 |
+" |
246 |
+ |
247 |
+PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch ) |
248 |
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md ) |
249 |
+ |
250 |
+pkg_setup() { |
251 |
+ use python && python-single-r1_pkg_setup |
252 |
+} |
253 |
+ |
254 |
+src_configure() { |
255 |
+ local majorver=$(ver_cut 1) |
256 |
+ |
257 |
+ local mycmakeargs=( |
258 |
+ -DBUILD_SHARED_LIBS=$(usex !static-libs) |
259 |
+ -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) |
260 |
+ -DIMATH_HALF_USE_LOOKUP_TABLE=ON |
261 |
+ -DIMATH_INSTALL_PKG_CONFIG=ON |
262 |
+ -DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}" |
263 |
+ -DIMATH_USE_CLANG_TIDY=OFF |
264 |
+ -DIMATH_USE_NOEXCEPT=ON |
265 |
+ ) |
266 |
+ if use python; then |
267 |
+ mycmakeargs+=( |
268 |
+ # temp. disable for finding libboost_python310, #803032 |
269 |
+ #-DBoost_NO_BOOST_CMAKE=OFF |
270 |
+ -DPYTHON=ON |
271 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
272 |
+ -DPython3_INCLUDE_DIR=$(python_get_includedir) |
273 |
+ -DPython3_LIBRARY=$(python_get_library_path) |
274 |
+ ) |
275 |
+ fi |
276 |
+ |
277 |
+ cmake_src_configure |
278 |
+} |
279 |
+ |
280 |
+src_compile() { |
281 |
+ cmake_src_compile |
282 |
+ |
283 |
+ if use doc; then |
284 |
+ pushd "${S}"/docs 2>/dev/null || die |
285 |
+ doxygen || die |
286 |
+ emake html |
287 |
+ popd 2>/dev/null || die |
288 |
+ fi |
289 |
+} |
290 |
+ |
291 |
+src_install() { |
292 |
+ use doc && HTML_DOCS=( "${S}/docs/_build/html/." ) |
293 |
+ cmake_src_install |
294 |
+} |