commit: cecd559e5e4c0b727413d688ccbdc663024a6c0f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Feb 7 14:59:26 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Feb 9 16:26:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecd559e
media-gfx/cura: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-gfx/cura/cura-3.4.1.ebuild | 12 +++++++----- media-gfx/cura/cura-3.6.0.ebuild | 12 +++++++----- media-gfx/cura/cura-4.2.1.ebuild | 12 +++++++----- media-gfx/cura/{cura-4.3.0.ebuild => cura-4.3.0-r1.ebuild} | 12 +++++++----- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild index 16ebf84a070..f1b275618c6 100644 --- a/media-gfx/cura/cura-3.4.1.ebuild +++ b/media-gfx/cura/cura-3.4.1.ebuild @@ -19,13 +19,15 @@ IUSE="+usb zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] >=media-gfx/curaengine-${PV:0:3} >=media-gfx/fdm-materials-${PV:0:3} - >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] - >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] - usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" + >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] + >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND} sys-devel/gettext" diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild index 16ebf84a070..f1b275618c6 100644 --- a/media-gfx/cura/cura-3.6.0.ebuild +++ b/media-gfx/cura/cura-3.6.0.ebuild @@ -19,13 +19,15 @@ IUSE="+usb zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] >=media-gfx/curaengine-${PV:0:3} >=media-gfx/fdm-materials-${PV:0:3} - >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] - >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] - usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" + >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] + >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND} sys-devel/gettext" diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild index ba1e9563f25..d72614d316d 100644 --- a/media-gfx/cura/cura-4.2.1.ebuild +++ b/media-gfx/cura/cura-4.2.1.ebuild @@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND="sys-devel/gettext" RDEPEND="${PYTHON_DEPS} - >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] >=media-gfx/curaengine-${PV:0:3} >=media-gfx/fdm-materials-${PV:0:3} - >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] - >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] - usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" + >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] + >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND}" diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild similarity index 77% rename from media-gfx/cura/cura-4.3.0.ebuild rename to media-gfx/cura/cura-4.3.0-r1.ebuild index ba1e9563f25..d72614d316d 100644 --- a/media-gfx/cura/cura-4.3.0.ebuild +++ b/media-gfx/cura/cura-4.3.0-r1.ebuild @@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND="sys-devel/gettext" RDEPEND="${PYTHON_DEPS} - >=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}] >=media-gfx/curaengine-${PV:0:3} >=media-gfx/fdm-materials-${PV:0:3} - >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}] - >=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}] - usb? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )" + >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] + >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND}"