[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/

["David Seifert" <soap@gentoo.org>]

commit:     d63b3a02afa72407023a48914255dc8fbdf1bebf
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Thu Sep 21 09:29:30 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 08:37:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63b3a02

media-gfx/openvdb: version bump to 4.0.2

* Changed hardcoded paths to GNUInstallDirs
* Patch to fixnumeric removal in Boost 1.65
* Use PkgConfig to find OpenEXR and IlmBase

Bug: https://bugs.gentoo.org/612942
Closes: https://bugs.gentoo.org/611842
Closes: https://bugs.gentoo.org/630740
Closes: https://github.com/gentoo/gentoo/pull/5754

 media-gfx/openvdb/Manifest                         |  2 +
 media-gfx/openvdb/metadata.xml                     |  4 +-
 media-gfx/openvdb/openvdb-3.2.0.ebuild             |  1 -
 media-gfx/openvdb/openvdb-4.0.0.ebuild             |  1 -
 .../{openvdb-4.0.0.ebuild => openvdb-4.0.2.ebuild} | 52 ++++++++++------------
 5 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 50e0668256c..f1e54fb61aa 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,2 +1,4 @@
 DIST openvdb-3.2.0.tar.gz 1368870 SHA256 d4b6eb63a2c1c62ca449399f3d7789638fde655c32a977b50717b727420a634b SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91 WHIRLPOOL 3b76ba4998ac39405bbbdf0b1a80488234c5f25e8b0943d4520d9fa783384a111e48ff2120e942f5d9b3862e1f227ff89dcc633842e1290060afb1836785455f
 DIST openvdb-4.0.0.tar.gz 1545221 SHA256 eaf37b8e723cfd011df350cb0ef93ffa22d927bf7cb1f72c38176fce523b3537 SHA512 138e23408d725f153f5545c8083cd16f6b3e5cf80308e080d5e463f74f947759cdf5f9d818137ebffaf8b2de77bffa8f38ef0d20758a1418aea1c71702c0001d WHIRLPOOL 8b6413dc3bb7aa6efb2b5472b9df0ccc8493082be02ddd9243fa6ccc1cf183612c8700e3384d1a26f321dda99022292338d61bfa3576cc6ad96a0f35de6fd226
+DIST openvdb-4.0.2-patchset-01.tar.xz 16420 SHA256 c1cbc2f7d484fc3ff0d438e842c81a754996d5fd01f88cc86264bef468bf1050 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3 WHIRLPOOL 3d3a59ceab8dc031098047722c539eb1448c1048ac2134cf497a41f4b68eaafc30a80ac1d609a6bd01b554beb8e4693a33a766c5f66e8699bf44e79b349e0b35
+DIST openvdb-4.0.2.tar.gz 1689119 SHA256 7d995976cf124136b874d006496c37589f32de1b877ee7ccce626710823e8dbb SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d WHIRLPOOL 2ff44f4795fbb141d60fc03b1c5499ce0c0b970ff205d34e5fbd2221d94ff29b5ce43d349e58263f8b54f025cad0e44a6fa0bb58e170296427600d8acb6a69e6

diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 4872e775d01..12b9cf4a8f7 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -15,8 +15,8 @@
 	</maintainer>
 	<longdescription>
 		Libraries from Dreamworks Animation for the efficient manipulation 
-                of volumetric data used in big budget movies like 'Cloudy with a
-                Chance of Meatballs2' and 'How to Train Your Dragon 2'. 
+		of volumetric data used in big budget movies like 'Cloudy with a
+		Chance of Meatballs2' and 'How to Train Your Dragon 2'. 
 	</longdescription>
 	<use>
 		<flag restrict="&gt;=media-gfx/openvdb-4.0.0" name="abi3-compat">

diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild
index ed84fad7f99..bdd39bb6e1f 100644
--- a/media-gfx/openvdb/openvdb-3.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-3.2.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $id$
 
 EAPI=6
 

diff --git a/media-gfx/openvdb/openvdb-4.0.0.ebuild b/media-gfx/openvdb/openvdb-4.0.0.ebuild
index f35201437c7..f3168eb1ec2 100644
--- a/media-gfx/openvdb/openvdb-4.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $id$
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )

diff --git a/media-gfx/openvdb/openvdb-4.0.0.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
similarity index 62%
copy from media-gfx/openvdb/openvdb-4.0.0.ebuild
copy to media-gfx/openvdb/openvdb-4.0.2.ebuild
index f35201437c7..aeac72948ca 100644
--- a/media-gfx/openvdb/openvdb-4.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild
@@ -1,78 +1,74 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $id$
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit eutils flag-o-matic cmake-utils python-single-r1
+inherit cmake-utils flag-o-matic python-single-r1 versionator
 
 DESCRIPTION="Libs for the efficient manipulation of volumetric data"
 HOMEPAGE="http://www.openvdb.org"
-
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+abi3-compat doc python"
-
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
+RDEPEND="sys-libs/zlib:=
 	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/jemalloc
-	dev-libs/log4cplus
-	media-libs/glfw:=
 	media-libs/openexr:=
-	sys-libs/zlib
+	media-libs/glfw:=
 	x11-libs/libXi
 	x11-libs/libXrandr
 	x11-libs/libXinerama
 	x11-libs/libXcursor
+	dev-libs/jemalloc
+	>=dev-libs/c-blosc-1.5.0
+	dev-libs/log4cplus
 	python? (
 		${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)"
+
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	dev-cpp/tbb
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
-	)"
+	doc? ( app-doc/doxygen[latex] )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-make-docs-optional.patch
-	"${FILESDIR}"/${P}-build-docs-once.patch
-	"${FILESDIR}"/${P}-namespace-fixes.patch
-	"${FILESDIR}"/${P}-python-module-install-dir-fix.patch
+	"${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch"
+	"${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch"
+	"${WORKDIR}/0003-Boost-1.65-NumPy-support.patch"
 )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
-	local myprefix="${EPREFIX}"/usr/
+	local myprefix="${EPREFIX}/usr/"
 
 	# To stay in sync with Boost
 	append-cxxflags -std=c++14
 
-	# Enable unit tests later in 4.0.1
 	local mycmakeargs=(
 		-DOPENVDB_BUILD_UNITTESTS=OFF
 		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
 		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DUSE_GLFW3=ON
 		-DBLOSC_LOCATION="${myprefix}"
 		-DGLEW_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
 		-DGLFW3_LOCATION="${myprefix}"
-		-DILMBASE_LOCATION="${myprefix}"
-		-DILMBASE_NAMESPACE_VERSIONING=OFF
-		-DOPENEXR_LOCATION="${myprefix}"
-		-DOPENEXR_NAMESPACE_VERSIONING=OFF
 		-DTBB_LOCATION="${myprefix}"
 	)
 
-	use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=$(python_get_sitedir) )
+	use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} )
 
 	cmake-utils_src_configure
 }