gentoo resync : 25.11.2020

5 files changed, 56 insertions, 115 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index ceb116b804dd..c2f3dc976a62 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -4,8 +4,8 @@ AUX alembic-1.7.11-0003-Fix-env-var-for-renderman.patch 828 BLAKE2B 8e135e4d814a
 AUX alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch 1044 BLAKE2B 49ed2fe0b260e9917f781ed5e1e2fb5ffaad89f567be893ff68580f7ec766ceb7f3ffc884d5f5cf030d467b0fcd096d56363b4273e8d1968c1ed3d5b9016fda8 SHA512 18d32d6b1d611f9ec9f545281f5900f58673cf773b11fbcf457d9a0c39a8c87690e1d39b2dfb910f74696b73d34e23f7adefa8242c29d80595ac3fb0879d87d6
 AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
 AUX alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch 1074 BLAKE2B 1d8b252eb8fcfe18e019a11350d1b9974d30a1d95146d5dd8eda8feb585c4e7d1070543f290d32e41929b17e86fda9a6eca7d045d4b4cf8fc31b4075addedf7a SHA512 059c89cbe402429684e56fa14041cf65974259b4ad1d464edd925bb6353d758402689e8de7021a3b3de6f98b1225a90fc50bbc843639b9be2823527afe77ee57
-DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
-EBUILD alembic-1.7.11-r1.ebuild 2909 BLAKE2B 5851b780d234dc5412bb17c14f6a28c5bafa7dc121638ad7b255141c5fcaac85485fc6c6e393def35fc8508c2b33164c75b3a7f9a85ef51e9d2510ee9eb6cb4d SHA512 3a51c9f37e1d9d28280b6e8c2986aaaefe01797639907bbf2df3093eaf7358ad8290cf9d385beb707f7cddd6ed889275f62e8c993d8469ea7500e66d366a4083
-EBUILD alembic-1.7.12.ebuild 2399 BLAKE2B ed883f1e669d8ef3c5e3267c68a87064af3c3de5e3d747ba8b723b53a352d7d8b28081e6e229ed307359b11ccd31228161dd61b3f6c3b37c6a77e2afd286860b SHA512 220895749a03e0cb41a3a7f772f24c8789ae62c3df43de19a60dab0365d66761f04df504618acb355e36fa6319c7f3bd4c0613cbde5f760607d5dd02d797c6bf
-MISC metadata.xml 1238 BLAKE2B 5d2eafb6cc973920681f3c8a6787d5f943b436260f3122f5fba502aca6dfa08d3f6270b42c913b5a68c24b205138b068e482b881c43406874645804e105f0f32 SHA512 95667508715b5ae934acdb2b451919ecf0f0779ad5fa2bc89e731583c33570abdca0f481cbb203740f9ea6c39e773eea08bfa2f3f363d26c41c4c23c7fe3ea7b
+DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
+EBUILD alembic-1.7.12.ebuild 2398 BLAKE2B 304acd044f9cc247f99df23810934a2917df21bdc7e7885a52857c458e6419f502460a35f1bebe947bbc4513c47dd1e09dfc4d447fa278ae0fcfd568ae683b98 SHA512 2c31a9759a2725576b0c22745db5cb59b376b5cf5bbe4d72df641666304533d8005d9417702073bbe0570772e56b06687571d45876840eeb899b9f52866458f0
+EBUILD alembic-1.7.16.ebuild 1241 BLAKE2B f4f0a1ea27ae8e8539c0e4c14e399d9d2e546053367a80d7bb6074295257cb701b2affcc01bc614ca516bfe11417f5fd37d3a5ad897eb647fe4645fed91f6440 SHA512 5715deaf8e193709500879591572d4c73734c7ad1c161fe344ce68f3c2d868ab1ebcdf2c50c7f93b2f4c253a7d4e6eabfbc6d213eb86101fdba2225807841ccc
+MISC metadata.xml 1080 BLAKE2B 96c475f6b75a08520843721121d708e9e31dbfa633f7c3ac73621b85ecd139c12bc022aa4719c3390ce61fbd5b55c6444c69ff0a380abcc08685de3052632104 SHA512 fb6d89a0b587010d22fed63b5b281a88282366219c174fff7484176d3a61109b47bb87e49758c185273d044a8f52eb7230b122d145a4ed341c24597d89ff0166
diff --git a/media-gfx/alembic/alembic-1.7.11-r1.ebuild b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
deleted file mode 100644
index 2132a431730c..000000000000
--- a/media-gfx/alembic/alembic-1.7.11-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multiprocessing
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="arnold +boost doc examples hdf5 maya prman test zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.3.0:=
-	boost? ( >=dev-libs/boost-1.65.0:= )
-	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.14-r1 )
-"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Fix-to-find-boost-with-cmake-3.11.patch"
-	"${FILESDIR}/${P}-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
-	"${FILESDIR}/${P}-0003-Fix-env-var-for-renderman.patch"
-	"${FILESDIR}/${P}-0004-Fix-a-compile-issue-with-const.patch"
-	"${FILESDIR}/${P}-0005-Fix-install-locations.patch"
-	"${FILESDIR}/${P}-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	if use doc; then
-		doxygen -u Doxyfile || die "Failed to update Doxyfile"
-		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_SHARED_LIBS=ON
-		# The CMakeLists.txt file needs C++11 or C++-0x if none of them
-		# is defined
-		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
-		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
-		-DUSE_ARNOLD=$(usex arnold)
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=$(usex maya)
-		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die "Failed to build documentation"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake_src_install
-}
-
-pkg_postinst() {
-	if use arnold; then
-		einfo "NOTE: The arnold plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use maya; then
-		einfo "NOTE: The maya plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use prman; then
-		einfo "If you're looking for an ebuild for renderman, you may want to"
-		einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
-		einfo "followed by 'emerge renderman'"
-	fi
-}
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
index 364b3261bc71..d67d4611da19 100644
--- a/media-gfx/alembic/alembic-1.7.12.ebuild
+++ b/media-gfx/alembic/alembic-1.7.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+boost doc examples hdf5 prman test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
new file mode 100644
index 000000000000..e7b7b255e52c
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.16.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multiprocessing
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hdf5 test zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="hdf5? ( zlib )"
+
+RDEPEND="
+	>=media-libs/openexr-2.5.0:=
+	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_SHARED_LIBS=ON
+		# C++-11 and thus {shared,unique,weak}_ptr are common nowadays, so these
+		# are no longer needed and using boost fails. Options will get removed by
+		# upstream soon
+		-DALEMBIC_LIB_USES_BOOST=OFF
+		-DALEMBIC_LIB_USES_TR1=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=OFF
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=OFF
+		-DUSE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index f3240834df66..034ebe0790b5 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -14,15 +14,9 @@
 	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
 </longdescription>
 <use>
-	<flag name="arnold">
-		Add support for arnold renderer (experimental)
-	</flag>
 	<flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
 	<flag name="examples">Install alembic examples</flag>
 	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
-	<flag name="maya">
-		Compile Alembic plugin for Maya (experimental)
-	</flag>
 	<flag name="prman">
 		Compile Alembic plugin for Renderman (experimental)
 	</flag>