gentoo resync : 22.10.2018

3 files changed, 23 insertions, 21 deletions

diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index c3bd529a7936..5a548849e25f 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -3,5 +3,5 @@ AUX yafaray-3.3.0-respect-cflags.patch 502 BLAKE2B 1df4f8667e8c2577812c690baf17c
 AUX yafaray-3.3.0-strip-debug-mode.patch 767 BLAKE2B 42351950158441bd328e3fd3265e8e9e0f96ee51cf9aadf427c3dda7b57b77716e022801183271dd7206d9ec58b1e239159736894423ca53885c033a2b7e8e0f SHA512 f139d622162d02bfd1d95d38ffa2fcb29fd32cdd51cc14aec986dc481c00aa3c982e537ead2ae8d1972401312aaf9ef8cd92b81fc1fd3ee819f350eadac5d2d2
 DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0
 DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90
-EBUILD yafaray-3.3.0.ebuild 3372 BLAKE2B 29ec1802d482a60e654fafdf990209fb4faad705c0ef9747f05cbbf744d164c57e70fd527ef37cf64d8130c0ae169aefc7e5dde224f903021cc3d2ac7009e5ed SHA512 928e5a003e822d9e2a282245efebf5cb007852a9101283a3a3178240d04a28378e5e9e99d631ac29084da036f0e5ccdc02fd5435e637abf6fe3d4a976b2793f8
-MISC metadata.xml 1133 BLAKE2B 17e445d385b5d94bcb6eafa02e211423d6a515c8fd6b756a856e312817117e958652a11a223e08ea062aef9fe0df1e23b623b0025f34b6b3b1a53a32cb1cabf6 SHA512 d1d8237a273d994de3f77328ab97bb6c4008ce94c0598d3fa345ecef047bbcaaa6f75b3fe3b05d80f65adbca05be7a30d7759e7ae37034a8e42e52d7483cc981
+EBUILD yafaray-3.3.0-r1.ebuild 3530 BLAKE2B ac21d61171d7f001baa05b1202b93a266eb7df11ec111755392f245e6928b414685189450cce24a5ecac62da035ec085e3f6341e20e3d1e7f9575ce7fb7a0445 SHA512 66a5c653af8ae1dc782d0c7a8595fcf6369372fe1f0ac751729292e5a6f64ea1ac0af25b6c60b08deafb76d0549d6cedb236c57389e18e35ef5542e4557a2fe2
+MISC metadata.xml 921 BLAKE2B 5a08a3398eed624e00d87f11460f0fba597b764c63506cca9c574be77225905bffc47b8d102acba71c40f38c0adc4f269c8af8fe2e74e730c36abff43d8ed7a2 SHA512 da6a25457068362228db88f4285a64472938a0f7fb5d9de0d29ec56afb2825566c105ff73193360caa9b91bea2f339403e503bd5b3745157b9e3e4fc8585a98c
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index cee5f0b787f1..f6cffe698244 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>herb@hlmjr.com</email>
-		<name>Herb Miller Jr. (herbmillerjr)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<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.
diff --git a/media-gfx/yafaray/yafaray-3.3.0.ebuild b/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild
index 3b077ecb4aa8..01987b313724 100644
--- a/media-gfx/yafaray/yafaray-3.3.0.ebuild
+++ b/media-gfx/yafaray/yafaray-3.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-PYTHON_COMPAT=( python3_{5,6} )
 inherit cmake-utils python-single-r1
 
 DESCRIPTION="A free open-source montecarlo raytracing engine"
@@ -15,23 +15,31 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/boost:=
-	dev-libs/libxml2
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2:2
 	sys-libs/zlib
 	blender? ( media-gfx/blender )
 	jpeg? ( virtual/jpeg:0 )
 	opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
-	png? ( media-libs/libpng:= )
+	png? ( media-libs/libpng:0= )
 	python? ( ${PYTHON_DEPS} )
 	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype )"
+	truetype? ( media-libs/freetype:2 )
+"
 DEPEND="${RDEPEND}
-	dev-lang/swig"
+	dev-lang/swig
+"
 
 S="${WORKDIR}/Core-${PV}"
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -49,6 +57,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DYAF_LIB_DIR=$(get_libdir)
 		-DWITH_YAF_PY_BINDINGS=$(usex python)
+		-DYAF_PY_VERSION=${EPYTHON#python}
 		-DWITH_YAF_RUBY_BINDINGS=OFF
 		-DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter
 		-DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
@@ -88,10 +97,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "To confirm your installation is working as expected, run"
-	elog "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
-	elog "as an input file, then compare the result to"
-	elog "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
+	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'"
 	if use blender; then
 		elog
 		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"