subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-gfx\/cura\/"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, dev-python/python-zeroconf/, dev-python/pychromecast/, ...

2023-02-14 Thread Michał Górny

commit: 29153ca563b529be4cf0fdc2651105430ecb9ab4
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Feb 14 15:44:35 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb 14 16:23:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29153ca5

Rename dev-python/{python-zeroconf → zeroconf}

Signed-off-by: Michał Górny  gentoo.org>

 app-text/calibre/calibre-5.43.0.ebuild| 2 +-
 app-text/calibre/calibre-5.44.0-r1.ebuild | 2 +-
 dev-embedded/platformio/platformio-6.1.5.ebuild   | 2 +-
 dev-python/pychromecast/pychromecast-12.1.4.ebuild| 2 +-
 dev-python/pychromecast/pychromecast-13.0.4.ebuild| 2 +-
 dev-python/{python-zeroconf => zeroconf}/Manifest | 0
 dev-python/{python-zeroconf => zeroconf}/metadata.xml | 0
 .../python-zeroconf-0.39.4.ebuild => zeroconf/zeroconf-0.39.4.ebuild} | 0
 .../python-zeroconf-0.47.1.ebuild => zeroconf/zeroconf-0.47.1.ebuild} | 0
 media-gfx/cura/cura-4.13.1-r1.ebuild  | 4 ++--
 media-video/vidify/vidify-2.2.6-r3.ebuild | 2 +-
 net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1.ebuild  | 2 +-
 net-misc/pulseaudio-dlna/pulseaudio-dlna-.ebuild  | 2 +-
 profiles/updates/1Q-2023  | 1 +
 profiles/updates/4Q-2022  | 1 -
 sys-process/glances/glances-3.3.0-r1.ebuild   | 2 +-
 16 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-text/calibre/calibre-5.43.0.ebuild 
b/app-text/calibre/calibre-5.43.0.ebuild
index 54272871f2d9..d54df7705431 100644
--- a/app-text/calibre/calibre-5.43.0.ebuild
+++ b/app-text/calibre/calibre-5.43.0.ebuild
@@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-   dev-python/python-zeroconf[${PYTHON_USEDEP}]
+   dev-python/zeroconf[${PYTHON_USEDEP}]

>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]

>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]

diff --git a/app-text/calibre/calibre-5.44.0-r1.ebuild 
b/app-text/calibre/calibre-5.44.0-r1.ebuild
index 6355bcf14da9..d6a8b42211fd 100644
--- a/app-text/calibre/calibre-5.44.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r1.ebuild
@@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-   dev-python/python-zeroconf[${PYTHON_USEDEP}]
+   dev-python/zeroconf[${PYTHON_USEDEP}]

>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]

>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]

diff --git a/dev-embedded/platformio/platformio-6.1.5.ebuild 
b/dev-embedded/platformio/platformio-6.1.5.ebuild
index ca5e00e204c5..bf0d59437b57 100644
--- a/dev-embedded/platformio/platformio-6.1.5.ebuild
+++ b/dev-embedded/platformio/platformio-6.1.5.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/pyserial-3[${PYTHON_USEDEP}]
=dev-python/python-zeroconf-0.37[${PYTHON_USEDEP}]
+   >=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
=dev-python/requests-2*[${PYTHON_USEDEP}]
>=dev-python/semantic_version-2.9[${PYTHON_USEDEP}]
=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]"

diff --git a/dev-python/pychromecast/pychromecast-13.0.4.ebuild 
b/dev-python/pychromecast/pychromecast-13.0.4.ebuild
index 354ebfbf0d57..60fbf00b21ea 100644
--- a/dev-python/pychromecast/pychromecast-13.0.4.ebuild
+++ b/dev-python/pychromecast/pychromecast-13.0.4.ebuild
@@ -19,4 +19,4 @@ KEYWORDS="amd64 x86"
 RDEPEND="
>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
-   >=dev-python/python-zeroconf-0.25.1[${PYTHON_USEDEP}]"
+   >=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]"

diff --git a/dev-python/python-zeroconf/Manifest b/dev-python/zeroconf/Manifest
similarity index 100%
rename from dev-python/python-zeroconf/Manifest
rename to dev-python/zeroconf/Manifest

diff --git a/dev-python/python-zeroconf/metadata.xml 
b/dev-python/zeroconf/metadata.xml
similarity index 100%
rename from dev-python/python-zeroconf/metadata.xml
rename

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-07-09 Thread Matthew Smith

commit: ea30a82b341fb1343e03c50bfe93713e1827647f
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Jul  9 10:50:51 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Jul  9 10:52:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea30a82b

media-gfx/cura: update maintainers

Remove inactive proxy-maintainer and 3dprint project member.

Signed-off-by: Matthew Smith  gentoo.org>

 media-gfx/cura/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 6bf1b5a4e99c..8857a09726ef 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -5,18 +5,10 @@
3dpr...@gentoo.org
Gentoo 3D Printer Project

-   
-   ale...@gentoo.org
-   Alexey Shvetsov
-   

ma...@vanvoorden.be
Mathy Vanvoorden

-   
-   perlo...@gmail.com
-   Michael Perlov
-   

proxy-ma...@gentoo.org
Proxy Maintainers

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, profiles/updates/, dev-python/uranium/, dev-python/trimesh/, ...

2022-07-02 Thread Michał Górny

commit: daf66d27731db24d18b30f0cbf7018da57ed0851
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul  2 16:03:06 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul  2 16:08:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf66d27

Move {sci-libs → dev-python}/shapely

Shapely is really primarily a Python package, and it seems that
the Python team is effectively going to maintain it going forward,
so it fits more naturally in dev-python than sci-libs.

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/plotly/plotly-5.8.2.ebuild | 2 +-
 dev-python/pyproj/pyproj-3.3.1.ebuild | 2 +-
 {sci-libs => dev-python}/shapely/Manifest | 0
 .../shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch  | 0
 {sci-libs => dev-python}/shapely/metadata.xml | 0
 {sci-libs => dev-python}/shapely/shapely-1.7.1-r1.ebuild  | 2 +-
 {sci-libs => dev-python}/shapely/shapely-1.8.2.ebuild | 0
 dev-python/trimesh/trimesh-3.12.5.ebuild  | 2 +-
 dev-python/trimesh/trimesh-3.12.6.ebuild  | 2 +-
 dev-python/trimesh/trimesh-3.12.7.ebuild  | 2 +-
 dev-python/uranium/uranium-4.13.0-r1.ebuild   | 2 +-
 media-gfx/cura/cura-4.13.1-r1.ebuild  | 2 +-
 profiles/updates/3Q-2020  | 2 +-
 profiles/updates/3Q-2022  | 1 +
 sci-libs/cartopy/cartopy-0.20.1-r1.ebuild | 4 ++--
 sci-libs/cartopy/cartopy-0.20.2.ebuild| 2 +-
 16 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dev-python/plotly/plotly-5.8.2.ebuild 
b/dev-python/plotly/plotly-5.8.2.ebuild
index 727c95cffca9..e1e8c3e4f454 100644
--- a/dev-python/plotly/plotly-5.8.2.ebuild
+++ b/dev-python/plotly/plotly-5.8.2.ebuild
@@ -40,11 +40,11 @@ BDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
+   dev-python/shapely[${PYTHON_USEDEP}]
dev-python/statsmodels[${PYTHON_USEDEP}]
dev-python/xarray[${PYTHON_USEDEP}]
sci-libs/pyshp[${PYTHON_USEDEP}]
sci-libs/scikit-image[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
)
 "
 

diff --git a/dev-python/pyproj/pyproj-3.3.1.ebuild 
b/dev-python/pyproj/pyproj-3.3.1.ebuild
index f3f32a5b8852..93c1f69f34cc 100644
--- a/dev-python/pyproj/pyproj-3.3.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.3.1.ebuild
@@ -33,8 +33,8 @@ BDEPEND="
test? (
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pandas[${PYTHON_USEDEP}]
+   dev-python/shapely[${PYTHON_USEDEP}]
dev-python/xarray[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
)
 "
 

diff --git a/sci-libs/shapely/Manifest b/dev-python/shapely/Manifest
similarity index 100%
rename from sci-libs/shapely/Manifest
rename to dev-python/shapely/Manifest

diff --git a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch 
b/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
similarity index 100%
rename from sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
rename to dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch

diff --git a/sci-libs/shapely/metadata.xml b/dev-python/shapely/metadata.xml
similarity index 100%
rename from sci-libs/shapely/metadata.xml
rename to dev-python/shapely/metadata.xml

diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild 
b/dev-python/shapely/shapely-1.7.1-r1.ebuild
similarity index 95%
rename from sci-libs/shapely/shapely-1.7.1-r1.ebuild
rename to dev-python/shapely/shapely-1.7.1-r1.ebuild
index 749e53b1ac3e..c3f37aa5b3d8 100644
--- a/sci-libs/shapely/shapely-1.7.1-r1.ebuild
+++ b/dev-python/shapely/shapely-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sci-libs/shapely/shapely-1.8.2.ebuild 
b/dev-python/shapely/shapely-1.8.2.ebuild
similarity index 100%
rename from sci-libs/shapely/shapely-1.8.2.ebuild
rename to dev-python/shapely/shapely-1.8.2.ebuild

diff --git a/dev-python/trimesh/trimesh-3.12.5.ebuild 
b/dev-python/trimesh/trimesh-3.12.5.ebuild
index 3d5249af810b..14d069dd9082 100644
--- a/dev-python/trimesh/trimesh-3.12.5.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.5.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-05-09 Thread Michał Górny

commit: 29d3e495427ebd890457838b0fd94d1117b5cfc6
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May  9 06:56:37 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  9 07:00:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d3e495

media-gfx/cura: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/cura/Manifest   |  2 -
 media-gfx/cura/cura-4.12.1.ebuild | 87 --
 media-gfx/cura/cura-4.13.1.ebuild | 89 ---
 media-gfx/cura/cura-4.9.1.ebuild  | 71 ---
 4 files changed, 249 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 957f70aed5ef..18fa6ba7e33a 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1 @@
-DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 
114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f
 SHA512 
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
 DIST cura-4.13.1.tar.gz 42339030 BLAKE2B 
e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c
 SHA512 
6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
-DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
 SHA512 
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf

diff --git a/media-gfx/cura/cura-4.12.1.ebuild 
b/media-gfx/cura/cura-4.12.1.ebuild
deleted file mode 100644
index 1017dfc52e54..
--- a/media-gfx/cura/cura-4.12.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-# No fdm-materials-4.12.1 upstream, 4.12.0 is followed by 4.13.0
-FDM_PV="4.12.0"
-
-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="debug test +usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-   sys-devel/gettext
-   $(python_gen_cond_dep '
-   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-   ')
-"
-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/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
-   ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-   ~media-gfx/curaengine-${PV}
-   ~media-gfx/fdm-materials-${FDM_PV}
-   dev-qt/qtquickcontrols[widgets]
-   $(python_gen_cond_dep '
-   dev-python/importlib_metadata[${PYTHON_USEDEP}]
-   dev-python/keyring[${PYTHON_USEDEP}]
-   dev-python/mypy[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
-   dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/sentry-sdk[${PYTHON_USEDEP}]
-   dev-python/trimesh[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
-   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-   zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
-   ')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
-)
-
-DOCS=(README.md)
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
-
-   # Remove failing test.  Bug #693172.
-   rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCURA_BUILDTYPE="ebuild"
-   -DCURA_VERSION=${PV}
-   -DCURA_DEBUGMODE=$(usex debug)
-   )
-   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.13.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-05-08 Thread Sam James

commit: aa4a5ac4c9ed32d48015d9e8eddf1bd1001bee23
Author: Sam James  gentoo  org>
AuthorDate: Sun May  8 19:59:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  8 19:59:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa4a5ac4

media-gfx/cura: Stabilize 4.13.1-r1 amd64, #837179

Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/cura-4.13.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.13.1-r1.ebuild 
b/media-gfx/cura/cura-4.13.1-r1.ebuild
index a6a983dfe2ba..b9234606b66a 100644
--- a/media-gfx/cura/cura-4.13.1-r1.ebuild
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug test +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-05-08 Thread Michał Górny

commit: 0a307309213632c3c319832bf6d05f7911174d17
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May  8 08:34:12 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May  8 08:47:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a307309

media-gfx/cura: Remove py3.8 due to sentry-sdk losing it

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/cura/cura-4.13.1-r1.ebuild | 89 
 1 file changed, 89 insertions(+)

diff --git a/media-gfx/cura/cura-4.13.1-r1.ebuild 
b/media-gfx/cura/cura-4.13.1-r1.ebuild
new file mode 100644
index ..a6a983dfe2ba
--- /dev/null
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+FDM_MATERIALS_PV=4.13.0
+LIBCHARON_PV=4.13.0
+LIBSAVITAR_PV=4.13.0
+PYNEST2D_PV=4.13_beta # never got tagged as 4.13.0 proper
+URANIUM_PV=4.13.0 # 4.13.1 is identical and so is not packaged in ::gentoo
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura;
+SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug test +usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   sys-devel/gettext
+   $(python_gen_cond_dep '
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+   ')
+"
+RDEPEND="${PYTHON_DEPS}
+   ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+   ~dev-libs/libcharon-${LIBCHARON_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-libs/libsavitar-${LIBSAVITAR_PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/pynest2d-${PYNEST2D_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/uranium-${URANIUM_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~media-gfx/curaengine-${PV}
+   ~media-gfx/fdm-materials-${FDM_MATERIALS_PV}
+   dev-qt/qtquickcontrols[widgets]
+   $(python_gen_cond_dep '
+   dev-python/importlib_metadata[${PYTHON_USEDEP}]
+   dev-python/keyring[${PYTHON_USEDEP}]
+   dev-python/mypy[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+   dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/sentry-sdk[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+   ')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=( README.md )
+S="${WORKDIR}"/Cura-${PV}
+
+src_prepare() {
+   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
+
+   # Remove failing test.  Bug #693172.
+   rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCURA_BUILDTYPE="ebuild"
+   -DCURA_VERSION=${PV}
+   -DCURA_DEBUGMODE=$(usex debug)
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   doicon icons/*.png
+   python_fix_shebang "${D}/usr/bin/cura"
+   python_optimize "${D}${get_libdir}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-03-10 Thread Jakov Smolić

commit: 31daff1952df1e8825db04bd52c222834c33a290
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar 10 21:20:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar 10 21:20:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31daff19

media-gfx/cura: Stabilize 4.12.1 amd64, #834389

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/cura/cura-4.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.12.1.ebuild 
b/media-gfx/cura/cura-4.12.1.ebuild
index 448cf753c799..1017dfc52e54 100644
--- a/media-gfx/cura/cura-4.12.1.ebuild
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug test +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-03-05 Thread Matthew Smith

commit: bc42726ffedfd02a080a2b281d031c1a4b26783e
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Mar  5 11:35:29 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Mar  5 11:53:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc42726f

media-gfx/cura: add 4.13.1

Signed-off-by: Matthew Smith  gentoo.org>

 media-gfx/cura/Manifest   |  1 +
 media-gfx/cura/cura-4.13.1.ebuild | 89 +++
 2 files changed, 90 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 7ed2fd162fb3..a2ac1372708b 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,4 @@
 DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 
114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f
 SHA512 
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
 DIST cura-4.13.0.tar.gz 42339276 BLAKE2B 
05e747b8e84ecf64bdc1ad7662eae7b5e8a739b7c1bbafdd3ae081e790dafbcd98209eb90f45996e93115ea8b7a38764be957091dd358c502e7aa71cb61fe6c7
 SHA512 
46f13cde12735d64dad2c533c7688612ebc1c2c8b78d71ced8cfd7d7abd80a53c09105bb16f64ae92cddf345fe44f83800d4448007fe5c2938c652f58354747b
+DIST cura-4.13.1.tar.gz 42339030 BLAKE2B 
e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c
 SHA512 
6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
 SHA512 
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf

diff --git a/media-gfx/cura/cura-4.13.1.ebuild 
b/media-gfx/cura/cura-4.13.1.ebuild
new file mode 100644
index ..060fa6170940
--- /dev/null
+++ b/media-gfx/cura/cura-4.13.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+FDM_MATERIALS_PV=4.13.0
+LIBCHARON_PV=4.13.0
+LIBSAVITAR_PV=4.13.0
+PYNEST2D_PV=4.13_beta # never got tagged as 4.13.0 proper
+URANIUM_PV=4.13.0 # 4.13.1 is identical and so is not packaged in ::gentoo
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura;
+SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug test +usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   sys-devel/gettext
+   $(python_gen_cond_dep '
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+   ')
+"
+RDEPEND="${PYTHON_DEPS}
+   ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+   ~dev-libs/libcharon-${LIBCHARON_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-libs/libsavitar-${LIBSAVITAR_PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/pynest2d-${PYNEST2D_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/uranium-${URANIUM_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~media-gfx/curaengine-${PV}
+   ~media-gfx/fdm-materials-${FDM_MATERIALS_PV}
+   dev-qt/qtquickcontrols[widgets]
+   $(python_gen_cond_dep '
+   dev-python/importlib_metadata[${PYTHON_USEDEP}]
+   dev-python/keyring[${PYTHON_USEDEP}]
+   dev-python/mypy[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+   dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/sentry-sdk[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+   ')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=( README.md )
+S="${WORKDIR}"/Cura-${PV}
+
+src_prepare() {
+   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
+
+   # Remove failing test.  Bug #693172.
+   rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCURA_BUILDTYPE="ebuild"
+   -DCURA_VERSION=${PV}
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-03-05 Thread Matthew Smith

commit: ed35234d330132b7727cebe860a3a1ae395c49a0
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Mar  5 11:35:44 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Mar  5 11:53:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed35234d

media-gfx/cura: drop 4.13.0

cura 4.13.0 has two major issues related to support generation and
surfaces.  4.13.1 should be used instead.

Signed-off-by: Matthew Smith  gentoo.org>

 media-gfx/cura/Manifest   |  1 -
 media-gfx/cura/cura-4.13.0.ebuild | 86 ---
 2 files changed, 87 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index a2ac1372708b..957f70aed5ef 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,4 +1,3 @@
 DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 
114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f
 SHA512 
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
-DIST cura-4.13.0.tar.gz 42339276 BLAKE2B 
05e747b8e84ecf64bdc1ad7662eae7b5e8a739b7c1bbafdd3ae081e790dafbcd98209eb90f45996e93115ea8b7a38764be957091dd358c502e7aa71cb61fe6c7
 SHA512 
46f13cde12735d64dad2c533c7688612ebc1c2c8b78d71ced8cfd7d7abd80a53c09105bb16f64ae92cddf345fe44f83800d4448007fe5c2938c652f58354747b
 DIST cura-4.13.1.tar.gz 42339030 BLAKE2B 
e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c
 SHA512 
6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
 SHA512 
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf

diff --git a/media-gfx/cura/cura-4.13.0.ebuild 
b/media-gfx/cura/cura-4.13.0.ebuild
deleted file mode 100644
index 805c67fdd48c..
--- a/media-gfx/cura/cura-4.13.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake desktop python-single-r1 xdg
-
-# Never got tagged as 4.13 proper.
-PYNEST2D_PV=4.13_beta
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura;
-SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug test +usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-   sys-devel/gettext
-   $(python_gen_cond_dep '
-   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-   ')
-"
-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/pynest2d-${PYNEST2D_PV}[${PYTHON_SINGLE_USEDEP}]
-   ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-   ~media-gfx/curaengine-${PV}
-   ~media-gfx/fdm-materials-${PV}
-   dev-qt/qtquickcontrols[widgets]
-   $(python_gen_cond_dep '
-   dev-python/importlib_metadata[${PYTHON_USEDEP}]
-   dev-python/keyring[${PYTHON_USEDEP}]
-   dev-python/mypy[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
-   dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/sentry-sdk[${PYTHON_USEDEP}]
-   dev-python/trimesh[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
-   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-   zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
-   ')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
-)
-
-DOCS=( README.md )
-S="${WORKDIR}"/Cura-${PV}
-
-src_prepare() {
-   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
-
-   # Remove failing test.  Bug #693172.
-   rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCURA_BUILDTYPE="ebuild"
-   -DCURA_VERSION=${PV}
-   -DCURA_DEBUGMODE=$(usex debug)
-   )
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-02-28 Thread Matthew Smith

commit: 0baf298926214c7b14f47b6fd34c45ea0d5077d6
Author: Matthew Smith  gentoo  org>
AuthorDate: Mon Feb 28 19:41:20 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Mon Feb 28 19:43:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baf2989

media-gfx/cura: add 4.13.0

Signed-off-by: Matthew Smith  gentoo.org>

 media-gfx/cura/Manifest   |  1 +
 media-gfx/cura/cura-4.13.0.ebuild | 86 +++
 2 files changed, 87 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 66fb25368e66..7ed2fd162fb3 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1,3 @@
 DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 
114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f
 SHA512 
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
+DIST cura-4.13.0.tar.gz 42339276 BLAKE2B 
05e747b8e84ecf64bdc1ad7662eae7b5e8a739b7c1bbafdd3ae081e790dafbcd98209eb90f45996e93115ea8b7a38764be957091dd358c502e7aa71cb61fe6c7
 SHA512 
46f13cde12735d64dad2c533c7688612ebc1c2c8b78d71ced8cfd7d7abd80a53c09105bb16f64ae92cddf345fe44f83800d4448007fe5c2938c652f58354747b
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
 SHA512 
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf

diff --git a/media-gfx/cura/cura-4.13.0.ebuild 
b/media-gfx/cura/cura-4.13.0.ebuild
new file mode 100644
index ..805c67fdd48c
--- /dev/null
+++ b/media-gfx/cura/cura-4.13.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+# Never got tagged as 4.13 proper.
+PYNEST2D_PV=4.13_beta
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura;
+SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug test +usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   sys-devel/gettext
+   $(python_gen_cond_dep '
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+   ')
+"
+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/pynest2d-${PYNEST2D_PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+   ~media-gfx/curaengine-${PV}
+   ~media-gfx/fdm-materials-${PV}
+   dev-qt/qtquickcontrols[widgets]
+   $(python_gen_cond_dep '
+   dev-python/importlib_metadata[${PYTHON_USEDEP}]
+   dev-python/keyring[${PYTHON_USEDEP}]
+   dev-python/mypy[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+   dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/sentry-sdk[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+   ')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=( README.md )
+S="${WORKDIR}"/Cura-${PV}
+
+src_prepare() {
+   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
+
+   # Remove failing test.  Bug #693172.
+   rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCURA_BUILDTYPE="ebuild"
+   -DCURA_VERSION=${PV}
+   -DCURA_DEBUGMODE=$(usex debug)
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   doicon icons/*.png
+   python_fix_shebang "${D}/usr/bin/cura"
+   python_optimize "${D}${get_libdir}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-02-28 Thread Matthew Smith

commit: a282b3d47a732dbaf680c3f2d71255f9abbffa26
Author: Matthew Smith  gentoo  org>
AuthorDate: Mon Feb 28 18:51:15 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Mon Feb 28 19:42:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a282b3d4

media-gfx/cura: fix failing tests

Add a dependency on pytest and remove a test that either does not like
the sandbox or does not like its home directory being moved.

Closes: https://bugs.gentoo.org/693172
Signed-off-by: Matthew Smith  gentoo.org>

 media-gfx/cura/cura-4.12.1.ebuild | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/media-gfx/cura/cura-4.12.1.ebuild 
b/media-gfx/cura/cura-4.12.1.ebuild
index f38aa921e53b..448cf753c799 100644
--- a/media-gfx/cura/cura-4.12.1.ebuild
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -18,10 +18,17 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug +usb zeroconf"
+IUSE="debug test +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-BDEPEND="sys-devel/gettext"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   sys-devel/gettext
+   $(python_gen_cond_dep '
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+   ')
+"
 RDEPEND="${PYTHON_DEPS}
~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
@@ -57,6 +64,9 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 src_prepare() {
sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
 
+   # Remove failing test.  Bug #693172.
+   rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
+
cmake_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-02-13 Thread Jakov Smolić

commit: 9d7fa14e0e7cc37513ca6b495e96e8a6e4ba9bb1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Feb 13 22:38:35 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Feb 13 22:38:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7fa14e

media-gfx/cura: Keyword 4.12.1 x86, #833120

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/cura/cura-4.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.12.1.ebuild 
b/media-gfx/cura/cura-4.12.1.ebuild
index 407caa7c29df..f38aa921e53b 100644
--- a/media-gfx/cura/cura-4.12.1.ebuild
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2022-02-11 Thread Arthur Zamarin

commit: 75d1fc6afc7b9089647f0430aa4f8752a63e0bf2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 11 20:25:08 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 11 20:25:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d1fc6a

media-gfx/cura: Keyword 4.12.1 arm64, #833120

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/cura/cura-4.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.12.1.ebuild 
b/media-gfx/cura/cura-4.12.1.ebuild
index 7c12eee664b8..407caa7c29df 100644
--- a/media-gfx/cura/cura-4.12.1.ebuild
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="debug +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, media-gfx/cura/files/

2022-02-11 Thread Marek Szuba

commit: 7ad2d8743788c51998183a3d4d12674c27010739
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Feb 11 10:34:44 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Feb 11 10:43:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad2d874

media-gfx/cura: add 4.12.1

Featuring py3.10 support along with the three previously disabled
plug-ins.

Invoking maintainer time-out on both this and all the ~-${PV}
dependencies, it has been months.

Note that the latest version upstream is now 4.13.1, however that
version would diverge quite far from ~-${PV} for Ultimaker dependencies
- the latest tag for libarcus, libsavitar and fdm-materials is 4.13.0
and pynest2d has got NO non-beta 4.13 tags. Will leave it to the
maintainers to decide what to do with this.

Closes: https://bugs.gentoo.org/812935
Closes: https://bugs.gentoo.org/815406
Closes: https://bugs.gentoo.org/822714
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/cura/Manifest|  1 +
 media-gfx/cura/cura-4.12.1.ebuild  | 77 ++
 .../cura/files/cura-4.12.1-code-style-test.patch   | 18 +
 3 files changed, 96 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 165ec2a1e2b6..66fb25368e66 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1 +1,2 @@
+DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 
114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f
 SHA512 
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
 SHA512 
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf

diff --git a/media-gfx/cura/cura-4.12.1.ebuild 
b/media-gfx/cura/cura-4.12.1.ebuild
new file mode 100644
index ..7c12eee664b8
--- /dev/null
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+MY_PN=Cura
+# No fdm-materials-4.12.1 upstream, 4.12.0 is followed by 4.13.0
+FDM_PV="4.12.0"
+
+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"
+IUSE="debug +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/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+   ~media-gfx/curaengine-${PV}
+   ~media-gfx/fdm-materials-${FDM_PV}
+   dev-qt/qtquickcontrols[widgets]
+   $(python_gen_cond_dep '
+   dev-python/importlib_metadata[${PYTHON_USEDEP}]
+   dev-python/keyring[${PYTHON_USEDEP}]
+   dev-python/mypy[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+   dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/sentry-sdk[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+   ')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=(README.md)
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCURA_BUILDTYPE="ebuild"
+   -DCURA_VERSION=${PV}
+   -DCURA_DEBUGMODE=$(usex debug)
+   )
+   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/files/cura-4.12.1-code-style-test.patch 
b/media-gfx/cura/files/cura-4.12.1-code-style-test.patch
new file

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2021-11-10 Thread Jonas Stein

commit: 680251cbf9b19c8c6cf49931fe217344f4f05924
Author: Jonas Stein  gentoo  org>
AuthorDate: Wed Nov 10 19:43:51 2021 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Wed Nov 10 19:43:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680251cb

media-gfx/cura: Sort maintainers

Move proxy to the end.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jonas Stein  gentoo.org>

 media-gfx/cura/metadata.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index ae6a4e00a4f..6bf1b5a4e99 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -9,10 +9,6 @@
ale...@gentoo.org
Alexey Shvetsov

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

ma...@vanvoorden.be
Mathy Vanvoorden
@@ -21,6 +17,10 @@
perlo...@gmail.com
Michael Perlov

+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

soname major version number

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2021-06-10 Thread Dennis Lamm

commit: a32c3cd7e73ebc0f1febc56abdf40944cc9ef506
Author: Mathy Vanvoorden  vanvoorden  be>
AuthorDate: Mon Jun  7 16:02:52 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Thu Jun 10 17:40:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32c3cd7

media-gfx/cura: Version bump to 4.9.1

Closes: https://bugs.gentoo.org/793803
Closes: https://bugs.gentoo.org/731274
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden  vanvoorden.be>
Closes: https://github.com/gentoo/gentoo/pull/21150
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-4.9.1.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 5dfea09d774..f77b0cbd1af 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1 +1,2 @@
 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 
0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153
 SHA512 
0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
+DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 
2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463
 SHA512 
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf

diff --git a/media-gfx/cura/cura-4.9.1.ebuild b/media-gfx/cura/cura-4.9.1.ebuild
new file mode 100644
index 000..8c8c80d0005
--- /dev/null
+++ b/media-gfx/cura/cura-4.9.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{7..9})
+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="debug +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/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
+   ~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+   ~media-gfx/curaengine-${PV}
+   ~media-gfx/fdm-materials-${PV}
+   dev-qt/qtquickcontrols[widgets]
+   $(python_gen_cond_dep '
+   dev-python/importlib_metadata[${PYTHON_MULTI_USEDEP}]
+   dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+   dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   dev-python/PyQt5[-debug,${PYTHON_MULTI_USEDEP}]
+   dev-python/PyQt5-sip[${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)
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # trimesh not available in portage
+   local mycmakeargs=(
+ -DCURA_BUILDTYPE="ebuild"
+ -DCURA_VERSION=${PV}
+   -DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
+   -DCURA_DEBUGMODE=$(usex debug)
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   doicon icons/*.png
+   python_fix_shebang "${D}/usr/bin/cura"
+   python_optimize "${D}${get_libdir}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2021-02-07 Thread Dennis Lamm

commit: c82706de9ed4ab875a772671ee8325985f576ced
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Feb  7 20:56:32 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Feb  7 23:56:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82706de

media-gfx/cura: metadata added upstream bugtracker

Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 19761d81848..b9e0e481f08 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -28,6 +28,7 @@
Access 3D printers via USB


+   https://github.com/Ultimaker/Cura/issues
Ultimaker/Cura

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2021-02-07 Thread Dennis Lamm

commit: 2295f8da891fa865655c32ecb58d4c0f5e7b5e46
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Feb  7 21:00:29 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Feb  7 23:56:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2295f8da

media-gfx/cura: metadata added doc

Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index b9e0e481f08..615b4b60345 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -29,6 +29,7 @@


https://github.com/Ultimaker/Cura/issues
+   https://github.com/Ultimaker/Cura/wiki
Ultimaker/Cura

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

2021-02-07 Thread Dennis Lamm

commit: 34625d641e9b7620465d84bb662e62f26fccfb6f
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Feb  7 18:48:20 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Feb  7 21:30:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34625d64

media-gfx/cura: drop old

Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/Manifest|  1 -
 media-gfx/cura/cura-4.7.0-r1.ebuild| 64 --
 .../cura/files/cura-4.6.1-fix-install-paths.patch  | 31 ---
 3 files changed, 96 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index f4ccb95c398..5dfea09d774 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1 @@
-DIST cura-4.7.0.tar.gz 29712949 BLAKE2B 
b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f
 SHA512 
0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 
0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153
 SHA512 
0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711

diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild 
b/media-gfx/cura/cura-4.7.0-r1.ebuild
deleted file mode 100644
index e6ec0adefd3..000
--- a/media-gfx/cura/cura-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..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/files/cura-4.6.1-fix-install-paths.patch 
b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 4d5f00ad47d..000
--- a/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 Cura-4.5.0-orig/CMakeLists.txt 2020-03-01 16:32:23.380956083 +0200
-+++ Cura-4.5.0/CMakeLists.txt  2020-02-25 17:16:45.0 +0200
-@@ -48,6 +48,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")
-@@ -80,10 +89,10 @@
- DESTINATION

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-12-13 Thread Sam James

commit: 86a63b0ac0ca32cd3a6c9311736fd58e11cbbb67
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 14 00:45:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 14 00:45:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a63b0a

media-gfx/cura: arm64 keyworded (bug #757849)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/cura-4.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.8.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
index c1e24966841..615180db9ee 100644
--- a/media-gfx/cura/cura-4.8.0.ebuild
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-11-30 Thread Dennis Lamm

commit: 4aeeb63fc98b2fe953777627b25e1a769110f11a
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Nov 29 18:57:30 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Nov 30 18:37:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aeeb63f

media-gfx/cura: bump to 4.8.0

Signed-off-by: Dennis Lamm  gentoo.org>
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-4.8.0.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 8e2e7103861..96afac35472 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1,3 @@
 DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 
5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f80441daf44866ffc93ebcf1295c750
 SHA512 
8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 DIST cura-4.7.0.tar.gz 29712949 BLAKE2B 
b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f
 SHA512 
0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
+DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 
0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153
 SHA512 
0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711

diff --git a/media-gfx/cura/cura-4.8.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
new file mode 100644
index 000..cac723768e0
--- /dev/null
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -0,0 +1,67 @@
+# 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="debug +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/pynest2d-${PV}[${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)
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+   sed -i -e 
"s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g"
 CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # trimesh not available in portage
+   local mycmakeargs=(
+ -DCURA_BUILDTYPE="ebuild"
+ -DCURA_VERSION=${PV}
+   -DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
+   -DCURA_DEBUGMODE=$(usex debug)
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+   doicon icons/*.png
+   python_fix_shebang "${D}/usr/bin/cura"
+   python_optimize "${D}${get_libdir}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-11-30 Thread Dennis Lamm

commit: 2b5dbf3fb7f2c44b9173e343f9afe883410e2932
Author: Dennis Lamm  gentoo  org>
AuthorDate: Mon Nov 30 05:52:01 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Nov 30 18:37:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5dbf3f

media-gfx/cura: fixed QA warnings

Signed-off-by: Dennis Lamm  gentoo.org>
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/cura-4.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.8.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
index cac723768e0..615180db9ee 100644
--- a/media-gfx/cura/cura-4.8.0.ebuild
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6..8})
+PYTHON_COMPAT=(python3_{7..8})
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-11-30 Thread Dennis Lamm

commit: ea84b7ac1ed4dbc0e15a6df7002be1df1fa6e620
Author: Dennis Lamm  gentoo  org>
AuthorDate: Mon Nov 30 17:20:28 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Nov 30 18:37:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea84b7ac

media-gfx/cura: dropped ~arm64 keyword

Signed-off-by: Dennis Lamm  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18450
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/cura-4.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.8.0.ebuild b/media-gfx/cura/cura-4.8.0.ebuild
index 615180db9ee..c1e24966841 100644
--- a/media-gfx/cura/cura-4.8.0.ebuild
+++ b/media-gfx/cura/cura-4.8.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, dev-python/uranium/, sci-libs/cartopy/, dev-python/pyproj/

2020-10-12 Thread Dennis Lamm

commit: 1d29dde8ce23baab90779d293069e162012c9b97
Author: Dennis Lamm  gentoo  org>
AuthorDate: Mon Oct 12 15:48:12 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Oct 12 18:59:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d29dde8

sci-libs/shapely: fixed revdep to renamed package

Signed-off-by: Dennis Lamm  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17894
Signed-off-by: Dennis Lamm  gentoo.org>

 dev-python/pyproj/pyproj-2.4.2-r1.ebuild | 2 +-
 dev-python/uranium/uranium-4.6.1.ebuild  | 2 +-
 dev-python/uranium/uranium-4.7.0.ebuild  | 2 +-
 media-gfx/cura/cura-4.7.0-r1.ebuild  | 2 +-
 sci-libs/cartopy/cartopy-0.18.0.ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-python/pyproj/pyproj-2.4.2-r1.ebuild 
b/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
index 2a90bfb128a..40c39af6849 100644
--- a/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
+++ b/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/Shapely[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
)"
 
 PATCHES=( "${FILESDIR}"/${P}-conftest.patch )

diff --git a/dev-python/uranium/uranium-4.6.1.ebuild 
b/dev-python/uranium/uranium-4.6.1.ebuild
index 19a97cf4fd2..b5a2f4ad587 100644
--- a/dev-python/uranium/uranium-4.6.1.ebuild
+++ b/dev-python/uranium/uranium-4.6.1.ebuild
@@ -36,7 +36,7 @@ DEPEND="${PYTHON_DEPS}
dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
>=dev-python/scipy-1.1[${PYTHON_MULTI_USEDEP}]
-   sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+   sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
')"
 
 RDEPEND="${DEPEND}

diff --git a/dev-python/uranium/uranium-4.7.0.ebuild 
b/dev-python/uranium/uranium-4.7.0.ebuild
index 32be957b123..1f9643331be 100644
--- a/dev-python/uranium/uranium-4.7.0.ebuild
+++ b/dev-python/uranium/uranium-4.7.0.ebuild
@@ -35,7 +35,7 @@ DEPEND="${PYTHON_DEPS}
dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-   sci-libs/Shapely[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
')"
 
 RDEPEND="${DEPEND}

diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild 
b/media-gfx/cura/cura-4.7.0-r1.ebuild
index 032d2437193..36f6fd35e91 100644
--- a/media-gfx/cura/cura-4.7.0-r1.ebuild
+++ b/media-gfx/cura/cura-4.7.0-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${PYTHON_DEPS}
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}]
+   sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] 
)
')"

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index bc9c5426b8f..d4fd00b90fc 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
${PYTHON_DEPS}
dev-python/numpy[${PYTHON_USEDEP}]
sci-libs/pyshp[${PYTHON_USEDEP}]
-   sci-libs/Shapely[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-10-11 Thread Dennis Lamm

commit: 1171f18e35bb4beab4e6372046654ae880c2b905
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Oct 11 10:14:10 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Oct 11 11:25:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1171f18e

media-gfx/cura-4.7.0: fixed ModuleNotFoundError

Bug: https://bugs.gentoo.org/726426

Signed-off-by: Dennis Lamm  gentoo.org>
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/cura-4.7.0-r1.ebuild | 64 +
 1 file changed, 64 insertions(+)

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 000..032d2437193
--- /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}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

2020-10-11 Thread Dennis Lamm

commit: d194a2eafb2c7c272ccd88565992c0be9727ef8b
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Oct 11 10:20:35 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Oct 11 11:25:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d194a2ea

media-gfx/cura: drop old

Signed-off-by: Dennis Lamm  gentoo.org>
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/cura/Manifest|  4 --
 media-gfx/cura/cura-3.4.1.ebuild   | 75 --
 media-gfx/cura/cura-3.6.0.ebuild   | 75 --
 media-gfx/cura/cura-4.2.1.ebuild   | 55 
 media-gfx/cura/cura-4.3.0-r1.ebuild| 55 
 .../cura/files/cura-3.3.0-fix-install-paths.patch  | 37 ---
 .../cura/files/cura-4.2.1-fix-install-paths.patch  | 41 
 7 files changed, 342 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index aadc097a34d..8e2e7103861 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,6 +1,2 @@
-DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
 SHA512 
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
-DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
 SHA512 
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
-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 
5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f80441daf44866ffc93ebcf1295c750
 SHA512 
8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
 DIST cura-4.7.0.tar.gz 29712949 BLAKE2B 
b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f
 SHA512 
0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d

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 f1b275618c6..000
--- 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
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-10-06 Thread Sam James

commit: 33357e01148d0e89c0396ab6ccb4bd620feda4af
Author: D G Turner  scummvm  org>
AuthorDate: Sat Sep 26 16:21:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  7 00:34:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33357e01

media-gfx/cura: Add libarcus dependency directly (to 4.6.1)

This should really be a direct dependency ensuring the python use
flag is set as the sub-dependency does not enforce this is compatible
with the top level cura version.

Signed-off-by: David G Turner  scummvm.org>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/cura-4.6.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/cura/cura-4.6.1-r1.ebuild 
b/media-gfx/cura/cura-4.6.1-r1.ebuild
index 943f9305325..4264d19b6a6 100644
--- a/media-gfx/cura/cura-4.6.1-r1.ebuild
+++ b/media-gfx/cura/cura-4.6.1-r1.ebuild
@@ -20,6 +20,7 @@ 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}]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-10-06 Thread Sam James

commit: e941851f34335b4a5392890fc70a1c276c2a3da4
Author: D G Turner  scummvm  org>
AuthorDate: Sat Sep 26 20:03:08 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  7 00:35:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e941851f

media-gfx/cura: Bump to v4.7.0 ebuild

The other v4.7.0 dependencies i.e. curaengine-4.7.0, libcharon etc.
are already present in tree, so along with fdm-materials, this completes
the changes required to build cura v4.7.0

Signed-off-by: David G Turner  scummvm.org>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-4.7.0.ebuild | 57 
 2 files changed, 58 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 0a4d6b2e883..aadc097a34d 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -3,3 +3,4 @@ DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb938
 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 
5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f80441daf44866ffc93ebcf1295c750
 SHA512 
8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
+DIST cura-4.7.0.tar.gz 29712949 BLAKE2B 
b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f
 SHA512 
0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d

diff --git a/media-gfx/cura/cura-4.7.0.ebuild b/media-gfx/cura/cura-4.7.0.ebuild
new file mode 100644
index 000..4264d19b6a6
--- /dev/null
+++ b/media-gfx/cura/cura-4.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,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/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.6.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}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-10-06 Thread Sam James

commit: 3d5a656f93fc84f7debca03b6accbfd2d35cebf7
Author: D G Turner  scummvm  org>
AuthorDate: Mon Sep 28 19:04:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  7 00:35:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5a656f

media-gfx/cura: Drop ~arm64 from keywords (4.6.1)

libarcus and other dependencies are not keyworded as ~arm64 so
this would not build until these are resolved.

Signed-off-by: David G Turner  scummvm.org>
Closes: https://github.com/gentoo/gentoo/pull/17679
Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/cura-4.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.6.1-r1.ebuild 
b/media-gfx/cura/cura-4.6.1-r1.ebuild
index 4264d19b6a6..74ad049667a 100644
--- a/media-gfx/cura/cura-4.6.1-r1.ebuild
+++ b/media-gfx/cura/cura-4.6.1-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-10-06 Thread Sam James

commit: b5ab283eeb1138e743831f3f04d29c04e58d9ecc
Author: D G Turner  scummvm  org>
AuthorDate: Sat Sep 26 13:14:21 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  7 00:34:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ab283e

media-gfx/cura: Fix runtime crash at startup (4.6.1)

This needs to resolve the correct dependencies i.e. v4.6.1, not later
such as v4.7.0 as this will likely cause issues.

Signed-off-by: David G Turner  scummvm.org>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/{cura-4.6.1.ebuild => cura-4.6.1-r1.ebuild} | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/cura/cura-4.6.1.ebuild 
b/media-gfx/cura/cura-4.6.1-r1.ebuild
similarity index 83%
rename from media-gfx/cura/cura-4.6.1.ebuild
rename to media-gfx/cura/cura-4.6.1-r1.ebuild
index bbd5d0b29de..943f9305325 100644
--- a/media-gfx/cura/cura-4.6.1.ebuild
+++ b/media-gfx/cura/cura-4.6.1-r1.ebuild
@@ -20,11 +20,11 @@ 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/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}]

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-09-19 Thread Sam James

commit: 6e7dbd8ba16ee71dfdf831be2d81a3048ac4a4fd
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 19 16:31:49 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 19 16:31:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e7dbd8b

media-gfx/cura: Keyword 4.6.1 arm64, #734826

Signed-off-by: Sam James  gentoo.org>

 media-gfx/cura/cura-4.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
index c2d57876b25..bbd5d0b29de 100644
--- a/media-gfx/cura/cura-4.6.1.ebuild
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-05-25 Thread Alexey Shvetsov

commit: 26c8af83fa3dbcdecb49a49612163fd5f3b718ed
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Mon May 25 21:03:19 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon May 25 21:03:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c8af83

media-gfx/cura: works with py38

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-gfx/cura/cura-4.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
index 4fd274514ca..c2d57876b25 100644
--- a/media-gfx/cura/cura-4.6.1.ebuild
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, media-gfx/cura/files/

2020-05-25 Thread Alexey Shvetsov

commit: eed745a9a297c67cbea166e5b32371017dc063eb
Author: Michael Perlov  gmail  com>
AuthorDate: Fri May 22 01:01:43 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon May 25 19:41:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed745a9

media-gfx/cura: version bump to 4.6.1

Closes: https://bugs.gentoo.org/710930
Closes: https://bugs.gentoo.org/718960
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Perlov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15908
Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-gfx/cura/Manifest|  1 +
 media-gfx/cura/cura-4.6.1.ebuild   | 56 ++
 .../cura/files/cura-4.6.1-fix-install-paths.patch  | 31 
 3 files changed, 88 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 698ecfb22ab..0a4d6b2e883 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -2,3 +2,4 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
 SHA512 
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 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 
5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f80441daf44866ffc93ebcf1295c750
 SHA512 
8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2

diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.6.1.ebuild
new file mode 100644
index 000..4fd274514ca
--- /dev/null
+++ b/media-gfx/cura/cura-4.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+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-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}
+   $(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.6.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/files/cura-4.6.1-fix-install-paths.patch 
b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
new file mode 100644
index 000..4d5f00ad47d
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.6.1-fix-install-paths.patch
@@ -0,0 +1,31 @@
+--- Cura-4.5.0-orig/CMakeLists.txt 2020-03-01 16:32:23.380956083 +0200
 Cura-4.5.0/CMakeLists.txt  2020-02-25 17:16:45.0 +0200
+@@ -48,6 +48,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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2020-02-09 Thread Michał Górny

commit: cecd559e5e4c0b727413d688ccbdc663024a6c0f
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 14:59:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:26:44 2020 +
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  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}]
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2019-10-15 Thread Joonas Niilola

commit: 1fb659401ca98a043696a0e3fb3ed1e4c0b5d9ea
Author: Michael Perlov  gmail  com>
AuthorDate: Sat Sep 28 10:39:07 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Oct 16 05:22:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb65940

media-gfx/cura: version bump to 4.3.0

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Michael Perlov  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-4.3.0.ebuild | 53 
 2 files changed, 54 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 4816b7899c8..698ecfb22ab 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,4 @@
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
 SHA512 
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
 SHA512 
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 
1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1
 SHA512 
4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
+DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 
8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc
 SHA512 
3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815

diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0.ebuild
new file mode 100644
index 000..aed51febac2
--- /dev/null
+++ b/media-gfx/cura/cura-4.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils 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-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon icons/*.png
+   python_optimize "${D}${get_libdir}"
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/, media-gfx/cura/files/

2019-08-25 Thread Joonas Niilola

commit: efe6b66e73ed6b1c177e93668757045860edc49e
Author: Michael Perlov  gmail  com>
AuthorDate: Sun Aug  4 16:14:25 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Aug 25 17:59:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe6b66e

media-gfx/cura: version bump to 4.2.1

Closes: https://bugs.gentoo.org/680988
Closes: https://bugs.gentoo.org/687324
Closes: https://bugs.gentoo.org/691144

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Michael Perlov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12618
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/cura/Manifest|  1 +
 media-gfx/cura/cura-4.2.1.ebuild   | 53 ++
 .../cura/files/cura-4.2.1-fix-install-paths.patch  | 41 +
 3 files changed, 95 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 1dad2dcaf9a..4816b7899c8 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1,3 @@
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
 SHA512 
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
 SHA512 
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
+DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 
1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1
 SHA512 
4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52

diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
new file mode 100644
index 000..aed51febac2
--- /dev/null
+++ b/media-gfx/cura/cura-4.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils 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-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   doicon icons/*.png
+   python_optimize "${D}${get_libdir}"
+}

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
new file mode 100644
index 000..fc10d727d13
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
@@ -0,0 +1,41 @@
+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.0 +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
+-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2019-01-02 Thread Amy Liffey

commit: 8fdabec85e94a3bf248e9457e5267edd1d81db9d
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Jan  2 22:00:29 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jan  2 22:04:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fdabec8

media-gfx/cura: remove old 3.3.1

Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 media-gfx/cura/Manifest  |  1 -
 media-gfx/cura/cura-3.3.1.ebuild | 68 
 2 files changed, 69 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index e25b1427a32..1dad2dcaf9a 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,2 @@
-DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 
6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a
 SHA512 
7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
 SHA512 
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
 SHA512 
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279

diff --git a/media-gfx/cura/cura-3.3.1.ebuild b/media-gfx/cura/cura-3.3.1.ebuild
deleted file mode 100644
index b2a58d65a58..000
--- a/media-gfx/cura/cura-3.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,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}
-   >=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}
-   sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2019-01-02 Thread Amy Liffey

commit: b4bcea7b6bf920147435fbbf39a4d546f63866c3
Author: Mathy Vanvoorden  vanvoorden  be>
AuthorDate: Sat Dec  8 23:02:54 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jan  2 21:49:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4bcea7b

media-gfx/cura: version bump to 3.6.0

Closes: https://bugs.gentoo.org/show_bug.cgi?id=669264
Closes: https://bugs.gentoo.org/show_bug.cgi?id=671552

Signed-off-by: Mathy Vanvoorden  vanvoorden.be>
Signed-off-by: Amy Liffey  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10595
Package-Manager: Portage[mgorny]-2.3.51.1

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-3.6.0.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index fc0e250b33e..e25b1427a32 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1,3 @@
 DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 
6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a
 SHA512 
7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
 SHA512 
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
+DIST cura-3.6.0.tar.gz 23388945 BLAKE2B 
bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86
 SHA512 
b56e5575cb0eb15d75dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279

diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
new file mode 100644
index 000..379309b70d6
--- /dev/null
+++ b/media-gfx/cura/cura-3.6.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,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}
+   >=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}
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2018-07-16 Thread Amy Liffey

commit: f852e30c276334b5ca21b25d171a832a9781a63b
Author: Michael Perlov  gmail  com>
AuthorDate: Thu Jul 12 10:25:31 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Jul 16 17:27:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f852e30c

media-gfx/cura: version bump to 3.4.1

Closes: https://bugs.gentoo.org/660884
Closes: https://github.com/gentoo/gentoo/pull/9199
Package-Manager: Portage-2.3.42, Repoman-2.3.9

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-3.4.1.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index ba038040485..fc0e250b33e 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1 +1,2 @@
 DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 
6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a
 SHA512 
7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63
+DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 
228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728
 SHA512 
5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1

diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
new file mode 100644
index 000..d913218b642
--- /dev/null
+++ b/media-gfx/cura/cura-3.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,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}
+   >=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}
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2018-06-14 Thread Alexey Shvetsov

commit: 639fc828889d2bd25d4c4a382a057b61544a0e83
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Thu Jun 14 20:12:57 2018 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Thu Jun 14 20:13:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639fc828

media-gfx/cura: deps and metadata update

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/cura/cura-3.3.1.ebuild | 10 +-
 media-gfx/cura/metadata.xml  | 19 +++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/media-gfx/cura/cura-3.3.1.ebuild b/media-gfx/cura/cura-3.3.1.ebuild
index c8501394398..b2a58d65a58 100644
--- a/media-gfx/cura/cura-3.3.1.ebuild
+++ b/media-gfx/cura/cura-3.3.1.ebuild
@@ -19,11 +19,11 @@ IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-   dev-python/uranium[${PYTHON_USEDEP}]
-   media-gfx/curaengine
-   media-gfx/fdm-materials
-   dev-libs/libsavitar:=[python,${PYTHON_USEDEP}]
-   dev-libs/libcharon[${PYTHON_USEDEP}]
+   >=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}] )"
 

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index e3e65a7508d..19761d81848 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -5,6 +5,25 @@
3dpr...@gentoo.org
Gentoo 3D Printer Project

+   
+   ale...@gentoo.org
+   Alexey Shvetsov
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   ma...@vanvoorden.be
+   Mathy Vanvoorden
+   
+   
+   perlo...@gmail.com
+   Michael Perlov
+   
+   
+   soname major version number
+   

Access 3D printers via USB

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

2018-06-14 Thread Alexey Shvetsov

commit: 80e62b6c736134c9ad0cedf85c677feda3b98ad5
Author: Alexey Shvetsov  omrb  pnpi  spb  ru>
AuthorDate: Thu Jun 14 13:11:02 2018 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Thu Jun 14 13:11:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e62b6c

media-gfx/cura: Version bump and clean up

Closes: https://bugs.gentoo.org/630620
Closes: https://bugs.gentoo.org/648130
Closes: https://github.com/gentoo/gentoo/pull/8258
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/cura/Manifest|  6 +-
 media-gfx/cura/cura-0.15.04.4.ebuild   | 77 --
 media-gfx/cura/cura-0.15.04.5_rc5.ebuild   | 78 ---
 media-gfx/cura/cura-2.1.0_beta.ebuild  | 69 -
 media-gfx/cura/cura-2.6.0.ebuild   | 70 -
 .../cura/{cura-2.3.1.ebuild => cura-3.3.1.ebuild}  | 40 +-
 media-gfx/cura/files/cura-0.15.04.4-nopower.patch  | 90 --
 .../files/cura-2.1.0_beta-fix-install-paths.patch  | 38 -
 .../cura/files/cura-2.3.1-fix-install-paths.patch  | 38 -
 .../cura/files/cura-3.3.0-fix-install-paths.patch  | 37 +
 10 files changed, 57 insertions(+), 486 deletions(-)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 69329e4293f..ba038040485 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,5 +1 @@
-DIST cura-0.15.04.4.tar.gz 7265105 BLAKE2B 
8ea4979819180f3f8fec8900215c11db49dafbae71ff023aeb16b760ae5f88d271c0ad2628ab7f06f2a4962cc792573ac56cc63368ebb69e37a83ec092cd5d44
 SHA512 
6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd
-DIST cura-0.15.04.5_rc5.tar.gz 7266640 BLAKE2B 
3900d9c8b1627933b1f6432a75674396c79de993982afa93e6d435d0ebf20df25184eda3760ded566a6fa7c93b0e3b16d76b1bb47f093d281245fee8f799bcb1
 SHA512 
cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f
-DIST cura-2.1.0_beta.tar.gz 19784684 BLAKE2B 
30f908b8792fdbe512d1e9fbc98a8f90018db38fa92c286a209f4dfaded9af8c8c45f5ffca38d9c79ff82a18c9e906fc6141085368bf26cffb2ec15931869cc1
 SHA512 
9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
-DIST cura-2.3.1.tar.gz 8216743 BLAKE2B 
33241eb825a2fde8c1932642dc20c24c50c744068dc2bd7c32d97c9e6b1cfa062ebe110670d9d2828093043ff6c147a1dfbcb5daf0e6ec2447bb9bed4a51c4bc
 SHA512 
875c55a1b75f9e8c5bc6faac8f865a17ee371e973e3acf2528c09ee18bd517acbdde066f292c506ed67654119fdfeac86e28b41887807b767225e0ee6054301f
-DIST cura-2.6.0.tar.gz 10007980 BLAKE2B 
7ed59c28402c2c99dcf8db4506d575159ce25d6e8c58bb2bef302cd662a28f124046e677fba754cc41dc087d94b30183e0896d935cd3ae7e896ba9736ec0a511
 SHA512 
c437b284292682821d3e7c6fe67dfbf9e397588a604d0608fcc89019d02529720a929881d1ad0531fedba2f4b3efc98c1890624a4261dcccacbcfa24246d6e54
+DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 
6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a
 SHA512 
7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63

diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild 
b/media-gfx/cura/cura-0.15.04.4.ebuild
deleted file mode 100644
index fa9ddb4d251..000
--- a/media-gfx/cura/cura-0.15.04.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils python-single-r1 xdg-utils
-
-MY_PV=${PV#0.}
-MY_PN=Cura
-
-DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
-HOMEPAGE="https://github.com/daid/Cura;
-SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-python/wxpython:3.0[opengl,${PYTHON_USEDEP}]
-   >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
-   >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
-   >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
-   >=media-gfx/curaengine-${PV}
-"
-DEPEND="${RDEPEND}
-   >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
-)
-
-src_prepare() {
-   cat > "${T}"/cura <<- CURAEOF || die
-   #!/bin/sh
-   PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" 
"${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
-   CURAEOF
-
-   default
-}
-
-src_install() {
-   insinto /usr/share/cura
-   doins -r Cura resources plugins scripts/linux/cura.py
-   newicon "${S}/resources/images/c.png" "cura.png"
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2018-04-15 Thread Amy Liffey

commit: 6540867b3b8836e1dcf090ae3c1c55091af557b9
Author: Marty E. Plummer  startmail  com>
AuthorDate: Wed Apr  4 03:59:52 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Apr 15 14:05:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6540867b

media-gfx/cura: fdo-mime migration

Plus some minor formatting changes to be more in accord with the rest of
the ::gentoo tree, and removal of eutils in favor of desktop.

Closes: https://github.com/gentoo/gentoo/pull/7800

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 media-gfx/cura/cura-0.15.04.4.ebuild | 17 ++---
 media-gfx/cura/cura-0.15.04.5_rc5.ebuild | 18 +++---
 media-gfx/cura/cura-2.1.0_beta.ebuild| 21 +
 media-gfx/cura/cura-2.3.1.ebuild | 23 ++-
 media-gfx/cura/cura-2.6.0.ebuild | 21 +
 5 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild 
b/media-gfx/cura/cura-0.15.04.4.ebuild
index 59f9fbf4f8b..fa9ddb4d251 100644
--- a/media-gfx/cura/cura-0.15.04.4.ebuild
+++ b/media-gfx/cura/cura-0.15.04.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils fdo-mime gnome2-utils python-single-r1
+inherit desktop gnome2-utils python-single-r1 xdg-utils
 
 MY_PV=${PV#0.}
 MY_PN=Cura
@@ -30,9 +30,12 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
>=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${P}-nopower.patch" )
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
+)
+
 src_prepare() {
cat > "${T}"/cura <<- CURAEOF || die
#!/bin/sh
@@ -62,13 +65,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
gnome2_icon_cache_update
 }

diff --git a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild 
b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
index ac952093c02..c35602d8d18 100644
--- a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
+++ b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime gnome2-utils python-single-r1
+
+inherit desktop gnome2-utils python-single-r1 xdg-utils
 
 MY_PV=${PV#0.}
 MY_PV=${MY_PV/_rc/-RC}
@@ -30,9 +31,12 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
>=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${PN}-0.15.04.4-nopower.patch" )
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-0.15.04.4-nopower.patch"
+)
+
 src_prepare() {
cat > "${T}"/cura <<- CURAEOF || die
#!/bin/sh
@@ -62,13 +66,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
gnome2_icon_cache_update
 }

diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild 
b/media-gfx/cura/cura-2.1.0_beta.ebuild
index 9a28b902e3e..db1610abbb6 100644
--- a/media-gfx/cura/cura-2.1.0_beta.ebuild
+++ b/media-gfx/cura/cura-2.1.0_beta.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 PYTHON_COMPAT=( python3_4 python3_5 )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
 MY_PN=Cura
 MY_PV=${PV/_beta}
@@ -28,7 +29,11 @@ DEPEND="${RDEPEND}
sys-devel/gettext"
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
-PATCHES=( "${FILESDIR}/${P}-fix-install-paths.patch" )
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.0_beta-fix-install-paths.patch"
+)
+
 DOCS=( README.md )
 
 src_configure() {
@@ -52,13 +57,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2018-04-03 Thread Jonas Stein

commit: ba956921fc587f017085735eec41ab68f621181d
Author: Jonas Stein  gentoo  org>
AuthorDate: Tue Apr  3 15:18:42 2018 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Tue Apr  3 15:27:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba956921

media-gfx/cura: Maintainer retired

Proxied maintainer was retired due to inactivity.
Bug: https://bugs.gentoo.org/632854
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/cura/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index e0588ff0d2e..e3e65a7508d 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -1,18 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   tombo...@sina.cn
-   Matthew Brewer
-   

3dpr...@gentoo.org
Gentoo 3D Printer Project

-   
-   proxy-ma...@gentoo.org
-   Gentoo Proxy Maintainers Project
-   

Access 3D printers via USB

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2017-11-26 Thread David Seifert

commit: 9dd1b25cea1e69b0e3aec10abd8a805f97d63afe
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 11:56:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:01:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd1b25c

media-gfx/cura: [QA] Consistent whitespace in metadata.xml

 media-gfx/cura/metadata.xml | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index f06d3016b3d..e0588ff0d2e 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -1,22 +1,22 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-tombo...@sina.cn
-Matthew Brewer
-
-
-3dpr...@gentoo.org
-Gentoo 3D Printer Project
-
-
-proxy-ma...@gentoo.org
-Gentoo Proxy Maintainers Project
-
+   
+   tombo...@sina.cn
+   Matthew Brewer
+   
+   
+   3dpr...@gentoo.org
+   Gentoo 3D Printer Project
+   
+   
+   proxy-ma...@gentoo.org
+   Gentoo Proxy Maintainers Project
+   

Access 3D printers via USB

-
+   
Ultimaker/Cura
-
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2017-07-23 Thread Alexey Shvetsov

commit: 313886837d2d89c6a937cc055be15f9ffc7b8cd9
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Sun Jul 23 11:05:25 2017 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sun Jul 23 11:05:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31388683

media-gfx/cura: Version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-2.6.0.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 0a377e48ca8..8fca1f1c78a 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -2,3 +2,4 @@ DIST cura-0.15.04.4.tar.gz 7265105 SHA256 
9bce9cec7578792f7008a557930d16216ef970
 DIST cura-0.15.04.5_rc5.tar.gz 7266640 SHA256 
12d72b1ece64bfc00909866e725f39867c9d82abdd793892df210afd35014c89 SHA512 
cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f
 WHIRLPOOL 
b6ed8e0f9e17ee4d2c1eae3a8f8a0293529f6a4b362445d9296b47247aab91d521c64541ea9110c8b169eb01661f3cae30583f8f959d4d7bc0a8c255455db58b
 DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 
b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 
9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
 WHIRLPOOL 
19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89
 DIST cura-2.3.1.tar.gz 8216743 SHA256 
4542a5925b503f5416ebb8541fccb65d5c08164febafefdacb05b528c4cf73a8 SHA512 
875c55a1b75f9e8c5bc6faac8f865a17ee371e973e3acf2528c09ee18bd517acbdde066f292c506ed67654119fdfeac86e28b41887807b767225e0ee6054301f
 WHIRLPOOL 
dfa7d3dac9f53d8682a4761900665598b7b75b08afd283a77f43351709eb2639c44b6694d626c17be98544acdceec50b8f6409fdb69efd1bb7d4a5f945e16cba
+DIST cura-2.6.0.tar.gz 10007980 SHA256 
049617e8025a9e74ad4e733884a9c04319882d89e6ab346a72147995d43b44b5 SHA512 
c437b284292682821d3e7c6fe67dfbf9e397588a604d0608fcc89019d02529720a929881d1ad0531fedba2f4b3efc98c1890624a4261dcccacbcfa24246d6e54
 WHIRLPOOL 
099378e95d0bd28f4df8e341f078a3f86c887c1799d4cfa84fa7d01cc50a9f9aa857a59f7c1d3f7ae240d11268eb2e82e6031f9390b83e97805d410ff4868975

diff --git a/media-gfx/cura/cura-2.6.0.ebuild b/media-gfx/cura/cura-2.6.0.ebuild
new file mode 100644
index 000..0f92d0ff5de
--- /dev/null
+++ b/media-gfx/cura/cura-2.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+MY_PN=Cura
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura;
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+usb"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
+   dev-python/uranium[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   ~media-gfx/curaengine-${PV}"
+DEPEND="${RDEPEND}
+   sys-devel/gettext"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch" )
+DOCS=( README.md )
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2017-04-23 Thread Michał Górny

commit: 106bef5e5d0404494586310619ba2c7f6459b65f
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr 23 20:34:37 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 23 20:47:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106bef5e

media-gfx/cura: Remove python@ from maintainers

 media-gfx/cura/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index aafd66fb97d..f06d3016b3d 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -13,10 +13,6 @@
 proxy-ma...@gentoo.org
 Gentoo Proxy Maintainers Project
 
-
-pyt...@gentoo.org
-Gentoo Python Project
-

Access 3D printers via USB

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

2016-12-05 Thread Alexey Shvetsov

commit: ffd11e19963dba37faa4ed735ed4c286234089d9
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Mon Dec  5 09:47:27 2016 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Mon Dec  5 09:47:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd11e19

media-gfx/cura: Version bump to 2.3.1

Package-Manager: portage-2.3.2

 media-gfx/cura/Manifest|  1 +
 media-gfx/cura/cura-2.3.1.ebuild   | 66 ++
 .../cura/files/cura-2.3.1-fix-install-paths.patch  | 38 +
 3 files changed, 105 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 113bc53..0a377e4 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,4 @@
 DIST cura-0.15.04.4.tar.gz 7265105 SHA256 
9bce9cec7578792f7008a557930d16216ef97041a62071bb4e2b2a89638f1f54 SHA512 
6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd
 WHIRLPOOL 
cafd4bc3589214c3fc792c770eaa3f3590018f83ae82444c4f495245ab900748edabccb5a6518d9bd5b26295d7a953e3e60295b3baa90baf6abfe8a75012fbf2
 DIST cura-0.15.04.5_rc5.tar.gz 7266640 SHA256 
12d72b1ece64bfc00909866e725f39867c9d82abdd793892df210afd35014c89 SHA512 
cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f
 WHIRLPOOL 
b6ed8e0f9e17ee4d2c1eae3a8f8a0293529f6a4b362445d9296b47247aab91d521c64541ea9110c8b169eb01661f3cae30583f8f959d4d7bc0a8c255455db58b
 DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 
b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 
9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
 WHIRLPOOL 
19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89
+DIST cura-2.3.1.tar.gz 8216743 SHA256 
4542a5925b503f5416ebb8541fccb65d5c08164febafefdacb05b528c4cf73a8 SHA512 
875c55a1b75f9e8c5bc6faac8f865a17ee371e973e3acf2528c09ee18bd517acbdde066f292c506ed67654119fdfeac86e28b41887807b767225e0ee6054301f
 WHIRLPOOL 
dfa7d3dac9f53d8682a4761900665598b7b75b08afd283a77f43351709eb2639c44b6694d626c17be98544acdceec50b8f6409fdb69efd1bb7d4a5f945e16cba

diff --git a/media-gfx/cura/cura-2.3.1.ebuild b/media-gfx/cura/cura-2.3.1.ebuild
new file mode 100644
index ..808733d
--- /dev/null
+++ b/media-gfx/cura/cura-2.3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+MY_PN=Cura
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura;
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+IUSE="+usb"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
+   dev-python/uranium[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   ~media-gfx/curaengine-${PV}"
+DEPEND="${RDEPEND}
+   sys-devel/gettext"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${P}-fix-install-paths.patch" )
+DOCS=( README.md )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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/files/cura-2.3.1-fix-install-paths.patch 
b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
new file mode 100644
index ..8f503ce
--- /dev/null
+++ b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch
@@ -0,0 +1,38 @@
+diff -urN Cura-2.3.1.orig/CMakeLists.txt Cura-2.3.1/CMakeLists.txt
+--- Cura-2.3.1.orig/CMakeLists.txt 2016-11-04 16:24:43.0 +0300
 Cura-2.3.1/CMakeLists.txt  2016-12-05 12:20:23.126904644 +0300
+@@ -27,20 +27,31 @@
+ 
+ find_package(PythonInterp 3.4.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()
++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2016-08-07 Thread Göktürk Yüksek

commit: 389c2ec602b39a7782c2c4d5ec991f2083fbba26
Author: Marshall Brewer (Gentoo Key)  sina  cn>
AuthorDate: Sat Apr 30 08:28:57 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Aug  8 01:33:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389c2ec6

media-gfx/cura: new version 0.15.04.5_rc5 (legacy)

based on the original ebuild by _AxS_

EROOT are replaced with EPREFIX by the committer

Package-Manager: portage-2.2.28

 media-gfx/cura/Manifest  |  1 +
 media-gfx/cura/cura-0.15.04.5_rc5.ebuild | 74 
 2 files changed, 75 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index e3e56ce..113bc53 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,2 +1,3 @@
 DIST cura-0.15.04.4.tar.gz 7265105 SHA256 
9bce9cec7578792f7008a557930d16216ef97041a62071bb4e2b2a89638f1f54 SHA512 
6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd
 WHIRLPOOL 
cafd4bc3589214c3fc792c770eaa3f3590018f83ae82444c4f495245ab900748edabccb5a6518d9bd5b26295d7a953e3e60295b3baa90baf6abfe8a75012fbf2
+DIST cura-0.15.04.5_rc5.tar.gz 7266640 SHA256 
12d72b1ece64bfc00909866e725f39867c9d82abdd793892df210afd35014c89 SHA512 
cafb2b6883838e3e427e3da0388a6cd93d666052d9029eeb98bafad7970c805c271a7599fbdc493164d790f101b92bbd511479d2fc9f91c64f73677c6cee0a2f
 WHIRLPOOL 
b6ed8e0f9e17ee4d2c1eae3a8f8a0293529f6a4b362445d9296b47247aab91d521c64541ea9110c8b169eb01661f3cae30583f8f959d4d7bc0a8c255455db58b
 DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 
b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 
9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
 WHIRLPOOL 
19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89

diff --git a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild 
b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
new file mode 100644
index 000..8fe0948
--- /dev/null
+++ b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime gnome2-utils python-single-r1
+
+MY_PV=${PV#0.}
+MY_PV=${MY_PV/_rc/-RC}
+MY_PN=Cura
+SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
+HOMEPAGE="https://github.com/daid/Cura;
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   dev-python/wxpython:3.0[opengl,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
+   >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
+   >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
+   >=media-gfx/curaengine-${PV}
+"
+DEPEND="${RDEPEND}
+   >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQ_USE}"
+PATCHES=( "${FILESDIR}/${PN}-0.15.04.4-nopower.patch" )
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+   cat > "${T}"/cura <<- CURAEOF || die
+   #!/bin/sh
+   PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" 
"${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
+   CURAEOF
+
+   eapply "${PATCHES[@]}"
+   eapply_user
+}
+
+src_install() {
+   insinto /usr/share/cura
+   doins -r Cura resources plugins scripts/linux/cura.py
+   newicon "${S}/resources/images/c.png" "cura.png"
+   echo ${PV} > "${ED}"usr/share/cura/version || die
+   dobin "${T}"/cura
+
+   python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort 
-u)
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+
+   make_desktop_entry cura \
+   Cura \
+   "${EPREFIX}/usr/share/pixmaps/cura.png" \
+   "Graphics;3DGraphics;Engineering;Development"
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

2016-08-07 Thread Göktürk Yüksek

commit: 9cc213d3b81d523910f5cb7f63653ed7100ed17f
Author: Marshall Brewer (Gentoo Key)  sina  cn>
AuthorDate: Sat Apr 30 08:17:47 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Aug  8 01:32:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc213d3

media-gfx/cura: new version 0.15.04.4 (legacy)

based on the original ebuild by _AxS_

EROOT are replaced with EPREFIX by the committer

Package-Manager: portage-2.2.28

 media-gfx/cura/Manifest   |  1 +
 media-gfx/cura/cura-0.15.04.4.ebuild  | 73 ++
 media-gfx/cura/files/cura-0.15.04.4-nopower.patch | 90 +++
 3 files changed, 164 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 7541caa..e3e56ce 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1 +1,2 @@
+DIST cura-0.15.04.4.tar.gz 7265105 SHA256 
9bce9cec7578792f7008a557930d16216ef97041a62071bb4e2b2a89638f1f54 SHA512 
6d386c23731e2e02bc3b15d02aed1810622a57af2727325db29feb48eba8da0758925f3bc11fc6433a4b376706f66e6b00bfb3af2cac24cb184899848e11b1bd
 WHIRLPOOL 
cafd4bc3589214c3fc792c770eaa3f3590018f83ae82444c4f495245ab900748edabccb5a6518d9bd5b26295d7a953e3e60295b3baa90baf6abfe8a75012fbf2
 DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 
b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 
9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
 WHIRLPOOL 
19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89

diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild 
b/media-gfx/cura/cura-0.15.04.4.ebuild
new file mode 100644
index 000..b6bcbf2
--- /dev/null
+++ b/media-gfx/cura/cura-0.15.04.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime gnome2-utils python-single-r1
+
+MY_PV=${PV#0.}
+MY_PN=Cura
+SRC_URI="https://github.com/daid/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="A mesh slicer written in python to produce gcode for 3D printers"
+HOMEPAGE="https://github.com/daid/Cura;
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+   dev-python/wxpython:3.0[opengl,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
+   >=dev-python/pyopengl-3.0.2[${PYTHON_USEDEP}]
+   >=dev-python/pyserial-2.6[${PYTHON_USEDEP}]
+   >=media-gfx/curaengine-${PV}
+"
+DEPEND="${RDEPEND}
+   >=dev-python/setuptools-0.6.34[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQ_USE}"
+PATCHES=( "${FILESDIR}/${P}-nopower.patch" )
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+   cat > "${T}"/cura <<- CURAEOF || die
+   #!/bin/sh
+   PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" 
"${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
+   CURAEOF
+
+   eapply "${PATCHES[@]}"
+   eapply_user
+}
+
+src_install() {
+   insinto /usr/share/cura
+   doins -r Cura resources plugins scripts/linux/cura.py
+   newicon "${S}/resources/images/c.png" "cura.png"
+   echo ${PV} > "${ED}"usr/share/cura/version || die
+   dobin "${T}"/cura
+
+   python_optimize $(find "${ED}" -name '*.py' -exec dirname \{\} + | sort 
-u)
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+
+   make_desktop_entry cura \
+   Cura \
+   "${EPREFIX}/usr/share/pixmaps/cura.png" \
+   "Graphics;3DGraphics;Engineering;Development"
+}
+
+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/files/cura-0.15.04.4-nopower.patch 
b/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
new file mode 100644
index 000..975d1c5
--- /dev/null
+++ b/media-gfx/cura/files/cura-0.15.04.4-nopower.patch
@@ -0,0 +1,90 @@
+diff -Naur Cura-14.09/Cura/gui/printWindow.py 
Cura-14.09.new/Cura/gui/printWindow.py
+--- Cura-14.09/Cura/gui/printWindow.py 2014-09-19 05:44:21.0 -0400
 Cura-14.09.new/Cura/gui/printWindow.py 2014-12-08 16:36:18.410389600 
-0500
+@@ -1,7 +1,6 @@
+ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the 
AGPLv3 License"
+ 
+ import wx
+-import power
+ import time
+ import sys
+ import os
+@@ -319,18 +318,6 @@
+   self.sizer = wx.GridBagSizer(2, 2)
+   self.panel.SetSizer(self.sizer)
+ 
+-  self.powerWarningText = wx.StaticText(parent=self.panel,
+-  id=-1,
+-  label=_("Your computer is running on battery 
power.\nConnect your computer

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2016-08-07 Thread Göktürk Yüksek

commit: abfdf0088e60ceb1f28aca1f88ff2d302f0bde5e
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Mon Aug  8 01:43:04 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Aug  8 01:43:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abfdf008

media-gfx/cura: replace eapply && eapply_user with default

Package-Manager: portage-2.2.28

 media-gfx/cura/cura-0.15.04.4.ebuild | 3 +--
 media-gfx/cura/cura-0.15.04.5_rc5.ebuild | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-gfx/cura/cura-0.15.04.4.ebuild 
b/media-gfx/cura/cura-0.15.04.4.ebuild
index b6bcbf2..f2f700f 100644
--- a/media-gfx/cura/cura-0.15.04.4.ebuild
+++ b/media-gfx/cura/cura-0.15.04.4.ebuild
@@ -37,8 +37,7 @@ src_prepare() {
PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" 
"${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
CURAEOF
 
-   eapply "${PATCHES[@]}"
-   eapply_user
+   default
 }
 
 src_install() {

diff --git a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild 
b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
index 8fe0948..40231e4 100644
--- a/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
+++ b/media-gfx/cura/cura-0.15.04.5_rc5.ebuild
@@ -38,8 +38,7 @@ src_prepare() {
PYTHONPATH="\$PYTHONPATH:${EPREFIX}/usr/share/cura/" 
"${PYTHON}" "${EPREFIX}/usr/share/cura/cura.py" "\$@"
CURAEOF
 
-   eapply "${PATCHES[@]}"
-   eapply_user
+   default
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2016-05-22 Thread Göktürk Yüksek

commit: 167063bde372069b3b21c40969dc39f1a9f81c49
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Sat May 21 19:01:03 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun May 22 17:04:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167063bd

media-gfx/cura: fix license: s/AGPL-3/APGL-3+/

>From cura/CuraApplication.py:
"Cura is released under the terms of the AGPLv3 or higher."

Package-Manager: portage-2.2.28

 media-gfx/cura/cura-2.1.0_beta.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild 
b/media-gfx/cura/cura-2.1.0_beta.ebuild
index 0e4811d..e0cf9a7 100644
--- a/media-gfx/cura/cura-2.1.0_beta.ebuild
+++ b/media-gfx/cura/cura-2.1.0_beta.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/Ultimaker/Cura;
 SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
-LICENSE="AGPL-3"
+LICENSE="AGPL-3+"
 SLOT="0"
 IUSE="+usb"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/

2016-04-29 Thread Alexey Shvetsov

commit: 107e5c31a92fa780f72528a3b29fce69446ddf17
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Fri Apr 29 11:35:04 2016 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Fri Apr 29 11:35:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107e5c31

media-gfx/cura: fix deps

should depend on libarcus[python]

Package-Manager: portage-2.2.28

 media-gfx/cura/cura-2.1.0_beta.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild 
b/media-gfx/cura/cura-2.1.0_beta.ebuild
index 5b991fa..0e4811d 100644
--- a/media-gfx/cura/cura-2.1.0_beta.ebuild
+++ b/media-gfx/cura/cura-2.1.0_beta.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 IUSE="+usb"
 
 RDEPEND="${PYTHON_DEPS}
-   dev-libs/libarcus:=[${PYTHON_USEDEP}]
+   dev-libs/libarcus:=[python,${PYTHON_USEDEP}]
dev-python/uranium[${PYTHON_USEDEP}]
usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
~media-gfx/curaengine-${PV}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/cura/files/, media-gfx/cura/

2016-04-28 Thread Ian Delaney

commit: 2b1dfc2fc7c4c6dbe9d2f48e831918d2cb50c629
Author: Marshall Brewer (Gentoo Key)  sina  cn>
AuthorDate: Fri Apr 15 22:14:07 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Thu Apr 28 14:12:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1dfc2f

media-gfx/cura: initial ebuild, 2.1.0_beta

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Closes: https://github.com/gentoo/gentoo/pull/1298

Signed-off-by: Ian Delaney  gentoo.org>

 media-gfx/cura/Manifest|  1 +
 media-gfx/cura/cura-2.1.0_beta.ebuild  | 65 ++
 .../files/cura-2.1.0_beta-fix-install-paths.patch  | 38 +
 media-gfx/cura/metadata.xml| 26 +
 4 files changed, 130 insertions(+)

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
new file mode 100644
index 000..7541caa
--- /dev/null
+++ b/media-gfx/cura/Manifest
@@ -0,0 +1 @@
+DIST cura-2.1.0_beta.tar.gz 19784684 SHA256 
b81f09307968475e33b03199aaf968e25d2b37fc7db9777b95c03053b1836f83 SHA512 
9e4b4f0a93098f9cadf7d8969725e17ac549b6caced602a3d088e65068ab7fcda5a18e7e6f293434e7042360f0e37d87074d82d8884370bfbfc10e07a4212ce2
 WHIRLPOOL 
19ae138fa4b7c840ffc2d61779a08d48624bc6078fa83a6bec280d1a725e93bad6682d9f21a0cbe3ee4a4343a47a7e6f58d3fd559804f278241c7a5bb7d3cf89

diff --git a/media-gfx/cura/cura-2.1.0_beta.ebuild 
b/media-gfx/cura/cura-2.1.0_beta.ebuild
new file mode 100644
index 000..5b991fa
--- /dev/null
+++ b/media-gfx/cura/cura-2.1.0_beta.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+MY_PN=Cura
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura;
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="+usb"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/libarcus:=[${PYTHON_USEDEP}]
+   dev-python/uranium[${PYTHON_USEDEP}]
+   usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+   ~media-gfx/curaengine-${PV}"
+DEPEND="${RDEPEND}
+   sys-devel/gettext"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${P}-fix-install-paths.patch" )
+DOCS=( README.md )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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/files/cura-2.1.0_beta-fix-install-paths.patch 
b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
new file mode 100644
index 000..ec07c00
--- /dev/null
+++ b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch
@@ -0,0 +1,38 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2016-04-12 17:39:03.0 +0200
 b/CMakeLists.txt   2016-04-16 13:30:27.339900905 +0200
+@@ -55,20 +55,31 @@
+ 
+ find_package(PythonInterp 3.4.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/cura)
++DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
++
+ if(NOT APPLE AND NOT WIN32)
+ install(FILES cura_app.py
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ RENAME cura)
+ install(DIRECTORY cura
+-DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages
++DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
+ FILES_MATCHING PATTERN *.py)
+ install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
+-DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
++DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
+ install(FILES cura.desktop
+

53 matches

Mail list logo