From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- media-gfx/yafaray/yafaray-3.4.1.ebuild | 40 +++++----------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) (limited to 'media-gfx/yafaray/yafaray-3.4.1.ebuild') 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 } -- cgit v1.2.3