gentoo Easter resync : 12.04.2020

6 files changed, 4 insertions, 549 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 657b5bedde19..90b1c4dd5831 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,12 +1,5 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
 AUX osl-1.10.5-upstream-patch-to-find-openexr-version.patch 3609 BLAKE2B 25951dd971f344d8c2233bb58d05f87ce77a12db182c19d16c346e41644c6cc64b4e20b631ab0e03b4a00a42de624693a61b04930beecea0fe0ed3dff1760fa6 SHA512 0c27bf26afbe5806565d3ad7617f35e66814695435e9c176e73faa09b5508830803709a040aea2901293a3fd2a2110b4daf622099a5c01e92fd2ee9d09b15cae
-AUX osl-1.8.12-cmake-fixes.patch 14704 BLAKE2B dd7d37ae117c338aa72893a26e59f3046c89d5ddc57c7dfc90225d1e49f5bd4346869db7621e2ec0b7c082650d54987a4f6c1196a169828fa17388ad7a3a32e3 SHA512 14059eb68c520e90ed3217b0480929efa4b1ccfa6860649ca86285856d8f5efd07a563ad01dc8bb46dd42d277708b27a9a9f8833f60960502162df0fc1ee243c
 DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4 SHA512 d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
-DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
-DIST osl-1.9.6.tar.gz 14765052 BLAKE2B c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06ddddc9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002 SHA512 e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
-DIST osl-1.9.9.tar.gz 14771575 BLAKE2B ffbfa935c0d6568c9b35048d5b05965abc75775f4a4f56a434a331a45f4963b3e5cb74fb965748a5fb94cdd3a4201a4745ce564646cbbe535ca2646a734dc33c SHA512 7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647
-EBUILD osl-1.10.5.ebuild 2007 BLAKE2B 317b1927339cd25fdb5d9033a15bcefb40ee73e590b2f66873f98d3d224bccfaec4c2a4f607ac114829356b7d94eccb062abd8410047cefab3f3579f92e7ed56 SHA512 c7a42a034f42ab3e28de5c67d482eb39d0a5396abd98e53ed8e2f39fa30b0f17c51f6c6aebbad7cd53db3af0f33b2caf055a42d9e02d6ee6dd309083b845a61f
-EBUILD osl-1.8.12.ebuild 1784 BLAKE2B c01cae7aec718f704fe017dc0f3273db7e3046fa276b4b82030dafc4a59ab641b7faa20a7ce2735d52347a30b1188458a9b9f6316bd96bc406e3363018a51350 SHA512 d5148e294ac96cfd06639927af0b3d03a00193d1ffbf55b65e51e717e8ed72fc15cb81b3e418bcd9bde102ad8ede59b92aff966ae0dbb3e366f120706b119fa4
-EBUILD osl-1.9.6.ebuild 1748 BLAKE2B e6b99e1822ced26cf8d6e138f46d4c5e038f078e0b697ecd40e6cde3870efa945160af3cf83f675825fe5a878b5e5bd6a7ec8caea79d4961a0da23130d2d652b SHA512 d0ce4444dc300b869a520a7bc50ea1d95a0ac0342684495c0742a62e55a8f0cb9453ad71fa2ca0ba412970d7d0323409ae8eff99862908d80a24977ce3babaa5
-EBUILD osl-1.9.9.ebuild 1720 BLAKE2B 22d51d110a3128ece31bc2f0155e94f996ae65f2adc42690053305d4b8304737b82a991431114f48524fe5c1ab6b8643899e02a99a341ff5bf653fbff7990b91 SHA512 914cbed1d6020934a8139d8b7a553a275c09c4fa89178237c7105845e6e3cec86c5e1b163ec261a82237d0505c04b624f75294868d2ab469656b639bcefdb0c5
+EBUILD osl-1.10.5.ebuild 2028 BLAKE2B 982a0542132c80ea6c30fe553215138a8d295174c9c22463a441d0c8504acc281fe1cba5bbf9ca361fc51cbbf314327f8464cdc15e3fac2fcdcca36628db8cee SHA512 ff72354c579fe82a12c524b9c3efa3af17b6fbc2ddf0967248da10bf050bb44582675f633d28dac03765332d1966bd1693729204b09fa79e7ff59910ed2df064
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch b/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
deleted file mode 100644
index 6ad5d94ac93a..000000000000
--- a/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-From cb34603cce0a8814dc66f76ecc5ceeb04a8d3791 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Fri, 18 Aug 2017 13:37:54 +0100
-Subject: [PATCH] OpenShadingLanguage/RB-1.8: Change to GNUInstallDirs for
- install paths
-
-The variables: BIN_INSTALL_DIR, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR,
-DOC_INSTALL_DIR, and MAN_INSTALL_DIR are defined but never used.
-Instead, hard coded paths to lib, include, and bin were used. This
-will cause difficulty on multi-lib systems or in cases where they
-are named differently. The existing variables were replaced by the
-GNUInstallDirs variables, which is compatible on all systems.
-
-The macro install_targets was defined, but never used in code,
-so all library installs were changed to use it.
-Thus all library installs now use GNUInstallDirs.
-
-INSTALL_DOCS variable is defined, so it's now controlling if
-the documentation is being installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt                 | 66 +++++++++---------------------------------
- src/cmake/util_macros.cmake    |  6 ++--
- src/doc/CMakeLists.txt         |  6 ++--
- src/include/CMakeLists.txt     |  2 +-
- src/liboslcomp/CMakeLists.txt  |  2 +-
- src/liboslexec/CMakeLists.txt  |  2 +-
- src/liboslnoise/CMakeLists.txt |  2 +-
- src/liboslquery/CMakeLists.txt |  2 +-
- src/osl.imageio/CMakeLists.txt | 19 +-----------
- src/oslc/CMakeLists.txt        |  2 +-
- src/oslinfo/CMakeLists.txt     |  2 +-
- src/testrender/CMakeLists.txt  |  2 +-
- src/testshade/CMakeLists.txt   |  6 ++--
- 13 files changed, 32 insertions(+), 87 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 305047c0..da4635ab 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,6 +248,8 @@ set (OSL_BUILD_PLUGINS ON CACHE BOOL "Bool OSL plugins, for example OIIO plugin"
- set (USE_CCACHE ON CACHE BOOL "Use ccache if found")
- set (CODECOV OFF CACHE BOOL "Build code coverage tests")
- option (USE_BOOST_WAVE "Use Boost Wave for C preprocessor (alternative is to use clang)" OFF)
-+set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
-+set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
- 
- # Use ccache if found
- find_program (CCACHE_FOUND ccache)
-@@ -349,6 +351,14 @@ if (OSL_NAMESPACE)
- endif ()
- message(STATUS "Setting Namespace to: ${OSL_NAMESPACE}")
- 
-+include (GNUInstallDirs)
-+
-+message (STATUS "CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX}")
-+message (STATUS "CMAKE_INSTALL_LIBDIR is ${CMAKE_INSTALL_LIBDIR}")
-+message (STATUS "CMAKE_INSTALL_BINDIR is ${CMAKE_INSTALL_BINDIR}")
-+message (STATUS "CMAKE_INSTALL_DOCDIR is ${CMAKE_INSTALL_DOCDIR}")
-+message (STATUS "CMAKE_INSTALL_INCLUDEDIR is ${CMAKE_INSTALL_INCLUDEDIR}")
-+
- set (CMAKE_MODULE_PATH
-      "${PROJECT_SOURCE_DIR}/src/cmake/modules"
-      "${PROJECT_SOURCE_DIR}/src/cmake")
-@@ -363,58 +373,6 @@ include_directories (
-   )
- 
- 
--###########################################################################
--# Paths for install tree customization.  Note that relative paths are relative
--# to CMAKE_INSTALL_PREFIX.
--set (DEFAULT_BIN_INSTALL_DIR   "bin")
--set (DEFAULT_LIB_INSTALL_DIR   "lib")
--set (DEFAULT_INCLUDE_INSTALL_DIR "include/OSL")
--if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
--    # Try to be well-behaved and install into reasonable places according to
--    # the "standard" unix directory heirarchy
--    # TODO: Figure out how to get the correct python directory
--    set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
--    set (DEFAULT_DOC_INSTALL_DIR "share/doc/OSL")
--    set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
--else ()
--    # Here is the "self-contained install tree" case: the expectation here is
--    # that everything OSL related will go into its own directory, not into
--    # some standard system heirarchy.
--    set (DEFAULT_PYLIB_INSTALL_DIR "python")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "python3")
--    set (DEFAULT_DOC_INSTALL_DIR "doc")
--    set (DEFAULT_MAN_INSTALL_DIR "doc/man")
--endif ()
--if (EXEC_INSTALL_PREFIX)
--    # Tack on an extra prefix to support multi-arch builds.
--    set (DEFAULT_BIN_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
--    set (DEFAULT_LIB_INSTALL_DIR   "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
--    set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
--    set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
--endif ()
--# Set up cmake cache variables corresponding to the defaults deduced above, so
--# that the user can override them as desired:
--set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
--     "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
--     "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
--     "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
--     "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
--     "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
--     "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
--if (UNIX)
--    set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
--         "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
--endif()
--set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
--set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
--
--
- if (APPLE)
-     set (MACOSX_RPATH ON)
- endif ()
-@@ -425,7 +383,7 @@ set (CMAKE_SKIP_BUILD_RPATH  FALSE)
- # (but later on when installing)
- set (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
- # the RPATH to be used when installing
--set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- # add the automatically determined parts of the RPATH
- # which point to directories outside the build tree to the install RPATH
- set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-@@ -472,7 +430,9 @@ add_subdirectory (src/osl.imageio)
- endif ()
- 
- add_subdirectory (src/include)
-+if (INSTALL_DOCS)
- add_subdirectory (src/doc)
-+endif ()
- 
- 
- 
-diff --git a/src/cmake/util_macros.cmake b/src/cmake/util_macros.cmake
-index 5691c925..fdaeb042 100644
---- a/src/cmake/util_macros.cmake
-+++ b/src/cmake/util_macros.cmake
-@@ -107,6 +107,8 @@ endmacro ()
- #    install_targets (target1 [target2 ...])
- #
- macro (install_targets)
--    install (TARGETS ${ARGN} RUNTIME DESTINATION bin
--             LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
-+    install (TARGETS ${ARGN}
-+             RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
-+             LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
-+             ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
- endmacro()
-diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index 9fefa26d..f90c6f00 100644
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
-                  markdeep.min.js
-                  )
- 
--install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
-+install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation)
- 
- install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
-                 "${PROJECT_SOURCE_DIR}/INSTALL.md"
-                 "${PROJECT_SOURCE_DIR}/CHANGES.md"
-                 "${PROJECT_SOURCE_DIR}/README.md"
--          DESTINATION doc )
-+          DESTINATION ${CMAKE_INSTALL_DOCDIR} )
- 
- 
- file (GLOB testshade_figures "Figures/testshade/*.jpg")
- install (FILES ${testshade_figures}
--         DESTINATION doc/Figures/testshade )
-+         DESTINATION ${CMAKE_INSTALL_DOCDIR}/Figures/testshade )
-diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
-index cf3747d1..4656ee78 100644
---- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -6,4 +6,4 @@ set (OSL_BUILD_CPP14 ${USE_CPP14})
- configure_file (OSL/oslversion.h.in "${CMAKE_BINARY_DIR}/include/OSL/oslversion.h" @ONLY)
- list (APPEND public_headers "${CMAKE_BINARY_DIR}/include/OSL/oslversion.h")
- 
--INSTALL ( FILES ${public_headers} DESTINATION include/OSL )
-+INSTALL ( FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OSL )
-diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt
-index b6fa459d..6ad9172f 100644
---- a/src/liboslcomp/CMakeLists.txt
-+++ b/src/liboslcomp/CMakeLists.txt
-@@ -25,5 +25,5 @@ TARGET_LINK_LIBRARIES ( oslcomp ${OPENIMAGEIO_LIBRARIES} ${ILMBASE_LIBRARIES}
-                        ${CLANG_LIBRARIES} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS}
-                        ${LLVM_SYSTEM_LIBRARIES})
- 
--INSTALL ( TARGETS oslcomp RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
-+install_targets (oslcomp)
- 
-diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
-index a0ffca5c..fa8a8728 100644
---- a/src/liboslexec/CMakeLists.txt
-+++ b/src/liboslexec/CMakeLists.txt
-@@ -157,7 +157,7 @@ TARGET_LINK_LIBRARIES ( oslexec
-                         ${LLVM_SYSTEM_LIBRARIES})
- ADD_DEPENDENCIES (oslexec "${CMAKE_SOURCE_DIR}/src/build-scripts/hidesymbols.map")
- 
--INSTALL ( TARGETS oslexec RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
-+install_targets (oslexec)
- 
- # Unit tests
- if (OSL_BUILD_TESTS)
-diff --git a/src/liboslnoise/CMakeLists.txt b/src/liboslnoise/CMakeLists.txt
-index bc4c175c..2df16afe 100644
---- a/src/liboslnoise/CMakeLists.txt
-+++ b/src/liboslnoise/CMakeLists.txt
-@@ -11,7 +11,7 @@ endif ()
- 
- TARGET_LINK_LIBRARIES ( oslnoise ${OPENIMAGEIO_LIBRARY} ${ILMBASE_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
- 
--INSTALL ( TARGETS oslnoise RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
-+install_targets (oslnoise)
- 
- 
- if (OSL_BUILD_TESTS)
-diff --git a/src/liboslquery/CMakeLists.txt b/src/liboslquery/CMakeLists.txt
-index 328fa4bb..083d0d5a 100644
---- a/src/liboslquery/CMakeLists.txt
-+++ b/src/liboslquery/CMakeLists.txt
-@@ -14,4 +14,4 @@ endif ()
- 
- TARGET_LINK_LIBRARIES ( oslquery ${OPENIMAGEIO_LIBRARY} ${ILMBASE_LIBRARIES} ${Boost_LIBRARIES} )
- 
--INSTALL ( TARGETS oslquery RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
-+install_targets (oslquery)
-diff --git a/src/osl.imageio/CMakeLists.txt b/src/osl.imageio/CMakeLists.txt
-index af612544..a8065e72 100644
---- a/src/osl.imageio/CMakeLists.txt
-+++ b/src/osl.imageio/CMakeLists.txt
-@@ -1,20 +1,3 @@
--# Macro to install targets to the appropriate locations.  Use this instead of
--# the install(TARGETS ...) signature.
--#
--# Note: the original is in OIIO's src/cmake/oiio_macros.cmake
--#
--# Usage:
--#
--#    oiio_install_targets (target1 [target2 ...])
--#
--macro (oiio_install_targets)
--    install (TARGETS ${ARGN}
--             RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
--             LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
--             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
--endmacro ()
--
--
- # Macro to add a build target for an IO plugin.
- #
- # Note: the original is in OIIO's src/cmake/oiio_macros.cmake
-@@ -37,7 +20,7 @@ macro (add_oiio_plugin)
-     add_library (${_target_name} SHARED ${_plugin_DEFAULT_ARGS})
-     target_link_libraries (${_target_name} ${OPENIMAGEIO_LIBRARY} ${_plugin_LINK_LIBRARIES})
-     set_target_properties (${_target_name} PROPERTIES PREFIX "" FOLDER "Plugins")
--    oiio_install_targets (${_target_name})
-+    install_targets (${_target_name})
- endmacro ()
- 
- 
-diff --git a/src/oslc/CMakeLists.txt b/src/oslc/CMakeLists.txt
-index d57fc595..47b73611 100644
---- a/src/oslc/CMakeLists.txt
-+++ b/src/oslc/CMakeLists.txt
-@@ -9,5 +9,5 @@ endif ()
- 
- ADD_EXECUTABLE ( oslc ${oslc_srcs} )
- TARGET_LINK_LIBRARIES ( oslc oslcomp ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--INSTALL ( TARGETS oslc RUNTIME DESTINATION bin )
-+INSTALL ( TARGETS oslc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
-diff --git a/src/oslinfo/CMakeLists.txt b/src/oslinfo/CMakeLists.txt
-index e67b4670..d3519033 100644
---- a/src/oslinfo/CMakeLists.txt
-+++ b/src/oslinfo/CMakeLists.txt
-@@ -1,4 +1,4 @@
- SET ( oslinfo_srcs oslinfo.cpp )
- ADD_EXECUTABLE ( oslinfo ${oslinfo_srcs} )
- TARGET_LINK_LIBRARIES ( oslinfo oslquery ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--INSTALL ( TARGETS oslinfo RUNTIME DESTINATION bin )
-+INSTALL ( TARGETS oslinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
-diff --git a/src/testrender/CMakeLists.txt b/src/testrender/CMakeLists.txt
-index 6643e1ee..03197346 100644
---- a/src/testrender/CMakeLists.txt
-+++ b/src/testrender/CMakeLists.txt
-@@ -2,4 +2,4 @@
- FILE(GLOB testrender_src *.cpp)
- ADD_EXECUTABLE ( testrender ${testrender_src} )
- TARGET_LINK_LIBRARIES ( testrender oslexec oslquery ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--INSTALL ( TARGETS testrender RUNTIME DESTINATION bin )
-+INSTALL ( TARGETS testrender RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
-diff --git a/src/testshade/CMakeLists.txt b/src/testshade/CMakeLists.txt
-index ee2f12ce..638097d4 100644
---- a/src/testshade/CMakeLists.txt
-+++ b/src/testshade/CMakeLists.txt
-@@ -2,7 +2,7 @@
- SET ( testshade_srcs testshade.cpp simplerend.cpp )
- ADD_EXECUTABLE ( testshade ${testshade_srcs} testshademain.cpp )
- TARGET_LINK_LIBRARIES ( testshade oslexec oslquery ${OPENIMAGEIO_LIBRARY} ${OPENEXR_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--INSTALL ( TARGETS testshade RUNTIME DESTINATION bin )
-+INSTALL ( TARGETS testshade RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
- # The 'libtestshade' library
- if (BUILDSTATIC)
-@@ -14,10 +14,10 @@ endif ()
- TARGET_LINK_LIBRARIES (libtestshade oslexec oslquery ${OPENIMAGEIO_LIBRARY} ${OPENEXR_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
- SET_TARGET_PROPERTIES (libtestshade PROPERTIES PREFIX "")
- 
--INSTALL ( TARGETS libtestshade RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+install_targets (libtestshade)
- 
- # The 'testshade_dso' executable
- ADD_EXECUTABLE ( testshade_dso testshade_dso.cpp )
- TARGET_LINK_LIBRARIES ( testshade_dso ${OPENIMAGEIO_LIBRARY} ${OPENEXR_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
--INSTALL ( TARGETS testshade_dso RUNTIME DESTINATION bin )
-+INSTALL ( TARGETS testshade_dso RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
--- 
-2.14.1
-
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
index 190989d2cc9e..b5c979d4f309 100644
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ b/media-libs/osl/osl-1.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
@@ -30,6 +30,7 @@ RDEPEND="
 	>=media-libs/openexr-2.2.0:=
 	>=media-libs/openimageio-1.8.5
 	>=sys-devel/clang-5:=
+	<sys-devel/clang-9:=
 	sys-libs/zlib:=
 	partio? ( media-libs/partio )
 	qt5? (
diff --git a/media-libs/osl/osl-1.8.12.ebuild b/media-libs/osl/osl-1.8.12.ebuild
deleted file mode 100644
index 038b952f7f47..000000000000
--- a/media-libs/osl/osl-1.8.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-
-MY_PV=${PV//_} # Remove underscore if any.
-[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
-
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 sse4_1:sse4.1 sse4_2:sse4.2 )
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="doc partio test ${CPU_FEATURES[@]%:*}"
-
-RDEPEND=">=media-libs/openexr-2.2.0
-	>=media-libs/openimageio-1.7.0
-	dev-libs/pugixml
-	sys-libs/zlib:=
-	partio? ( media-libs/partio )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-	sys-devel/clang
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
-
-src_configure() {
-	local cpufeature
-	local mysimd=""
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use ${cpufeature%:*} && mysimd+="${cpufeature#*:},"
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z $mysimd ]] && mysimd="0"
-
-	# LLVM needs CPP11. Do not disable.
-	local mycmakeargs=(
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_PARTIO=$(usex partio)
-		-DOSL_BUILD_CPP11=ON
-		-DENABLERTTI=OFF
-		-DSTOP_ON_WARNING=OFF
-		-DSELF_CONTAINED_INSTALL_TREE=OFF
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DINSTALL_DOCS=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DUSE_SIMD=${mysimd%,}
-		-DLLVM_STATIC=ON
-		-DVERBOSE=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/osl/osl-1.9.6.ebuild b/media-libs/osl/osl-1.9.6.ebuild
deleted file mode 100644
index 17accb5fe95e..000000000000
--- a/media-libs/osl/osl-1.9.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-
-MY_PV=${PV//_} # Remove underscore if any.
-[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
-
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio test ${CPU_FEATURES[@]%:*}"
-
-RDEPEND=">=media-libs/openexr-2.2.0
-	>=media-libs/openimageio-1.8.0
-	dev-libs/pugixml
-	sys-libs/zlib:=
-	partio? ( media-libs/partio )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-	sys-devel/clang
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
-
-src_configure() {
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	# LLVM needs CPP11. Do not disable.
-	local mycmakeargs=(
-		-DLLVM_STATIC=ON
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_PARTIO=$(usex partio)
-		-DENABLERTTI=OFF
-		-DSTOP_ON_WARNING=OFF
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DINSTALL_DOCS=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/osl/osl-1.9.9.ebuild b/media-libs/osl/osl-1.9.9.ebuild
deleted file mode 100644
index c4781e7e7bc1..000000000000
--- a/media-libs/osl/osl-1.9.9.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-
-MY_PV=${PV//_} # Remove underscore if any.
-[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
-
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio test ${CPU_FEATURES[@]%:*}"
-
-RDEPEND="dev-libs/pugixml
-	>=media-libs/openexr-2.2.0
-	>=media-libs/openimageio-1.8.0
-	sys-libs/zlib:=
-	partio? ( media-libs/partio )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-	sys-devel/clang
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# Restricting tests as Make file handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
-
-src_configure() {
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	# LLVM needs CPP11. Do not disable.
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DENABLERTTI=OFF
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DINSTALL_DOCS=$(usex doc)
-		-DLLVM_STATIC=ON
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_PARTIO=$(usex partio)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-	)
-
-	cmake-utils_src_configure
-}