gentoo resync : 25.11.2020

3 files changed, 7 insertions, 39 deletions

diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 2758bc62bdc1..0e541819531e 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,5 +1,4 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
-DIST yafaray-blender-exporter-3.4.1.tar.gz 381253 BLAKE2B b1483c79b14581729f598b92ca504af4a8a73cff54ff2014e8be646eaa2eea7f10074d1dc8c58251d8a987ac6e5ac10d1bc34b80c229f74e6d580bbaa3a3c461 SHA512 1f7baf7bf5953be8b4e004b1509cc23164df0a05e28d33a2301195ea21ad4d4cd6fdd67a0b1af11c1075bab7018e64b38f564be8b647d8513db46feee7d8bf85
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
-EBUILD yafaray-3.4.1.ebuild 4381 BLAKE2B ac952d608b2aac41f46e17a080fa1d86f5619f3adf97498a275da52279fea0ee4f6ee4112fc1d66131fdb832693661147e68c7309ef88f8f29a510b81e5b4d09 SHA512 c13a2d24795a64c8d6f2f64bf937f7f0367320efc0d1bb5c34c9fca374d4f2bbe76edccb5814b3fdc0d4e4da1b0b94cf0654ce13c482a38d3e2de0a38d33a250
-MISC metadata.xml 1135 BLAKE2B c889a0d76e5dace50fac8a3b2ec5dc8e04b88baba19ff7db575a3790ea92b90c9a17cad5320f85e5de85ccb6db3c37323589118cd9d4cf10d8f9f674a04f6318 SHA512 86c9cb6eeab7ed39b4192a6e1a9caf7b4d75df2c7e9fe8e16ccec5a1b11e9663c828ef62160240c228847ee6b1ffb7d0c8589a4b4f5aba20ba34cba59ae2c3fa
+EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
+MISC metadata.xml 1058 BLAKE2B 6eba6592abe559d29863843dcbc69648b3789d3ce7f031d174db306ce001a381e9cb04232a40ac0ad167e21527a195bfab8e0603bd3d9be8782a54cc02c9b8d3 SHA512 f864ed542ec6cabe36bf92ae2dbb3f56cb0a38ab5967f032b7a1c8cd1d8b4ef9ceb2529448dce48d2397b1f25e0ceb5d657c1ec09ac8fc34d43131b43b4528cb
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 795c6e4891e0..24519079a75e 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -14,7 +14,6 @@
 		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.
 	</longdescription>
 	<use>
-		<flag name="blender">Install addon for <pkg>media-gfx/blender</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">Use <pkg>media-libs/opencv</pkg></flag>
diff --git a/media-gfx/yafaray/yafaray-3.4.1.ebuild b/media-gfx/yafaray/yafaray-3.4.1.ebuild
index e583d32d4b7c..4efd96180ca1 100644
--- a/media-gfx/yafaray/yafaray-3.4.1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 # doesn't build with ninja when qt5 and python USE flags are both enabled
 CMAKE_MAKEFILE_GENERATOR="emake"
@@ -12,19 +12,17 @@ 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
-	blender? ( https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz )"
+SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz"
 
 S="${WORKDIR}/Core-${PV}"
 
-LICENSE="blender? ( GPL-2+ ) LGPL-2.1"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="blender +fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
+IUSE="+fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
 RESTRICT="test"
 
 REQUIRED_USE="
-	blender? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
@@ -37,10 +35,7 @@ RDEPEND="
 	opencv? ( >=media-libs/opencv-3.1.0:= )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
 	png? ( media-libs/libpng:0= )
-	python? (
-		${PYTHON_DEPS}
-		blender? ( ~media-gfx/blender-2.79b[${PYTHON_SINGLE_USEDEP}] )
-	)
+	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtwidgets:5 )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
@@ -63,13 +58,6 @@ src_prepare() {
 	append-ldflags -pthread
 
 	cmake_src_prepare
-
-	if use blender; then
-		# fix PLUGIN_PATH
-		sed -e "s/PLUGIN_PATH = os.path.join(__path__\[0\], 'bin'/PLUGIN_PATH = os.path.join(__path__\[0\], '"$(get_libdir)"'/" \
-			-e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v"${PV}"/" \
-			-i "${WORKDIR}"/Blender-Exporter-${PV}/__init__.py || die "patching startup file failed"
-	fi
 }
 
 src_configure() {
@@ -116,18 +104,6 @@ src_install() {
 	fi
 
 	rm -rv "${ED}"/usr/share/doc/${PN} || die
-
-	if use blender; then
-		pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
-		# grab blender version number for plugin directory
-		local blender_plugin_dir=$(best_version media-gfx/blender)
-		blender_plugin_dir=${blender_plugin_dir##*/} # remove category
-		blender_plugin_dir=${blender_plugin_dir#*-}  # remove package name
-		blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists
-		insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3
-		doins -r .
-		popd || die
-	fi
 }
 
 pkg_postinst() {
@@ -135,10 +111,4 @@ pkg_postinst() {
 	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'"
-	if use blender; then
-		elog
-		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"
-		elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available"
-		elog "in the render engines drop-down."
-	fi
 }