gentoo resync : 17.05.2018

4 files changed, 86 insertions, 37 deletions

diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index a1cf66774075..0d0568c1af7f 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,16 +1,16 @@
+AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
 AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
-AUX findassimp-4.0.0.patch 624 BLAKE2B 244714041ebeb668c886ae68b45da33f67a887fb3aa047b5f1f5fe6cbc139f934173df8268077e64b5c55e0c412759c879207e91b5c00d2b7b4d4280c2c1eff5 SHA512 e305ba931d3a81f26dad1f8ebf49d3b0e931d28614ca0b119cc3bcd2aa258cd7d28ba9575b0306698743cb3ff3d1dd7d07fa60a05f53df2a6486c80237e50ed7
 AUX findassimp.patch 463 BLAKE2B e11f291cb50b71f745f037b31578bf78cc5cdc71010e9bec500978685adb14eee31cfe07621efe3810cc4ce5234633770ccfc62c11467c0136abe9c5bdb1734a SHA512 f8c7b72837099a77b4ad84ff671c9b423f3595dfeeab1d1f2c33504f1dffb36e4fe512512b37332b15b348aedcf04b34d5b12569f9294a97caebdd9ff3b1eeb8
 AUX test-cmakelists.patch 892 BLAKE2B 333030ec9610e95c7cc09ffecbc2b1022dc5d55fc35df0bb39bc6dbd1d5f737a24fb98a2b1ad76710cc464fffd9302b99d6e7dbcc18a8cf81f0a1c8b9e4d7d39 SHA512 55d1ff62af5a82c0e27fa75b43c2d34b4388359f9152ac09e3b553a093693bceb9e31563a94ded47a629fc4b03ce2a8817186b81ed967e88b1b4358d89383e56
 DIST assimp--3.0.1270-source-only.zip 4042147 BLAKE2B 1a96a958304d8cdb635f00bb20629aa959d6b158e6d86a465c913cb86e8bf9bbb29d7619c0de685b67483dd1ec12561f1bce63e3cbd6594d99617c3697287145 SHA512 0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820
 DIST assimp-3.1.1.zip 32869052 BLAKE2B 877b1a00a8e35eafb85c0f1b1c364c025a98c629da1797961f71df92ee0508b66606aca2b3f69d4da25ec6edef105776d8c4ef83335f3aa3cff1af5232be6745 SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527
 DIST assimp-3.2.tar.gz 33756081 BLAKE2B 76de8f74b7b2eae04ebd3d71b69709d601d249a4ed7e6102fffce376f67dfb2d433536556e7683bc79d092465940cd5d7750f7fecb54edd33b9e8bfa974f8de0 SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a
 DIST assimp-3.3.1.tar.gz 36428380 BLAKE2B 5239648ea99e23a1f5f568fb22e6f9607b3f2e642fcdb480737c8813456fee699a4a07937c248ded01c27edd503f1a30ae8bde30ff49d8bac61e6363f12d1cc5 SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a
-DIST assimp-4.0.0.tar.gz 44618473 BLAKE2B 12bf7e09bc80de33ec250e19ca4a5dd34fd1b1a25ca05b85fa3c3253b3b9fba103389f34b874652b393d014bb7da863a3487b1a9cb5e806028c2d060286edaca SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62
+DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
 EBUILD assimp-3.0.1270.ebuild 851 BLAKE2B 2dc256a20b53e2c37506b22ffefc68c0b4a46cb7f95401b519fa0d65cf91f10af60b92ae40d9c345d63cadb91b6e692f46845d2b8a8aa0270eaaf53a00d7684d SHA512 2fbac16c2cb257e677482bb1d3633b819ada3a4c0dbd0dcb83247ef029f974e10d3d6c9fc6dfee98cb426205451110630833a65a44142ec92bc0d9cf193d45c2
 EBUILD assimp-3.1.1.ebuild 953 BLAKE2B 15f39ddc3b95c4285d16096caca82100ef0a7dab123d3aac97cefcd7bc069d552e004703ff6ffee30150acba9ef665f02909a1d32d9ec90305b5eafc161cb763 SHA512 6224c5d4c99f005fe3887237209192b3bedce4db9833f64085c2e18d52e4d883be370b3733d518ecebe3a5475776e0197cd87a8263b4fbd0eeef5a5e9492ba37
 EBUILD assimp-3.2-r2.ebuild 1096 BLAKE2B 6cc29ade3736c8e1608398fe609295e5836cd42cb0faf436149142046675fd81aeb43bf2b9718de8566a6b87dc98de525edbbf54991c7b82f5fe01b469d0f54f SHA512 30d46bb930c589837d8444201881a611189fd8c87763ed04d10c52fcfac8b6cecfe70690fa684e5d7cbd4deda8e510cb8b13b6b8506c9b4881abbefbfe8f0e9c
 EBUILD assimp-3.2-r3.ebuild 1246 BLAKE2B d8f049d6fd8dfd6eaeeca58ba3b4a24fdebb1e25f7568410b7f5d97b6bb911d083e4c4968dbd6d18ad947f72f18376dd54fb759b16a9ac3510e7070a9b56768f SHA512 efe222111e465ba66060db4dff39fe2e75510dbe97a754c7d930fa27e1947fd002fe9c472f0c829874ed93d9af375ea9d25dadb62006ae8b985ba530c0ad09ed
 EBUILD assimp-3.3.1.ebuild 1127 BLAKE2B a119bd51210262335826392fb0f4f2a78f764fd7c27932a1d6ff0e4eb7f183716ea10f5a25b67e0bde6d65935febc92037572f872cb831b1af5bb49dae1612d5 SHA512 afaed89ce02ddb4f734b2dc8ff3dc92a02b28d97cecb8b874bbc1d32c19219390257c598c88031cbd63fa42567e4dce7c32ead01265a1a4f70a77e0e9f09a578
-EBUILD assimp-4.0.0.ebuild 1127 BLAKE2B a119bd51210262335826392fb0f4f2a78f764fd7c27932a1d6ff0e4eb7f183716ea10f5a25b67e0bde6d65935febc92037572f872cb831b1af5bb49dae1612d5 SHA512 afaed89ce02ddb4f734b2dc8ff3dc92a02b28d97cecb8b874bbc1d32c19219390257c598c88031cbd63fa42567e4dce7c32ead01265a1a4f70a77e0e9f09a578
+EBUILD assimp-4.0.1.ebuild 1282 BLAKE2B 2231c2e4bce5f0f48078bff8d33fd3f169514b3bbb94cb2d16a1f352b89c93b0f754e3fdb91178433d2bb60085120dd1d662cdfbee75b93064f5f5a18ba22354 SHA512 aa02344b91ab3fdfa633acba9cbc354f96b9907b57a793ed99f7cde361a1192e3e5cf570d76c1936c5951855915be14c8d082793b6a84ddba98da539c6cedc6f
 MISC metadata.xml 523 BLAKE2B d50f227136c88ab834e955a8fdd9b25b3624a2195610378f4e8ee7170a89c231654f08980e347074023b79730e36c5b17cf82b127628e13bfb4cab894ee202a8 SHA512 f156dce148c52ce8ace4f8efe42a0a891ed82dcf8ecff3420cdb427f195910532e952bd3e8578b171cfedc0ebabd4b4bec71585a308a575701a1195331bb5c75
diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
index e051dd165eaf..89da03baf096 100644
--- a/media-libs/assimp/assimp-4.0.0.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils versionator multilib
+inherit cmake-utils
 
 DESCRIPTION="Importer library to import assets from 3D files"
 HOMEPAGE="https://github.com/assimp/assimp"
@@ -15,22 +15,37 @@ IUSE="samples static test tools"
 SLOT="0"
 
 RDEPEND="
-	dev-libs/boost
-	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
-	sys-libs/zlib
+	dev-libs/boost:=
+	sys-libs/zlib:=[minizip]
+	samples? (
+		media-libs/freeglut
+		virtual/opengl
+		x11-libs/libX11
+	)
+	tools? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+		media-libs/devil
+		virtual/opengl
+	)
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
 
-PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" )
+PATCHES=(
+	"${FILESDIR}/findassimp-3.3.1.patch"
+	"${FILESDIR}/${P}-qt-5.11.0.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
-		-DASSIMP_BUILD_SAMPLES=$(usex samples) \
-		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \
-		-DASSIMP_BUILD_STATIC_LIB=$(usex static) \
+		-DASSIMP_BUILD_SAMPLES=$(usex samples)
+		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
 		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
 		-DCMAKE_DEBUG_POSTFIX=""
 		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
 	)
diff --git a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
new file mode 100644
index 000000000000..ef5a50249396
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch
@@ -0,0 +1,59 @@
+From 7251c3c51a774c2828f62787e3aa6ad743ca5628 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 May 2018 13:45:25 +0200
+Subject: [PATCH 1/2] Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
+
+---
+ tools/assimp_qt_viewer/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
+index 42ef0fb3..9f1b68ca 100644
+--- a/tools/assimp_qt_viewer/CMakeLists.txt
++++ b/tools/assimp_qt_viewer/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(assimp_qt_viewer)
+ 
+ cmake_minimum_required(VERSION 2.6)
+ 
+-find_package(Qt5Widgets REQUIRED)
++find_package(Qt5 COMPONENTS Gui Widgets OpenGL REQUIRED)
+ find_package(DevIL REQUIRED)
+ find_package(OpenGL REQUIRED)
+ 
+@@ -25,9 +25,8 @@ qt5_wrap_ui(UISrcs mainwindow.ui)
+ qt5_wrap_cpp(MOCrcs mainwindow.hpp glview.hpp)
+ 
+ add_executable(${PROJECT_NAME} ${assimp_qt_viewer_SRCS} ${UISrcs} ${MOCrcs})
+-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
++target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp)
+ 
+-qt5_use_modules(${PROJECT_NAME} Widgets OpenGL)
+ if(WIN32) # Check if we are on Windows
+ 	if(MSVC) # Check if we are using the Visual Studio compiler
+ 		#set_target_properties(TestProject PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+-- 
+2.17.0
+
+
+From 5bbf0a8afa5a3cbaa9281e47cc327b0d9560b03f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 May 2018 13:58:30 +0200
+Subject: [PATCH 2/2] Add missing assimp_qt_viewer install target
+
+---
+ tools/assimp_qt_viewer/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt
+index 9f1b68ca..b41291e3 100644
+--- a/tools/assimp_qt_viewer/CMakeLists.txt
++++ b/tools/assimp_qt_viewer/CMakeLists.txt
+@@ -42,3 +42,5 @@ else()
+ endif()
+ 
+ set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
++
++install(TARGETS assimp_qt_viewer DESTINATION "${ASSIMP_BIN_INSTALL_DIR}")
+-- 
+2.17.0
+
diff --git a/media-libs/assimp/files/findassimp-4.0.0.patch b/media-libs/assimp/files/findassimp-4.0.0.patch
deleted file mode 100644
index 2fbaa73a8500..000000000000
--- a/media-libs/assimp/files/findassimp-4.0.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/cmake-modules/Findassimp.cmake	2017-07-24 08:21:12.436647541 +0200
-+++ b/cmake-modules/Findassimp.cmake	2017-07-24 08:21:30.139980768 +0200
-@@ -55,13 +55,13 @@
- 	find_path(
- 	  assimp_INCLUDE_DIRS
- 	  NAMES postprocess.h scene.h version.h config.h cimport.h
--	  PATHS /usr/local/include/
-+	  PATHS /usr/include/
- 	)
- 
- 	find_library(
- 	  assimp_LIBRARIES
- 	  NAMES assimp
--	  PATHS /usr/local/lib/
-+	  PATHS /usr/lib/
- 	)
- 
- 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +78,4 @@
- 	  endif (assimp_FIND_REQUIRED)
- 	endif (assimp_FOUND)
- 	
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)