gentoo resync : 12.07.2021

4 files changed, 2 insertions, 97 deletions

diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index ed9c2211a5ca..6d4235662cbb 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,11 +1,8 @@
-AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
 AUX pyilmbase-2.5.7-0001-disable-py2-for-boost.patch 578 BLAKE2B c9aff2ec269ea894e046bb265c6a69418c128f0d9dd54afc924138b6060d55b1ff1da6e8a9fc512b3097b8ff8acce0c03012748cdf10263945ce6f42dcec3424 SHA512 969c3d5bd676a471739feca443a938584a78b8903b71d75f51abdcd87e48a5ecaaab3132258905bad063165e9a4861ea9e6ce0d6b21844462e2adbbaea37fcff
 AUX pyilmbase-2.5.7-0002-install-imathnumpy.so.patch 643 BLAKE2B c46db3334236826e6f36343cefba88813427d1f18f12eae4692ebc33d765d44c600846840129ee2f2d79e9c1fa8b0c4489dbe292bab38be952009cb8b7e92222 SHA512 193142fe50a69568bad5c7034d5d6cf45c1a36cd517f1c71875a651fb7629263c53769050a9e5e7ddec699a9bd08f84d32d1dc3a8c29c5b3576c2741deaf2986
 AUX pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch 1214 BLAKE2B 45b03a70c2a24889bf1614d5a86aeaff1edf41f508b9622497603cff81fa7f04bc29037763568dfc569bd26c079ca75e3b6ebcec9cebe9e184fe650a9007f013 SHA512 6df211523617ff9e9561c9de7c853b11082a5633a4fda63fc59c2d03d251881aa8dfb9cf6bf0bba67b8c9d584a8d3512509bc2c0f5c3af2a79a70948552f6918
-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
-EBUILD pyilmbase-2.5.5.ebuild 1528 BLAKE2B 53c15d9d6f57246d04bc1ce5e846973fcbdaef51af9f2fd1610c2a4e8a993b01459650d4c732c3f83b585ae654c2d41ffc33e1412cc048047ac5e887dae14ac3 SHA512 9f956a1b3e8224ab95e6e364b8b8f80eb4b68a52f4c3b5b9dea85cff7320a9f9dcb66170ce45dea5ae1bf48dadbd1592430fdbc8b2b9a897aa1c328adf286698
 EBUILD pyilmbase-2.5.6.ebuild 1530 BLAKE2B 2d3dd8edc3b264abb8980320c2e785b3e2ffda1eaf1342ef226bc8a43856780fd557ea8729361594df31a624641ca2a9a12cdd75d74a9d8e50f5b04a5b4992d8 SHA512 8ef19f6c05652f73d734cdf6d04dbedb90a0e6e202a118b4e867ee35fc7d01f994c2abb3a6c3555b7cd25da11a6f0a17b4fad6f6c13a6c578c9cd7e03435ade2
-EBUILD pyilmbase-2.5.7.ebuild 1399 BLAKE2B 028e5b02ab8a852efef62057d9388a9406fab6aa1fb410bd9ca309567e2ce2cacee4332ae8a44ea29d9270d0260bd3db39f2fb4c4508ff08cf1148f7a5307664 SHA512 9d4fbf02c76f4268b08c84bdaf4c5e744aa2dbac57f937074f8e3d1893a40bc31d7dba97b958506efd5b3468bc4c560bbdfe7b16dcb357597bfb5b601d118911
+EBUILD pyilmbase-2.5.7.ebuild 1398 BLAKE2B 9fc95e65a2391a2a78710f9284f740c40057e11f1aa77b3b51428a3db076139f3adbb6810231763df563c559e11602f2079491c23116ae9a95de1dcb57487f43 SHA512 59c1b31b2ca9db64324bfd6829e5ff54882a41697309c36927b64f36953e626a75824fc586723580c6d9370ab19f24b7be3bc6936a4d6d0cacbcf4a64e48a692
 MISC metadata.xml 690 BLAKE2B 857ad16bdb3ab2ac35ca5d8e41a5e2302aa7e130c0dac5125135ba92569959b91278cfb3da987e4647aba4dab3898d7de9c6e340e20551379592a1c90d236882 SHA512 357ac1026fdacfdac7ced27c40fcf936a14dac7a044e8b168de7ac126811df67fb9e9ba01f8ee0fcf40ef86906abf37880fba6a782f27f832ca889de04ea4e58
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
deleted file mode 100644
index 6e8eb30cc474..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 34b8fd05781b61ce06263cdd22866a8bfc4be5b5 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 3 Jul 2020 22:01:18 +0200
-Subject: [PATCH] Fix pkgconfig file for PyIlmBase to include prefixes
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- config/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index 1872c89..44a9f2f 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 "\${exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
-     string(REPLACE ".in" "" pcout ${pcinfile})
-     configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
--- 
-2.27.0
-
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
deleted file mode 100644
index d254903b155f..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions +numpy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~media-libs/ilmbase-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
-		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-admin/chrpath
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-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
-}
-
-src_install() {
-	cmake_src_install
-	if use numpy; then
-		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
-		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-	fi
-}
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
index 53ab50f12750..5578bb6f7f68 100644
--- a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/PyIlmBase"
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="exceptions test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"