gentoo resync : 18.05.2019

4 files changed, 44 insertions, 6 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 435a73fa065a..7c4cc535ddf6 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,5 +1,7 @@
 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-CMakeLists-fix_lib.patch 4760 BLAKE2B a5365176200b40a31d274bab9ef126cb0ea380c6afeb2ec152bc5edd4c7abb0cbc514a5324ff6df6ad791b585af8cc48984e0eaaf12f1abd2629d405e39c6e18 SHA512 5ef90e477ceeddd9a1040c024e3775141d693b99361dc3d943ee6014c700b13a2ef8d83d60e53cf32611c828bd1f7b789544468fec97cc4b56963338b3fc604a
@@ -8,5 +10,5 @@ AUX alembic-fix-importerror.patch 662 BLAKE2B 140f80ff08522ec84a43cb5e988e7e532b
 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 3063 BLAKE2B 5d4c244b3c514a177fcb90e855911fbbc7f765a9a3bd7ecc384913f33cd9c2e08ea2818e6ed6ad2f2b0c0e1543b335994468f56462fa38b08dc692e69169a0f3 SHA512 fb52f995805883489d0359b587fcdb12316c40092d5a5647f2f6775fae9ea03a811322ff66ff00920dd1b4f2099dcfa535d85da72edec6c364a503d76eef16aa
+EBUILD alembic-1.7.9.ebuild 3015 BLAKE2B dd6e430c4b1d11e7bcab88de6ee6c5bb2c6bb176ec700c59448c31477069fc42dda77fee34694ff983c25bec7854b3adaa7c1b120b61648e4f41b0d6d41e40aa SHA512 6ed134efe406b41b3187f33edbc092076cff7f42eabb110d5bd9f0191f984a040ce86e5ccd0ab4f9bcaa7ea86de58b4002424684f9f68bd5600bc511dbdfba7f
 MISC metadata.xml 1489 BLAKE2B 436a0537ec36495d3c87ced52ed779f60646d57df10e6f04c65d7037f169f865ecc18f4fef2c5b109352427af25206a7ef5913be4e16ef5e6115015aec22fca3 SHA512 91e4fb6528e65716926ef053712f40dcb8d8de4337653edc7f562419c227c4adc4c6837d8790bfdfee2330e90d9e31185f7265b74cba21599e1e4d21b80a82f5
diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
index 638b12a639b9..a6eebf37327a 100644
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ b/media-gfx/alembic/alembic-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-# TODO: ~x86 currently depends on new =dev-python/pyilmbase-2.3.0 which has
-# ~x86 keyword. As soon as it's updated in the tree, the keyword can be
-# added here.
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
 
 # pyalembic python bindings need boost
@@ -49,6 +46,8 @@ PATCHES=(
 	"${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() {
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
new file mode 100644
index 000000000000..d8abfce72f57
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
@@ -0,0 +1,20 @@
+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-fix-boost-python-naming.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
new file mode 100644
index 000000000000..c14d7ad960c7
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
@@ -0,0 +1,17 @@
+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})
+