gentoo resync : 16.06.2019

5 files changed, 1 insertions, 259 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 7c4cc535ddf6..4587122c3010 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -4,11 +4,7 @@ AUX alembic-1.7.9-find-pyilmbase-python-module.patch 542 BLAKE2B 448114ef30e6131
 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-CMakeLists-fix_lib.patch 4760 BLAKE2B a5365176200b40a31d274bab9ef126cb0ea380c6afeb2ec152bc5edd4c7abb0cbc514a5324ff6df6ad791b585af8cc48984e0eaaf12f1abd2629d405e39c6e18 SHA512 5ef90e477ceeddd9a1040c024e3775141d693b99361dc3d943ee6014c700b13a2ef8d83d60e53cf32611c828bd1f7b789544468fec97cc4b56963338b3fc604a
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
-AUX alembic-fix-importerror.patch 662 BLAKE2B 140f80ff08522ec84a43cb5e988e7e532b2391a002e0aedbd9276d2c3ef34570bb07ec78e470eb3eadc0b9c719263030d0074dd839e37a6ea19de88f5b5cd001 SHA512 a97c3d6854cc9aabfaeaf6ac62669f1ada78edf7ded8ab9cfd7e0b7077288f16cb1537196a14d62f4cdda33ef3c65ff640ff6250a3f40e499eab72913c099efd
-DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
-EBUILD alembic-1.7.4.ebuild 2398 BLAKE2B b22d682575c1bd1a75f073d6ad82e92e39bfbd15439848ee9b00ce434a366e1fa0dac7fbb3d079a8dacc6cb088c7d21cbee887d9f1d5f1ffb3d7f65728b1fd26 SHA512 9e9d10622ccda6a79d3bd69a5d5441c9a2612ff9e4ed67c1e80e4a03e270e887860e92f355d057715f62faa8ecba7bb7f5eeeea2f98e0c8d922b90e43e57cf31
 EBUILD alembic-1.7.9.ebuild 3015 BLAKE2B dd6e430c4b1d11e7bcab88de6ee6c5bb2c6bb176ec700c59448c31477069fc42dda77fee34694ff983c25bec7854b3adaa7c1b120b61648e4f41b0d6d41e40aa SHA512 6ed134efe406b41b3187f33edbc092076cff7f42eabb110d5bd9f0191f984a040ce86e5ccd0ab4f9bcaa7ea86de58b4002424684f9f68bd5600bc511dbdfba7f
-MISC metadata.xml 1489 BLAKE2B 436a0537ec36495d3c87ced52ed779f60646d57df10e6f04c65d7037f169f865ecc18f4fef2c5b109352427af25206a7ef5913be4e16ef5e6115015aec22fca3 SHA512 91e4fb6528e65716926ef053712f40dcb8d8de4337653edc7f562419c227c4adc4c6837d8790bfdfee2330e90d9e31185f7265b74cba21599e1e4d21b80a82f5
+MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.4.ebuild b/media-gfx/alembic/alembic-1.7.4.ebuild
deleted file mode 100644
index 542642f08d73..000000000000
--- a/media-gfx/alembic/alembic-1.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 cmake-utils
-
-DESCRIPTION="Alembic is an 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"
-IUSE="+boost doc hdf5 pyalembic test +zlib"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-	pyalembic? ( boost )"
-
-DEPEND="
-	${PYTHON_DEP}
-	>=dev-util/cmake-3.7.2
-	boost? ( >=dev-libs/boost-1.62.0-r1 )
-	doc? ( >=app-doc/doxygen-1.8.13-r1 )
-	pyalembic? ( >=dev-python/pyilmbase-2.2.0 )"
-
-RDEPEND="
-	${PYTHON_DEP}
-	>=media-libs/openexr-2.2.0-r2
-	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )"
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
-	"${FILESDIR}/${PN}-CMakeLists-fix_lib.patch"
-	"${FILESDIR}/${PN}-fix-importerror.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-# Static linking, the use of tr1 and support for prman might be added
-# in the future.
-src_configure() {
-	# I don't have a license for arnold renderer or maya so I disable them
-	# as default.
-	# Also I'm currently not using renderman, so I disable the prman flag
-	# by default too.
-	local mycmakeargs=(
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=OFF
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		-DUSE_PYALEMBIC=$(usex pyalembic)
-		-DUSE_STATIC_BOOST=OFF	# I won't use static libraries
-		-DUSE_STATIC_HDF5=OFF
-		-DUSE_TESTS=$(usex test)
-		-DALEMBIC_ILMBASE_LINK_STATIC=OFF # I don't want to link statically against ilmbase
-		-DALEMBIC_SHARED_LIBS=ON # For now let's ignore building static libraries
-		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
-		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen -u Doxyfile
-		doxygen Doxyfile
-	fi
-}
-
-src_test() {
-	if use test; then
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" cmake-utils_src_install
-	if use doc; then
-		dodoc -r "doc/html"
-	fi
-
-	# move the cmake files from lib->lib64
-	mv "${D}/usr/lib/cmake" "${D}/usr/lib64/cmake" || die
-	rm -rv "${D}/usr/lib" || die
-}
diff --git a/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch
deleted file mode 100644
index c653927ecbe1..000000000000
--- a/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d84f002..a35b662 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -79,12 +79,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 lib64)
-+SET(LIBRARY_INSTALL_DIR lib64)
-+SET(ARCHIVE_INSTALL_DIR lib64)
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib64)
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
-index 3725ed7..edea767 100644
---- a/bin/AbcConvert/CMakeLists.txt
-+++ b/bin/AbcConvert/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic)
- 
- set_target_properties(abcconvert PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcconvert DESTINATION bin)
-diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
-index e2fd355..2234650 100644
---- a/bin/AbcDiff/CMakeLists.txt
-+++ b/bin/AbcDiff/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic)
- 
- set_target_properties(abcdiff PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcdiff DESTINATION bin)
-diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
-index 396226e..116c122 100644
---- a/bin/AbcEcho/CMakeLists.txt
-+++ b/bin/AbcEcho/CMakeLists.txt
-@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic)
- 
- set_target_properties(abcecho abcechobounds PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
-diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
-index 1dbeb9d..7b721d0 100644
---- a/bin/AbcLs/CMakeLists.txt
-+++ b/bin/AbcLs/CMakeLists.txt
-@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic)
- 
- set_target_properties(abcls PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcls DESTINATION bin)
-diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
-index 3106bf2..0c8a205 100644
---- a/bin/AbcStitcher/CMakeLists.txt
-+++ b/bin/AbcStitcher/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic)
- 
- set_target_properties(abcstitcher PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcstitcher DESTINATION bin)
-diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
-index 3c41004..de7c7fc 100644
---- a/bin/AbcTree/CMakeLists.txt
-+++ b/bin/AbcTree/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic)
- 
- set_target_properties(abctree PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abctree DESTINATION bin)
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index 3e16518..b07cb7d 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -86,9 +86,9 @@ ENDIF()
- 
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib
--        RUNTIME DESTINATION lib)
-+        LIBRARY DESTINATION lib64
-+        ARCHIVE DESTINATION lib64
-+        RUNTIME DESTINATION lib64)
- 
- #-******************************************************************************
- # PACKAGE EXPORTS
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 06daf30..254ca2b 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-     )
- 
-     INSTALL (TARGETS alembic
--        DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        DESTINATION lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-     )
- 
-     IF (USE_TESTS)
-@@ -137,7 +137,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}/lib64)
- ELSE()
-     MESSAGE(FATAL_ERROR "Unable to find Python libs")
- ENDIF()
diff --git a/media-gfx/alembic/files/alembic-fix-importerror.patch b/media-gfx/alembic/files/alembic-fix-importerror.patch
deleted file mode 100644
index 8a86f08c7334..000000000000
--- a/media-gfx/alembic/files/alembic-fix-importerror.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 254ca2b..c8c915a 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -45,6 +45,12 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-         ADD_DEFINITIONS(-Wno-unused-local-typedefs)
-     ENDIF()
- 
-+	# fix for ImportError: dynamic module does not define init function (initalembic)
-+	# see: https://github.com/alembic/alembic/issues/142
-+	IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-+		SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
-+	ENDIF()
-+
-     SET(CPP_FILES
-         PyAbcCoreLayer.cpp
-         PyAbcGeomTypes.cpp
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 30e01e315c7e..4166d46b5bcf 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -26,10 +26,6 @@
 	<flag name="prman">
 		Compile Alembic plugin for Renderman (experimental)
 	</flag>
-	<flag name="pyalembic">
-		<!-- renamed to python in 1.7.9 -->
-		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
-	</flag>
 	<flag name="python">
 		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
 	</flag>