commit: 2b711e0a5d119bb56416cbccb910e5a301b1561b Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> AuthorDate: Sat May 16 09:04:51 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Jun 8 16:46:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b711e0a
media-gfx/alembic: drop old Drop obsolete 1.7.9. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15821 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-gfx/alembic/Manifest | 1 - media-gfx/alembic/alembic-1.7.9.ebuild | 109 ------------ .../files/alembic-1.7.9-CMakeLists-fix_lib.patch | 189 --------------------- ...1.7.9-find-boost-python-for-cmake-ge-3.11.patch | 20 --- ...lembic-1.7.9-find-pyilmbase-python-module.patch | 13 -- .../alembic-1.7.9-fix-boost-python-naming.patch | 17 -- .../files/alembic-1.7.9-fix-python-import.patch | 30 ---- media-gfx/alembic/files/alembic-1.7.9-prman.patch | 26 --- .../files/alembic-FindIlmBase-pkgconfig.patch | 28 --- 9 files changed, 433 deletions(-) diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index 21dfd588300..c647c113758 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -1,3 +1,2 @@ DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70 DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210 -DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2 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 c04e8c9b6f6..00000000000 --- 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 06ebf60b0d6..00000000000 --- 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 d8abfce72f5..00000000000 --- 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 4acdc5d7d88..00000000000 --- 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 c14d7ad960c..00000000000 --- 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 ca8bedef57a..00000000000 --- 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 cfd299c79bb..00000000000 --- 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 b291e839e8c..00000000000 --- 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})
