gentoo resync : 13.06.2020

10 files changed, 99 insertions, 441 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 0a716d92b711..0f49befba3ba 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -4,15 +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
-AUX alembic-1.7.9-CMakeLists-fix_lib.patch 7317 BLAKE2B 8739f5808cb8821cf8404dcbd492620bd1b0fc4ac09600f345a89b813d07e24fb305a5615a9d58b11ae36f7754a9527bf583586017d1018eff658760370f9777 SHA512 000d31ffd5c5843a33532fbf02c2410cbeb7504fd89d9133f4a91d435682572df0cee7d59f039b0e32e98c05df7685ac2a3880630cebd6782e38161a8bca4c31
-AUX alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch 794 BLAKE2B b19aabcc393e2cd218d055e00b7ca1e0e69206326b756e4ee9f5cc67678f0e519b6f788593e33e833b61b71ee98fbd8e2a3e633548144601ce47b2aa8f625380 SHA512 bd1ebeaf3e1e28badb9e5a6914bf3073cfa8935c74a044ebe5dfb84117c8058696ae10866898fb6dd122fd4b7de926070e422e1487f0f6749226fe87e646b52c
-AUX alembic-1.7.9-find-pyilmbase-python-module.patch 542 BLAKE2B 448114ef30e6131229b6e789af7a231e766e2584c64eca9f4e09cd7bae8555d1c9f00b62c3e53136fa20be25530ed15019ea5f55a32ee286b925b726678092fb SHA512 4dfef7da97b1fe82b7c210ff8cfc7e664d56b7379dde0246ab18311fc28188dd59251b745644f75debaffe9e5eeff61c965ee9bcf6102ff6f50af7f9db4c8a2e
-AUX alembic-1.7.9-fix-boost-python-naming.patch 721 BLAKE2B bcd2857b7afb29017c0e538ea8bf9588c744f1471c106009f225affc576750967a05e42a94f84ca5194823f7abbe3762e5d7b58cee9497218e59927e3ea6b1cd SHA512 a7140894cdcd2d796b0fc514f36e8318ef372f1fbe456f06c80f9697bcd9cc6333d609fd2be2c7788329a60685abd5030ae572f952deb54dfc9f0b6db72b7159
-AUX alembic-1.7.9-fix-python-import.patch 1254 BLAKE2B 091d7fa6b55508425b7017f2bc7832e798ccdf65beb885ad0db9e13e8685458696fcc05dc76477a14907799755aeaf71ca748a14452abb0747df210f549a7604 SHA512 e62bbcf20028c57c41b935e49e947f02905e390fbf0788c668b9a517813bbc259f266f9d14fc2197884d9632739eda7d412267aba44a8c7495125c2f06a184d5
-AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb00c448ce011889d8672ea0df1d666839ff0d515b86bdf01304f0605312bd317140944fc59cbd0fbadab7240655 SHA512 59060bb8b29d2c5e0e2003115e6fecc7744bc11c39419486e3743e810f85256c66af6976b5764cfce04fd87c8b715939ce382e252999ff26a3ad06df2c3550dd
-AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
-DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
+DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
 EBUILD alembic-1.7.11-r1.ebuild 3159 BLAKE2B 38f7f04e3878247c1caa0200c0cf8043102742db00c09188c44c43828c7c8030394f75b4f632817fa5cd51fa81697d2c220333c3a9d34e605bccb07c49d6385f SHA512 7bd681f7e9d9da198657b66cdf31a4e2f9a32f0140bfbf2553bf7fac8f7513132056f0760951362b5835fea9995b0e54af71925c5dd2c4b79e979155ba525818
-EBUILD alembic-1.7.9.ebuild 3085 BLAKE2B 48e9c79a0d0234be4cf1a2a175813b91d29948a14373ff0f8f5fb62d3f95dbc7937d0bb83024683598c52c898e63a0178d8767560dcf83e6c4b02d7b4b2fa1e7 SHA512 6252f40f1f0ea0c1bbee9cd7f2867b77024bb79a15cf4d01ee98bfdd7c5846ed2e0150f67047e87b1dec2c957df608fa1ea42fc7d06a4014a3f5aafb81f8e9d2
+EBUILD alembic-1.7.12.ebuild 2650 BLAKE2B a35cb1f3c118736fd819598ccb3ca91fdca227d4f3c0a18bc1834658669357ae1e68fff792b5972cdbc8d5e12465e279b3800071a33e0837ee534df85a122f5d SHA512 927614bc9ca4f11a0e1e4db4e162c82bd101865fc4f901444c36583e36d30a95ee85d5168ff82cb53cf86b88df0203a4170f7e68f2b4b663faea6f96f73b7b33
 MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
new file mode 100644
index 000000000000..8833c3fbfbb6
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake multiprocessing python-single-r1
+
+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="+boost doc examples hdf5 prman python test zlib"
+RESTRICT="!test? ( test )"
+
+# pyalembic python bindings need boost
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	hdf5? ( zlib )
+	python? ( boost )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=media-libs/openexr-2.3.0:=
+	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
+	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_SINGLE_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+	$(python_gen_cond_dep '
+		boost? ( >=dev-libs/boost-1.65.0:=[python?,${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.8.14-r1 )"
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch"
+	"${FILESDIR}/${PN}-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
+	"${FILESDIR}/${PN}-1.7.11-0003-Fix-env-var-for-renderman.patch"
+	"${FILESDIR}/${PN}-1.7.11-0004-Fix-a-compile-issue-with-const.patch"
+	"${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch"
+	"${FILESDIR}/${PN}-1.7.11-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=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=$(usex prman)
+		-DUSE_PYALEMBIC=$(usex python)
+		-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 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.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
deleted file mode 100644
index c04e8c9b6f6b..000000000000
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-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 python test zlib"
-RESTRICT="!test? ( test )"
-
-# pyalembic python bindings need boost
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-	python? ( boost )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.2.0-r2:=
-	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_SINGLE_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-	$(python_gen_cond_dep '
-		boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-3.9.6
-	doc? ( >=app-doc/doxygen-1.8.13-r1 )
-"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
-	"${FILESDIR}/${P}-CMakeLists-fix_lib.patch"
-	"${FILESDIR}/${P}-prman.patch"
-	"${FILESDIR}/${P}-fix-python-import.patch"
-	"${FILESDIR}/${P}-find-pyilmbase-python-module.patch"
-	"${FILESDIR}/${P}-find-boost-python-for-cmake-ge-3.11.patch"
-	"${FILESDIR}/${P}-fix-boost-python-naming.patch"
-)
-
-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=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake-utils_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 "NOTE: The renderman plugin is still experimental and has not"
-		einfo "been tested much. If you have trouble running it, please file"
-		einfo "a bug report for the package at Gentoo's bugzilla."
-		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/files/alembic-1.7.9-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
deleted file mode 100644
index 06ebf60b0d67..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 298f4be..18b3ff5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
-index 69e00da..47ccf66 100644
---- a/arnold/Procedural/CMakeLists.txt
-+++ b/arnold/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicArnoldProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL ( TARGETS
-   AlembicArnoldProcedural
-diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
-index 451409c..c882971 100644
---- a/bin/AbcConvert/CMakeLists.txt
-+++ b/bin/AbcConvert/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
- 
- set_target_properties(abcconvert PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcconvert DESTINATION bin)
-diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
-index 511864a..bed92b2 100644
---- a/bin/AbcDiff/CMakeLists.txt
-+++ b/bin/AbcDiff/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
- 
- set_target_properties(abcdiff PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcdiff DESTINATION bin)
-diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
-index be5f5c1..eca449a 100644
---- a/bin/AbcEcho/CMakeLists.txt
-+++ b/bin/AbcEcho/CMakeLists.txt
-@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
- 
- set_target_properties(abcecho abcechobounds PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
-diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
-index 815f84f..92f83c4 100644
---- a/bin/AbcLs/CMakeLists.txt
-+++ b/bin/AbcLs/CMakeLists.txt
-@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
- 
- set_target_properties(abcls PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcls DESTINATION bin)
-diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
-index a963420..a84e00b 100644
---- a/bin/AbcStitcher/CMakeLists.txt
-+++ b/bin/AbcStitcher/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
- 
- set_target_properties(abcstitcher PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcstitcher DESTINATION bin)
-diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
-index b4f65f1..74225ac 100644
---- a/bin/AbcTree/CMakeLists.txt
-+++ b/bin/AbcTree/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
- 
- set_target_properties(abctree PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abctree DESTINATION bin)
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index fb3def8..d5bbcec 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -84,7 +84,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
-     TARGET_LINK_LIBRARIES( Alembic atomic )
- ENDIF()
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
-         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -117,7 +117,7 @@ EXPORT(TARGETS
-     Alembic::
-     )
- 
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
-     "Where to install the Alembic's cmake files")
- 
- INSTALL(FILES
-diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
-index 50d2fd2..f8bc850 100644
---- a/maya/AbcExport/CMakeLists.txt
-+++ b/maya/AbcExport/CMakeLists.txt
-@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
- 
- set_target_properties(AbcExport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcExport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
-index 6826183..e71e612 100644
---- a/maya/AbcImport/CMakeLists.txt
-+++ b/maya/AbcImport/CMakeLists.txt
-@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
- 
- set_target_properties(AbcImport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcImport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..3635bcc 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicRiProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS
-     AlembicRiProcedural
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 91c45c4..c87eec6 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-     )
- 
-     SET( ALEMBIC_PYTHON_INSTALL_DIR
--        lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         CACHE PATH
-         "Alembic's python bindings install directory"
-     )
-@@ -143,7 +143,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
- 
-     set_target_properties(alembic PROPERTIES
-         INSTALL_RPATH_USE_LINK_PATH TRUE
--        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- ELSE()
-     MESSAGE(FATAL_ERROR "Unable to find Python libs")
- ENDIF()
diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch b/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
deleted file mode 100644
index d8abfce72f57..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..ba6f396 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,14 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
- 
- IF (USE_PYALEMBIC)
--    FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    # At least cmake-3.11 has introduced a new syntax while looking for
-+    # boost python libraries. It might apply to version 10 too, but I
-+    # couldn't check due to cmake-3.10 compile error.
-+    IF (CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python2.7)
-+    ELSE()
-+        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    ENDIF()
- ELSE()
-     FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
- ENDIF()
diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
deleted file mode 100644
index 4acdc5d7d885..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index 5cb9108..c3f80a2 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -44,7 +44,7 @@ ELSE()
-               SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
-             ELSE()
-               # TODO: set to default install path when shipping out
--              SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
-+              SET(ALEMBIC_PYILMBASE_ROOT "/usr")
-             ENDIF()
-         ELSE()
-             IF (${WINDOWS})
diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
deleted file mode 100644
index c14d7ad960c7..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 5a75e63..492be6a 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,10 +33,10 @@
- ##
- ##-*****************************************************************************
- 
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON2.7_LIBRARY_RELEASE: ${Boost_PYTHON2.7_LIBRARY_RELEASE}")
- 
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-+IF (Boost_PYTHON2.7_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-     MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
-     SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
- 
diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
deleted file mode 100644
index ca8bedef57ac..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index c677549..5cb9108 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -60,11 +60,11 @@ ELSE()
- 
-     SET(LIBRARY_PATHS
-         ${ALEMBIC_PYILMBASE_ROOT}/lib
--        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY}
-+#        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY} # this is defined nowhere
-         ~/Library/Frameworks
-         /Library/Frameworks
--        /usr/local/lib
--        /usr/lib
-+        /usr/local/lib${LIB_SUFFIX}
-+        /usr/lib${LIB_SUFFIX}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-@@ -118,8 +118,8 @@ ELSE()
-     FIND_PATH(ALEMBIC_PYIMATH_MODULE_DIRECTORY imathmodule.so
-         PATHS
-         ${LIBRARY_PATHS}
--        /usr/local/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
--        ${ALEMBIC_PYILMBASE_ROOT}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        /usr/local/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        ${ALEMBIC_PYILMBASE_ROOT}/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         DOC "The imathmodule.so module directory"
-     )
- 
diff --git a/media-gfx/alembic/files/alembic-1.7.9-prman.patch b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
deleted file mode 100644
index cfd299c79bb0..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-prman.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
-index e02b237..fdbf26c 100644
---- a/cmake/AlembicPRMan.cmake
-+++ b/cmake/AlembicPRMan.cmake
-@@ -66,8 +66,8 @@ ELSE()
- ENDIF()
- 
- # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
--IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
--  SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
-+IF(NOT $ENV{RMANTREE}x STREQUAL "x")
-+  SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
- ENDIF()
- 
- 
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..0cb2aa6 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -65,5 +65,5 @@ set_target_properties(AlembicRiProcedural PROPERTIES
- INSTALL(TARGETS
-     AlembicRiProcedural
-     DESTINATION
--    prman/procedurals
-+    $ENV{RMANTREE}/lib/plugins
- )
diff --git a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch b/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
deleted file mode 100644
index b291e839e8c9..000000000000
--- a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index dac8659..e7beb59 100644
---- a/cmake/Modules/FindIlmBase.cmake
-+++ b/cmake/Modules/FindIlmBase.cmake
-@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
-           SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
-         ELSE()
-           # TODO: set to default install path when shipping out
--          SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-+          SET( ALEMBIC_ILMBASE_ROOT "/usr" )
-         ENDIF()
-     ELSE()
-         IF ( ${WINDOWS} )
-@@ -97,6 +97,14 @@ FIND_PATH(ILMBASE_INCLUDE_DIR
-     include/OpenEXR
- )
- 
-+FIND_PACKAGE(PkgConfig)
-+IF (PKG_CONFIG_FOUND)
-+	PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+	IF (PC_ILMBASE_FOUND)
-+		SET(_ilmbase_libs_ver_init ${PC_ILMBASE_VERSION})
-+	ENDIF()
-+ENDIF()
-+
- # If the headers were found, get the version from config file, if not already set.
- IF(ILMBASE_INCLUDE_DIR)
-   SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})