gentoo auto-resync : 30:10:2022 - 15:03:33

4 files changed, 6 insertions, 159 deletions

diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 648214bec78d..3e8833262807 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,8 +1,5 @@
-AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
 AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe025440481bfa8a68085d4bd0a46decb5dff9c6ce743ebc0dd30bcd8f3333fc45e041db19e420bc86ce1d1965a084a788882c7d68f1423c884ff8fe SHA512 861683353000e0c25991b64ab70af3839641d6e01f48756798acd5903124890d646fe4f9ef54f6c22c4d857994f2d0adc415dcd83534fb85300e6dbc5128631d
 AUX yafaray-3.5.1-add-missing-limits-header.patch 556 BLAKE2B ef63f5deba7c633917030b34ddf2c7a48bbcf412d99f48a1be89761c6dd19a67082560b2d0bb7dc440b7d0e9db73d708068eec7566ebc4038098faaf31aa269f SHA512 89ff060607e69a5ca0d2fb3ef2651e22e4a2ff5adae7351df2195267f2236792e7feae9a761882f3debc04bff4c83760a6704598643fb0a60ba37af698752032
 DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
-DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
-EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-EBUILD yafaray-3.5.1-r1.ebuild 3164 BLAKE2B 3910145cea120b6375363b9f9e03aec7ce50f96f3817a91b0165a956fd23ef2de7eaba3c2c7b93e4abbd7936c1285517527adb02d89699faa78a42da1f0311be SHA512 0c79329142ee3d14ceda69eca5af243ff4f9c5c0d3e9198ef6e7aaa436fa64eac8ce35e1cc79bd370447b73d1d9f12c4d6a02295f768eb39c27c708f4064f681
+EBUILD yafaray-3.5.1-r2.ebuild 3129 BLAKE2B 43d0702023ac71cd60caaa7257756ba91308885ecc62a33550f708427c8b617eaef0eabc39e6bc1366fce5c96c1c66a88fa12b5ba0c916531ed8e4d314a3aae0 SHA512 a0688b31d8110f17fe843ec0d0837600a897aeef46bed71f838fa826f1bf9324b7bfe8b00c4e64cd782d1d23366949b72a8df1c802a194e831f6d312daa6ed38
 MISC metadata.xml 1090 BLAKE2B 7ce4d1b50e06300184c5cd969e0ba20c3c4ef63471d81646392411528599c429747a36eb5505a2f718867853c9ecd505a04d870ac0b29456f031dc32713606d3 SHA512 f1e56401173a07a15cd5fbce265d47ad09a8745300abffe77310c3eff8d8e18e3bfe2003750863c238e7f25c3e6009197c2fdf6e788c0767e1c4fffdc74ddea4
diff --git a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
deleted file mode 100644
index 90b2786c3c54..000000000000
--- a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2f77edf05ed02955dc08821f322a529063dbfa28 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 19 Apr 2020 15:39:45 +0200
-Subject: [PATCH] Respect user pre-defined CXXFLAGS
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 047456f..6733b7d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -224,7 +224,7 @@ if(NOT WIN32)
- 	endif(NOT YAF_BINDINGS_RUBY_DIR)
- 
- 	# build flags
--	set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
- 	
- 	if(USER_RELEASE_OPTIMIZATION_FLAGS)
- 		set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
-@@ -263,7 +263,7 @@ else(NOT WIN32)
- 
- 	# build flags
- 	if(MINGW)
--		set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
-+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
- 
- 		if(USER_RELEASE_OPTIMIZATION_FLAGS)
- 			set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
--- 
-2.26.1
-
diff --git a/media-gfx/yafaray/yafaray-3.4.1.ebuild b/media-gfx/yafaray/yafaray-3.4.1.ebuild
deleted file mode 100644
index 4efd96180ca1..000000000000
--- a/media-gfx/yafaray/yafaray-3.4.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-# doesn't build with ninja when qt5 and python USE flags are both enabled
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A free open-source montecarlo raytracing engine"
-HOMEPAGE="http://www.yafaray.org"
-SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz"
-
-S="${WORKDIR}/Core-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
-RESTRICT="test"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Note: according to upstream, the blender plugin doesn't work with blender-2.8 (yet).
-RDEPEND="
-	dev-libs/boost:=[nls]
-	dev-libs/libxml2:2
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-3.1.0:= )
-	openexr? ( >=media-libs/openexr-2.2.0:= )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtwidgets:5 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="python? ( dev-lang/swig )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Respect-user-pre-defined-CXXFLAGS.patch"
-)
-
-DOCS=( AUTHORS CHANGELOG CODING INSTALL README )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	append-flags -pthread
-	append-ldflags -pthread
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# enabling BLENDER_ADDON doesn't build anything, but set's some wierd
-		# installation paths, so keep it off and install the files manually.
-		-DBLENDER_ADDON=OFF
-		-DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
-		-DFAST_MATH=$(usex fastmath)
-		-DFAST_TRIG=$(usex fasttrig)
-		-DWITH_Freetype=$(usex truetype)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OpenCV=$(usex opencv)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_PNG=$(usex png)
-		-DWITH_QT=$(usex qt5)
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_XML_LOADER=ON		# internal
-		-DWITH_YAF_PY_BINDINGS=$(usex python)
-		-DWITH_YAF_RUBY_BINDINGS=OFF
-		-DYAF_LIB_DIR=$(get_libdir)
-	)
-
-	if use python; then
-		mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use python; then
-		python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
-		mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die
-		rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die
-
-		if use qt5; then
-			python_domodule "${BUILD_DIR}/src/bindings/yafqt.py"
-			mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die
-			rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die
-		fi
-	fi
-
-	rm -rv "${ED}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	einfo "To confirm your installation is working as expected, run"
-	einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
-	einfo "as an input file, then compare the result to"
-	einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
-}
diff --git a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild b/media-gfx/yafaray/yafaray-3.5.1-r2.ebuild
index 9053e381aba3..1da10dced60a 100644
--- a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 # doesn't build with ninja when qt5 and python USE flags are both enabled
 CMAKE_MAKEFILE_GENERATOR="emake"
@@ -19,7 +19,7 @@ S="${WORKDIR}/libYafaRay-${PV}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype"
+IUSE="+fastmath +fasttrig jpeg opencv png python qt5 tiff truetype"
 RESTRICT="test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,9 +28,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	dev-libs/libxml2:2
 	sys-libs/zlib
-	jpeg? ( virtual/jpeg )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	opencv? ( media-libs/opencv:= )
-	openexr? ( <media-libs/openexr-3.0.0:0= )
 	png? ( media-libs/libpng:= )
 	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtwidgets:5 )
@@ -73,7 +72,7 @@ src_configure() {
 		-DWITH_Freetype=$(usex truetype)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_OpenCV=$(usex opencv)
-		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_OpenEXR=OFF # bug #877865
 		-DWITH_PNG=$(usex png)
 		-DWITH_QT=$(usex qt5)
 		-DWITH_TIFF=$(usex tiff)