From cecd559e5e4c0b727413d688ccbdc663024a6c0f Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 7 Feb 2020 15:59:26 +0100 Subject: media-gfx/cura: 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/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-r1.ebuild | 55 +++++++++++++++++++++++++++++++++++++ media-gfx/cura/cura-4.3.0.ebuild | 53 ----------------------------------- 5 files changed, 76 insertions(+), 68 deletions(-) create mode 100644 media-gfx/cura/cura-4.3.0-r1.ebuild delete mode 100644 media-gfx/cura/cura-4.3.0.ebuild (limited to 'media-gfx/cura') diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild index 16ebf84a070c..f1b275618c69 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 16ebf84a070c..f1b275618c69 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 ba1e9563f25e..d72614d316d0 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-r1.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild new file mode 100644 index 000000000000..d72614d316d0 --- /dev/null +++ b/media-gfx/cura/cura-4.3.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 ) +inherit cmake desktop python-single-r1 xdg + +MY_PN=Cura + +DESCRIPTION="A 3D model slicing application for 3D printing" +HOMEPAGE="https://github.com/Ultimaker/Cura" +SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+usb zeroconf" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND="sys-devel/gettext" +RDEPEND="${PYTHON_DEPS} + >=media-gfx/curaengine-${PV:0:3} + >=media-gfx/fdm-materials-${PV:0:3} + >=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}" + +DOCS=( README.md ) +PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" ) +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + doicon icons/*.png + python_optimize "${D}${get_libdir}" +} diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0.ebuild deleted file mode 100644 index ba1e9563f25e..000000000000 --- a/media-gfx/cura/cura-4.3.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -inherit cmake desktop python-single-r1 xdg - -MY_PN=Cura - -DESCRIPTION="A 3D model slicing application for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/Cura" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+usb zeroconf" -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}] )" - -DEPEND="${RDEPEND}" - -DOCS=( README.md ) -PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" ) -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - doicon icons/*.png - python_optimize "${D}${get_libdir}" -} -- cgit v1.2.3-65-gdbad