diff options
Diffstat (limited to 'media-gfx/cura')
-rw-r--r-- | media-gfx/cura/Manifest | 15 | ||||
-rw-r--r-- | media-gfx/cura/cura-3.4.1.ebuild | 75 | ||||
-rw-r--r-- | media-gfx/cura/cura-3.6.0.ebuild | 75 | ||||
-rw-r--r-- | media-gfx/cura/cura-4.3.0-r1.ebuild | 55 | ||||
-rw-r--r-- | media-gfx/cura/cura-4.6.1-r1.ebuild (renamed from media-gfx/cura/cura-4.2.1.ebuild) | 18 | ||||
-rw-r--r-- | media-gfx/cura/cura-4.7.0-r1.ebuild | 64 | ||||
-rw-r--r-- | media-gfx/cura/cura-4.7.0.ebuild (renamed from media-gfx/cura/cura-4.6.1.ebuild) | 11 | ||||
-rw-r--r-- | media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch | 37 | ||||
-rw-r--r-- | media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch | 41 |
9 files changed, 84 insertions, 307 deletions
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest index 2d612ef0dde1..4e69e15b3e5b 100644 --- a/media-gfx/cura/Manifest +++ b/media-gfx/cura/Manifest @@ -1,14 +1,7 @@ -AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2 -AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f00460f16f5539dcf22e0db93210a90be533a1dfa7dabc4ae787bb404ff7ca38c7b4fdb0113cdfdf0f20a2f7907bfcb827dbcf SHA512 d88923ae9baef2889b952f6fe85e312890390228afb8ab27edab5e0abac48eba57b5a78ae0a913c96bf420fcc9f98a5281ede19c0d23d784104c85715d6bb7aa AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0 -DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1 -DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279 -DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52 -DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815 DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2 -EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e -EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e -EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208 -EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208 -EBUILD cura-4.6.1.ebuild 1527 BLAKE2B 8f8b53c5c38fb3ba4e4ed1c59e284710b5bc11ff6689955d2f1631caf9a7a54e61c2e790808e26c8c8f5e6acab6cabf3544e8a89696b264f35c8c968a33fb809 SHA512 c93e8959b9d6591394b824ca8624a2b8226998584b14bff6912dad3b571659e95fbef0975a6d98336ce16fe59f19d738a1eafeacb245a08f9eebdc36e59d75c2 +DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d +EBUILD cura-4.6.1-r1.ebuild 1555 BLAKE2B e85dd7c3db1b31a5a00b59786cb34ad397c009317df00685d4b1bfbbe8807e1dbb63fc0143b34c37dcdb328bb4918cfca20f4bd56cbefc2e8a208091dfd6fade SHA512 085dcb0e2548540af6aa8389016ea80576ff95cbf69412efebceec675e4d58d40785fb552fbbd9e5a9e862129241b86da34d9e6a46eff42cc37ce92af4eae46e +EBUILD cura-4.7.0-r1.ebuild 1875 BLAKE2B 62d221c6fe448597843fedacc46ba5b9183f3afac3a56c12f890f8babf2a37b55617a8103236b696649d9f674cc332b7cfa1fdb4e360140d64e2ae693bf74418 SHA512 9e3b797621690107ecb38c5e1ab27fe2b8f5a904835d49e5712a3b6ea49f5f0d621913e8f9f857205499e185dfcbe85fdfbf3f7233cfb9e17e0427ee11a31000 +EBUILD cura-4.7.0.ebuild 1562 BLAKE2B 5013051eab23a054a73afda2d283a34ec352eaf5d7a738a1d851566fd95ab27d229b05613c4039598b42034ec5caa597356fc5b54e8fd62cb26d4155275d1e09 SHA512 76beb567cbff2cb0888b8c265c8f70856910600f4430b275f1ff5164da2150d559c72259ff177074a81190c7bdab3a15bc0bca8faf6d4daf7097d38bf47cae57 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483 diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild deleted file mode 100644 index f1b275618c69..000000000000 --- a/media-gfx/cura/cura-3.4.1.ebuild +++ /dev/null @@ -1,75 +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 fdo-mime gnome2-utils python-single-r1 - -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}" - -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} - sys-devel/gettext" - -S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" ) -DOCS=( README.md ) - -src_prepare() { - default - sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - doicon icons/*.png - python_optimize "${D}${get_libdir}" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild deleted file mode 100644 index f1b275618c69..000000000000 --- a/media-gfx/cura/cura-3.6.0.ebuild +++ /dev/null @@ -1,75 +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 fdo-mime gnome2-utils python-single-r1 - -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}" - -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} - sys-devel/gettext" - -S="${WORKDIR}/${MY_PN}-${PV}" -PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" ) -DOCS=( README.md ) - -src_prepare() { - default - sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - doicon icons/*.png - python_optimize "${D}${get_libdir}" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update -} diff --git a/media-gfx/cura/cura-4.3.0-r1.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild deleted file mode 100644 index d72614d316d0..000000000000 --- a/media-gfx/cura/cura-4.3.0-r1.ebuild +++ /dev/null @@ -1,55 +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} - >=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.2.1.ebuild b/media-gfx/cura/cura-4.6.1-r1.ebuild index d72614d316d0..74ad049667a8 100644 --- a/media-gfx/cura/cura-4.2.1.ebuild +++ b/media-gfx/cura/cura-4.6.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit cmake desktop python-single-r1 xdg MY_PN=Cura @@ -20,20 +20,22 @@ 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}] + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}] + ~media-gfx/curaengine-${PV} + ~media-gfx/fdm-materials-${PV} $(python_gen_cond_dep ' + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}] 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" ) +PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" ) S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.7.0-r1.ebuild new file mode 100644 index 000000000000..36f6fd35e91d --- /dev/null +++ b/media-gfx/cura/cura-4.7.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{6..8}) +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 ~arm64 ~x86" +IUSE="+usb zeroconf" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND="sys-devel/gettext" +RDEPEND="${PYTHON_DEPS} + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}] + ~media-gfx/curaengine-${PV} + ~media-gfx/fdm-materials-${PV} + $(python_gen_cond_dep ' + dev-python/mypy[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}] + sci-libs/shapely[${PYTHON_MULTI_USEDEP}] + usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] ) + ')" +DEPEND="${RDEPEND}" + +DOCS=(README.md) +PATCHES=("${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch") +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + sed -i -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + # trimesh not available in portage + local mycmakeargs=( + -DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader" + -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + doicon icons/*.png + python_fix_shebang "${D}/usr/bin/cura" + python_optimize "${D}${get_libdir}" +} diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.7.0.ebuild index bbd5d0b29de1..4264d19b6a62 100644 --- a/media-gfx/cura/cura-4.6.1.ebuild +++ b/media-gfx/cura/cura-4.7.0.ebuild @@ -20,11 +20,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND="sys-devel/gettext" RDEPEND="${PYTHON_DEPS} - >=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] - >=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}] - >=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}] - >=media-gfx/curaengine-${PV:0:3} - >=media-gfx/fdm-materials-${PV:0:3} + ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}] + ~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}] + ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}] + ~media-gfx/curaengine-${PV} + ~media-gfx/fdm-materials-${PV} $(python_gen_cond_dep ' dev-python/requests[${PYTHON_MULTI_USEDEP}] dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}] diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch deleted file mode 100644 index 066f9148c4d9..000000000000 --- a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- Cura-3.1.0-orig/CMakeLists.txt 2017-12-04 18:05:38.000000000 +0200 -+++ Cura-3.1.0/CMakeLists.txt 2017-12-29 18:11:19.508034087 +0200 -@@ -36,10 +36,20 @@ - - find_package(PythonInterp 3.5.0 REQUIRED) - -+if(NOT PYTHON_SITE_PACKAGES_DIR) -+ if(APPLE OR WIN32) -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ CACHE STRING "Directory to install Python bindings to") -+ else() -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ CACHE STRING "Directory to install Python bindings to") -+ endif() -+endif() -+ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib${LIB_SUFFIX}/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py - DESTINATION ${CMAKE_INSTALL_BINDIR} -@@ -53,10 +63,10 @@ - DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) - else() - install(DIRECTORY cura -- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - endif() - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) diff --git a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch deleted file mode 100644 index fc10d727d130..000000000000 --- a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN Cura-4.2.1-orig/CMakeLists.txt Cura-4.2.1/CMakeLists.txt ---- Cura-4.2.1-orig/CMakeLists.txt 2019-07-31 15:34:07.000000000 +0300 -+++ Cura-4.2.1/CMakeLists.txt 2019-08-04 18:39:24.106917187 +0300 -@@ -47,6 +47,15 @@ - find_package(Python3 REQUIRED COMPONENTS Interpreter Development) - endif() - -+if(NOT PYTHON_SITE_PACKAGES_DIR) -+ if(APPLE OR WIN32) -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ CACHE STRING "Directory to install Python bindings to") -+ else() -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ CACHE STRING "Directory to install Python bindings to") -+ endif() -+endif() - - if(NOT ${URANIUM_DIR} STREQUAL "") - set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake") -@@ -64,7 +73,7 @@ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib${LIB_SUFFIX}/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) - - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py -@@ -79,10 +88,10 @@ - DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura) - else() - install(DIRECTORY cura -- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - endif() - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) |