gentoo resync : 12.03.2021

3 files changed, 130 insertions, 6 deletions

diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index cd7414fb4ce6..82b7081f1d17 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,4 +1,6 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
+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
-MISC metadata.xml 1048 BLAKE2B f05a3c07c3f5e1f9a11112c4053ff0685a5cdb72f242d3127cb0e20ede25e1076e22f326619c2a782441b66bdf12d48fb841049ef99e6cf1a7cbb68cd4e3a7c9 SHA512 640b4568d7d15b043747e644d0e75864f02934c93d99399086ff5afb1a0a01d6396de31207f9902afc5015065ee06618a87570cc53d6dd9f0c0611a027897c12
+EBUILD yafaray-3.5.1.ebuild 3033 BLAKE2B 30c47e083bb1b15226142ac35265d73745d1e6bcfd8b1b03f8d6834e6b1f6ce7230fe3f610b45e0360b905c9c23d86bd5c3536ba85fba41b44985cabe9905cf1 SHA512 a72113718e7cf63bdf5bb4116be027cbb61d121c988460754f239a6484ca62e0dab237784e9443856fccd640ba160ed9bc8783dde5b59b65f87d82bf6943aadd
+MISC metadata.xml 1060 BLAKE2B b9000a78998846ab5f48afbed71afe450edcafd0251e2fa1390719d766b74b803732916f943c458c56ec6e50db6a4f17c1bd298dbfd20bedf22307e8aa58bb48 SHA512 f61ba34063cc4bea75398a379a82f666f0b85b5d9f1ade9ec98b358ac7a758809fa4c7fd7f919ae10dc6f491b7b1d20ea062a0a1d77f051ad504925849ea8b69
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 2c614e94cc33..1200537158aa 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -10,13 +10,23 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-		YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
-		An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
+		YafaRay is a raytracing open source render engine. Raytracing is a
+		rendering technique for generating realistic images by tracing the
+		path of light through a 3D scene.
+		An render engine consists of a "faceless" computer program that
+		interacts with a host 3D application to provide very specific
+		raytracing capabilties "on demand".
 	</longdescription>
 	<use>
-		<flag name="fastmath">Enable mathematic approximations to make code faster</flag>
-		<flag name="fasttrig">Enable trigonometric approximations to make code faster</flag>
-		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name="fastmath">
+			Enable mathematic approximations to make code faster
+		</flag>
+		<flag name="fasttrig">
+			Enable trigonometric approximations to make code faster
+		</flag>
+		<flag name="opencv">
+			Add support for <pkg>media-libs/opencv</pkg> image processing.
+		</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild
new file mode 100644
index 000000000000..cca93fade785
--- /dev/null
+++ b/media-gfx/yafaray/yafaray-3.5.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+# 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"
+# Regular homepage is currently down. Upstream is working on this.
+HOMEPAGE="https://www.yafaray.org https://github.com/YafaRay/libYafaRay"
+SRC_URI="https://github.com/YafaRay/libYafaRay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/libYafaRay-${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/libxml2:2
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg )
+	opencv? ( media-libs/opencv:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:= )
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtwidgets:5 )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)"
+
+DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
+
+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
+		-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
+		-DWITH_XMLImport=ON
+		-DWITH_YAF_PY_BINDINGS=$(usex python)
+		-DWITH_YAF_RUBY_BINDINGS=OFF
+		-DYAF_DOC_DIR=share/doc/${PF}
+		-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
+}
+
+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'"
+}