From 9017ebcc53918054a573124b928936911ef5158a Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 7 Feb 2020 16:06:08 +0100 Subject: media-gfx/openvdb: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- media-gfx/openvdb/openvdb-4.0.2-r2.ebuild | 79 ----------------------------- media-gfx/openvdb/openvdb-4.0.2-r3.ebuild | 82 +++++++++++++++++++++++++++++++ media-gfx/openvdb/openvdb-5.2.0-r1.ebuild | 75 ++++++++++++++++++++++++++++ media-gfx/openvdb/openvdb-5.2.0.ebuild | 72 --------------------------- 4 files changed, 157 insertions(+), 151 deletions(-) delete mode 100644 media-gfx/openvdb/openvdb-4.0.2-r2.ebuild create mode 100644 media-gfx/openvdb/openvdb-4.0.2-r3.ebuild create mode 100644 media-gfx/openvdb/openvdb-5.2.0-r1.ebuild delete mode 100644 media-gfx/openvdb/openvdb-5.2.0.ebuild diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild deleted file mode 100644 index e54468f1c2a1..000000000000 --- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit cmake-utils flag-o-matic python-single-r1 - -DESCRIPTION="Libs for the efficient manipulation of volumetric data" -HOMEPAGE="https://www.openvdb.org" -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+abi3-compat doc python test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=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:= - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - )" - -DEPEND="${RDEPEND} - dev-cpp/tbb - virtual/pkgconfig - doc? ( app-doc/doxygen[latex] ) - test? ( dev-util/cppunit )" - -PATCHES=( - "${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch" - "${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch" - "${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch" - "${FILESDIR}/${P}-findboost-fix.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myprefix="${EPREFIX}/usr/" - - # To stay in sync with Boost - append-cxxflags -std=c++14 - - local mycmakeargs=( - -DBLOSC_LOCATION="${myprefix}" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DGLFW3_LOCATION="${myprefix}" - -DOPENVDB_BUILD_DOCS=$(usex doc) - -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) - -DOPENVDB_BUILD_UNITTESTS=$(usex test) - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat) - -DOPENVDB_ENABLE_RPATH=OFF - -DTBB_LOCATION="${myprefix}" - -DUSE_GLFW3=ON - ) - - use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) - use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) - - cmake-utils_src_configure -} diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild new file mode 100644 index 000000000000..c683e96e7099 --- /dev/null +++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_6 ) + +inherit cmake-utils flag-o-matic python-single-r1 + +DESCRIPTION="Libs for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="+abi3-compat doc python test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/boost-1.62:= + >=dev-libs/c-blosc-1.5.0 + dev-libs/jemalloc + dev-libs/log4cplus + media-libs/glfw:= + media-libs/openexr:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + )" + +DEPEND="${RDEPEND} + dev-cpp/tbb + virtual/pkgconfig + doc? ( app-doc/doxygen[latex] ) + test? ( dev-util/cppunit )" + +PATCHES=( + "${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch" + "${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch" + "${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch" + "${FILESDIR}/${P}-findboost-fix.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + # To stay in sync with Boost + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DBLOSC_LOCATION="${myprefix}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DGLFW3_LOCATION="${myprefix}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat) + -DOPENVDB_ENABLE_RPATH=OFF + -DTBB_LOCATION="${myprefix}" + -DUSE_GLFW3=ON + ) + + use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) + use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) + + cmake-utils_src_configure +} diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild new file mode 100644 index 000000000000..acb7886d4438 --- /dev/null +++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_6 ) + +inherit cmake-utils flag-o-matic python-single-r1 + +DESCRIPTION="Libs for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+abi4-compat doc python test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/boost-1.62:= + >=dev-libs/c-blosc-1.5.0 + dev-libs/jemalloc + dev-libs/log4cplus + media-libs/glfw:= + media-libs/openexr:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + )" + +DEPEND="${RDEPEND} + dev-cpp/tbb + virtual/pkgconfig + doc? ( app-doc/doxygen[latex] ) + test? ( dev-util/cppunit )" + +PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch" + "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local mycmakeargs=( + -DBLOSC_LOCATION="${myprefix}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DGLFW3_LOCATION="${myprefix}" + -DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5) + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_ENABLE_RPATH=OFF + -DTBB_LOCATION="${myprefix}" + -DUSE_GLFW3=ON + ) + + use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) + use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) + + cmake-utils_src_configure +} diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild deleted file mode 100644 index 3bbdbdb4fb2a..000000000000 --- a/media-gfx/openvdb/openvdb-5.2.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit cmake-utils flag-o-matic python-single-r1 - -DESCRIPTION="Libs for the efficient manipulation of volumetric data" -HOMEPAGE="https://www.openvdb.org" -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+abi4-compat doc python test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=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:= - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - )" - -DEPEND="${RDEPEND} - dev-cpp/tbb - virtual/pkgconfig - doc? ( app-doc/doxygen[latex] ) - test? ( dev-util/cppunit )" - -PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch" - "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myprefix="${EPREFIX}/usr/" - - local mycmakeargs=( - -DBLOSC_LOCATION="${myprefix}" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DGLFW3_LOCATION="${myprefix}" - -DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5) - -DOPENVDB_BUILD_DOCS=$(usex doc) - -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) - -DOPENVDB_BUILD_UNITTESTS=$(usex test) - -DOPENVDB_ENABLE_RPATH=OFF - -DTBB_LOCATION="${myprefix}" - -DUSE_GLFW3=ON - ) - - use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) - use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) - - cmake-utils_src_configure -} -- cgit v1.2.3-65-gdbad