gentoo resync : 15.09.2018

10 files changed, 3 insertions, 289 deletions

diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index db6feee33589..6d9008613842 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,17 +1,6 @@
 AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
 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.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.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.1.ebuild 1332 BLAKE2B 0092334e49da04ca6efe2592389ecedfbcd9e094788c97223fff766cd5f3fa72bd7440aed9936ec6578ae7a9d58f3bccc1d9c85c6eb51098a21d0a77c98a5215 SHA512 c4a269f08553cc3dee85f259fdb623b3c70cd6610387ef0882ed911f479fe7d126ffc97819e13da9d91af21a4971d9dc83a32d503fbb274696e12c2867975fcb
-MISC metadata.xml 523 BLAKE2B d50f227136c88ab834e955a8fdd9b25b3624a2195610378f4e8ee7170a89c231654f08980e347074023b79730e36c5b17cf82b127628e13bfb4cab894ee202a8 SHA512 f156dce148c52ce8ace4f8efe42a0a891ed82dcf8ecff3420cdb427f195910532e952bd3e8578b171cfedc0ebabd4b4bec71585a308a575701a1195331bb5c75
+EBUILD assimp-4.0.1.ebuild 1331 BLAKE2B 3c703835ae02fd9a706efddb628a13848d00535a40425aef1447ffb39c199ea11c408e74e5a1ea49da19c0dea7b5c5400c7e1726fa7413d1f95496b5743f8dbe SHA512 79164a1c28b7244acc305accac8d3ae8b9de29cd313bd474654986ad4ba137adfd8de26803ae64d74637831559503fbc92cd9d0ea21545b951a4319d77c2ce67
+MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
diff --git a/media-libs/assimp/assimp-3.0.1270.ebuild b/media-libs/assimp/assimp-3.0.1270.ebuild
deleted file mode 100644
index 37368a1bb93b..000000000000
--- a/media-libs/assimp/assimp-3.0.1270.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="http://assimp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}--${PV}-source-only.zip"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost samples static tools"
-SLOT="0"
-
-DEPEND="
-	boost? ( dev-libs/boost )
-	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}--${PV}-source-only
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build samples ASSIMP_SAMPLES) \
-		$(cmake-utils_use_build tools ASSIMP_TOOLS) \
-		$(cmake-utils_use_build static STATIC_LIB) \
-		$(cmake-utils_use_enable !boost BOOST_WORKAROUND)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/assimp/assimp-3.1.1.ebuild b/media-libs/assimp/assimp-3.1.1.ebuild
deleted file mode 100644
index b3850b085c7f..000000000000
--- a/media-libs/assimp/assimp-3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="http://assimp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+boost samples static tools"
-SLOT="0"
-
-DEPEND="
-	boost? ( dev-libs/boost )
-	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/ASSIMP_LIB_INSTALL_DIR "lib"/ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build samples ASSIMP_SAMPLES) \
-		$(cmake-utils_use_build tools ASSIMP_TOOLS) \
-		$(cmake-utils_use_build static STATIC_LIB) \
-		$(cmake-utils_use_enable !boost BOOST_WORKAROUND)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/assimp/assimp-3.2-r2.ebuild b/media-libs/assimp/assimp-3.2-r2.ebuild
deleted file mode 100644
index 0e5083ca247e..000000000000
--- a/media-libs/assimp/assimp-3.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator multilib
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+boost samples static test tools"
-SLOT="0"
-
-RDEPEND="
-	boost? ( dev-libs/boost )
-	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=( "${FILESDIR}/test-cmakelists.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build samples ASSIMP_SAMPLES) \
-		$(cmake-utils_use_build tools ASSIMP_TOOLS) \
-		$(cmake-utils_use_build static STATIC_LIB) \
-		$(cmake-utils_use_enable !boost BOOST_WORKAROUND) \
-		$(cmake-utils_use_build test TESTS)
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-3.2-r3.ebuild b/media-libs/assimp/assimp-3.2-r3.ebuild
deleted file mode 100644
index 4fd114b62eda..000000000000
--- a/media-libs/assimp/assimp-3.2-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator multilib
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+boost samples static test tools"
-SLOT="0"
-
-RDEPEND="
-	boost? ( dev-libs/boost )
-	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/test-cmakelists.patch"
-	"${FILESDIR}/findassimp.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build samples ASSIMP_SAMPLES) \
-		$(cmake-utils_use_build tools ASSIMP_TOOLS) \
-		$(cmake-utils_use_build static STATIC_LIB) \
-		$(cmake-utils_use_enable !boost BOOST_WORKAROUND) \
-		$(cmake-utils_use_build test TESTS)
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-3.3.1.ebuild b/media-libs/assimp/assimp-3.3.1.ebuild
deleted file mode 100644
index e051dd165eaf..000000000000
--- a/media-libs/assimp/assimp-3.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator multilib
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="samples static test tools"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/boost
-	samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_BUILD_SAMPLES=$(usex samples) \
-		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \
-		-DASSIMP_BUILD_STATIC_LIB=$(usex static) \
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
index 8bd32676885e..4bdb7525726e 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/assimp/assimp"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="samples static test tools"
 SLOT="0"
 
diff --git a/media-libs/assimp/files/findassimp.patch b/media-libs/assimp/files/findassimp.patch
deleted file mode 100644
index 1b62e7301ffe..000000000000
--- a/media-libs/assimp/files/findassimp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cmake-modules/Findassimp.cmake.old	2016-09-06 08:26:35.107697600 +0200
-+++ cmake-modules/Findassimp.cmake	2016-09-06 08:29:25.337696582 +0200
-@@ -1,13 +1,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)
diff --git a/media-libs/assimp/files/test-cmakelists.patch b/media-libs/assimp/files/test-cmakelists.patch
deleted file mode 100644
index 9a3471bbc36a..000000000000
--- a/media-libs/assimp/files/test-cmakelists.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- test/CMakeLists.txt.old	2016-01-21 06:46:12.053363212 +0100
-+++ test/CMakeLists.txt	2016-01-21 06:46:51.126697143 +0100
-@@ -1,7 +1,5 @@
- cmake_minimum_required( VERSION 2.6 )
- 
--INCLUDE( AddGTest )
--
- INCLUDE_DIRECTORIES(
-   ${Assimp_SOURCE_DIR}/include
-   ${Assimp_SOURCE_DIR}/code
-@@ -47,7 +45,7 @@
- 
- SOURCE_GROUP( tests FILES  ${TEST_SRCS} )
- 
--if(AddGTest_FOUND)
-+if(BUILD_TESTS)
- add_executable( unit
-   unit/CCompilerTest.c
-   unit/Main.cpp
-@@ -56,13 +54,12 @@
- )
- 
- add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models")
-+target_link_libraries( unit gtest )
- 
- SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
- 
- add_dependencies( unit gtest )
- target_link_libraries( unit assimp
--  debug ${GTEST_DEBUG_LIBRARIES}
--  optimized ${GTEST_RELEASE_LIBRARIES}
- )
--endif(AddGTest_FOUND)
-+endif(BUILD_TESTS)
- add_subdirectory(headercheck)
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index b23d8815c4ef..1480b57c1253 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -5,7 +5,6 @@
 		<email>slis@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="boost">Build assimp with boost support</flag>
 		<flag name="samples">Build viewer library</flag>
 		<flag name="tools">Build assimp tool binary</flag>
 	</use>