From 9017ebcc53918054a573124b928936911ef5158a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 16:06:08 +0100 Subject: [PATCH] media-gfx/openvdb: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../{openvdb-4.0.2-r2.ebuild => openvdb-4.0.2-r3.ebuild} | 7 +++++-- .../{openvdb-5.2.0.ebuild => openvdb-5.2.0-r1.ebuild} | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) rename media-gfx/openvdb/{openvdb-4.0.2-r2.ebuild => openvdb-4.0.2-r3.ebuild} (92%) rename media-gfx/openvdb/{openvdb-5.2.0.ebuild => openvdb-5.2.0-r1.ebuild} (91%) diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild similarity index 92% rename from media-gfx/openvdb/openvdb-4.0.2-r2.ebuild rename to media-gfx/openvdb/openvdb-4.0.2-r3.ebuild index e54468f1c2a1..c683e96e7099 100644 --- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild +++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild @@ -20,7 +20,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] + >=dev-libs/boost-1.62:= >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus @@ -33,7 +33,10 @@ RDEPEND=" x11-libs/libXrandr python? ( ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') )" DEPEND="${RDEPEND} diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild similarity index 91% rename from media-gfx/openvdb/openvdb-5.2.0.ebuild rename to media-gfx/openvdb/openvdb-5.2.0-r1.ebuild index 3bbdbdb4fb2a..acb7886d4438 100644 --- a/media-gfx/openvdb/openvdb-5.2.0.ebuild +++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild @@ -19,7 +19,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] + >=dev-libs/boost-1.62:= >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus @@ -32,7 +32,10 @@ RDEPEND=" x11-libs/libXrandr python? ( ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') )" DEPEND="${RDEPEND} -- 2.26.2