gentoo resync : 12.05.2022

4 files changed, 3 insertions, 165 deletions

diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 0054e3131a20..002c8f7d8ae9 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,8 +1,4 @@
 AUX cura-4.12.1-code-style-test.patch 406 BLAKE2B 66a94ddbb95402b2edbf2b149173f5f8ed63feaf468c3300e5d8d9cad2ca1c783d643e4e051d6994db46cc3fec853172b84f98d1c3366f995a831e7fa1b27019 SHA512 5c739fcd4c4259329f39e630d7c33e55b9a3910ec1ca778ba666e71f4087f1729c4f18b138301580f8cf8fb15b297855fe72337f2fa0b58454b8e0beecdccba3
-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
-EBUILD cura-4.12.1.ebuild 2412 BLAKE2B 9e7d5aa4c6a548d6b03af9595fae81e21515b3c24e2a7396a55fc6e44d36e76e6ce76ef88f953db43dfc921f028fc79d237fddc7cb964ec83b35ee364316eb7f SHA512 ffb203ad5fcaff50f6f7b4c66c771d67fed4abd5724ef345190d99a1fc3c7a5ddbe46e5c1a6d77afe0ca6e824d27b106790a49641c67985b9a22228e03647617
-EBUILD cura-4.13.1.ebuild 2562 BLAKE2B d2bacb4f5eacae22d1912c13ad796fb19dc4309ebe5542fc64e1bf6358d046cd97a5fc3c3586a72960408ab6fc723b644f483e38763c7b289f4349037d16954b SHA512 25efb45d58481d9981fdc4e8e708c208123298889b74309e7923f112ef6dc3dfbdbd78ecbe9f93f7251fe849c9a90780a4c9f009e223504515e1af89dfdd936a
-EBUILD cura-4.9.1.ebuild 2093 BLAKE2B cff46fb5b0a25cd65b7b37dfdb955ae275f049cfdf0602bf3418814a8be6a944caf83fe117547c3272d95052b624714b24079c4a2bc2c1b744d40b04340715f7 SHA512 313730100bd6d5f395017ad2422e5479d8e89e0b0d5a6afe100add25cabad76b11dd09402605dae4bb3e933a1216b756d0c2e2e79671b84f64b109c0f873526c
+EBUILD cura-4.13.1-r1.ebuild 2561 BLAKE2B 19d394ed7134b63387b26cedea00c438502fe685423326676ddfe0a0cc3470502a852127d6b98f172864760bb1b5a9e738a32bc6384b366697b95cc19a2e1bda SHA512 5f489d4dad73806098a68895cde061e4dd8e91a1aed4263395da48e500aa4307a83cb20732254ca511eb926f1892cb03304357a9b0a1db5bbdd3644d7ab44dd5
 MISC metadata.xml 1083 BLAKE2B 122f6c64557092750be93668e0cbd1e4b546cc711d572c0a14dae20426d722134570f7ad7cd25d769d96a264d3839b169b7c9f44f26fb0a5786c41a32c9e1f82 SHA512 1d60e79f32515d5017c17347000760702c250817c941ef0cb307ee8293c99882a4fa7c84263a7668aabb5aa5c433122c32fdd80b1dc47c32ef574c6d5e2301a0
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..000000000000
--- 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 b/media-gfx/cura/cura-4.13.1-r1.ebuild
index 060fa6170940..b9234606b66a 100644
--- a/media-gfx/cura/cura-4.13.1.ebuild
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit cmake desktop python-single-r1 xdg
 
@@ -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}"
 
diff --git a/media-gfx/cura/cura-4.9.1.ebuild b/media-gfx/cura/cura-4.9.1.ebuild
deleted file mode 100644
index 219edd85cc71..000000000000
--- a/media-gfx/cura/cura-4.9.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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_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}]
-			sci-libs/shapely[${PYTHON_USEDEP}]
-			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-			zeroconf? ( dev-python/zeroconf[${PYTHON_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}"
-}