[gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/

["Sam James" <sam@gentoo.org>]

commit:     7e6dd2ea7633bea9d8b3ff8ab037db8fa8a03eac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 17:58:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:49:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6dd2ea

dev-libs/imath: unslot OpenEXR

Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../imath/{imath-3.1.4-r1.ebuild => imath-3.1.4-r2.ebuild}  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dev-libs/imath/imath-3.1.4-r1.ebuild b/dev-libs/imath/imath-3.1.4-r2.ebuild
similarity index 86%
rename from dev-libs/imath/imath-3.1.4-r1.ebuild
rename to dev-libs/imath/imath-3.1.4-r2.ebuild
index 0c407bd3727e..d097a706b4dd 100644
--- a/dev-libs/imath/imath-3.1.4-r1.ebuild
+++ b/dev-libs/imath/imath-3.1.4-r2.ebuild
@@ -25,6 +25,7 @@ RESTRICT="!test? ( test )"
 # blocker due to file collision #803347
 RDEPEND="
 	!dev-libs/imath:0
+	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
 		${PYTHON_DEPS}
@@ -41,7 +42,6 @@ BDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-Gentoo-specific-changes-needed-for-slotting.patch )
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
 pkg_setup() {
@@ -49,15 +49,12 @@ 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
 	)
@@ -73,11 +70,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-src_install() {
-	cmake_src_install
-
-	newenvd - 99${PN}3 <<-EOF
-		LDPATH=${EPREFIX}/usr/$(get_libdir)/${MY_PN}-3
-	EOF
-}