[gentoo-commits] repo/gentoo:master commit in: dev-python/uranium/files/
commit: 3b613c71f371e689ce74bf5e1e78244f0ef1761e
Author: D G Turner scummvm org>
AuthorDate: Sat Sep 26 13:07:21 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 7 00:34:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b613c71
Revert "dev-python/uranium: remove unused patch(es)"
This reverts commit 9e3189e8fb3c13d834dedbbbce73df7b97b864fe.
Removing these and the associated ebuild for v4.6.1 broke Cura v4.6.1
which was the most recent in the portage tree, but only at runtime.
Signed-off-by: David G Turner scummvm.org>
Signed-off-by: Sam James gentoo.org>
.../files/uranium-4.6.1-fix-install-paths.patch| 32 ++
1 file changed, 32 insertions(+)
diff --git a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
new file mode 100644
index 000..5777065e9da
--- /dev/null
+++ b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
@@ -0,0 +1,32 @@
+--- Uranium-4.5.0-orig/CMakeLists.txt 2020-03-01 16:26:44.736355687 +0200
Uranium-4.5.0/CMakeLists.txt2020-02-24 17:02:05.0 +0200
+@@ -12,6 +12,16 @@
+
+ find_package(PythonInterp 3.5.0 REQUIRED)
+
++if(NOT PYTHON_SITE_PACKAGES_DIR)
++ if(APPLE OR WIN32)
++ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++ CACHE STRING "Directory to install Python bindings to")
++ else()
++ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
++ STRING "Directory to install Python bindings to")
++ endif()
++endif()
++
+ # # Checks using pylint
+ # Note that we use exit 0 here to not mark the build as a failure on check
failure
+ # In addition, the specified pylint configuration uses the spellchecker
plugin. This required python-enchant to be installed.
+@@ -48,10 +58,10 @@
+ if(EXISTS /etc/debian_version)
+ install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
+ else()
+-install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
++install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
+ endif()
+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
+-DESTINATION
${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/
)
++DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
+ install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+
+ # Detect plugins to install
[gentoo-commits] repo/gentoo:master commit in: dev-python/uranium/files/
commit: 9e3189e8fb3c13d834dedbbbce73df7b97b864fe
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Sep 19 16:18:54 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Sep 20 14:38:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3189e8
dev-python/uranium: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/17602
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/uranium-4.6.1-fix-install-paths.patch| 32 --
1 file changed, 32 deletions(-)
diff --git a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
b/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
deleted file mode 100644
index 5777065e9da..000
--- a/dev-python/uranium/files/uranium-4.6.1-fix-install-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
Uranium-4.5.0-orig/CMakeLists.txt 2020-03-01 16:26:44.736355687 +0200
-+++ Uranium-4.5.0/CMakeLists.txt2020-02-24 17:02:05.0 +0200
-@@ -12,6 +12,16 @@
-
- find_package(PythonInterp 3.5.0 REQUIRED)
-
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+ if(APPLE OR WIN32)
-+ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+ CACHE STRING "Directory to install Python bindings to")
-+ else()
-+ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
-+ STRING "Directory to install Python bindings to")
-+ endif()
-+endif()
-+
- # # Checks using pylint
- # Note that we use exit 0 here to not mark the build as a failure on check
failure
- # In addition, the specified pylint configuration uses the spellchecker
plugin. This required python-enchant to be installed.
-@@ -48,10 +58,10 @@
- if(EXISTS /etc/debian_version)
- install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
- else()
--install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-+install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
- endif()
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
--DESTINATION
${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/
)
-+DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
-
- # Detect plugins to install
[gentoo-commits] repo/gentoo:master commit in: dev-python/uranium/files/, dev-python/uranium/
commit: 218ac18fc511c2817c2ea4e956555c5046a1269c
Author: Michał Górny gentoo org>
AuthorDate: Sun Jul 12 16:45:53 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jul 12 16:56:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218ac18f
dev-python/uranium: Remove redundant versions
Signed-off-by: Michał Górny gentoo.org>
dev-python/uranium/Manifest| 1 -
.../files/uranium-3.3.0-fix-install-paths.patch| 34 --
dev-python/uranium/uranium-4.3.0-r1.ebuild | 76 --
3 files changed, 111 deletions(-)
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 2757e84d142..f988ec98b54 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,2 +1 @@
-DIST uranium-4.3.0.tar.gz 899153 BLAKE2B
314dbeed1cce49d33439b2fa744d37e4b360edb041964d2c3336730295b88bb2af86df8eac8382a6696fbc9c1ba07fa0774089ec3aa7fd0f8fbb92c61ce2825b
SHA512
eac28907ccd66e5a43012a6f5af2a97daea21f0e2832613562e848cca967e036fea117811d8a4cc519c1417a113449e7065233fc541347202c6a8ff85a9d60b7
DIST uranium-4.6.1.tar.gz 1013314 BLAKE2B
2a89eb1c4ffab35879eea9a681ea20e9cc5f78736d9c8bda5bf33baf5ef6d3f6418fd1f4b779738d644afd2d553d500c4892559ae402eeab0c38a4d95b295cf5
SHA512
ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a
diff --git a/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
b/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
deleted file mode 100644
index 598b93346a4..000
--- a/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
Uranium-3.1.0-orig/CMakeLists.txt 2017-12-04 18:02:00.0 +0200
-+++ Uranium-3.1.0/CMakeLists.txt2017-12-29 18:57:22.493045527 +0200
-@@ -12,6 +12,16 @@
-
- find_package(PythonInterp 3.5.0 REQUIRED)
-
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+ if(APPLE OR WIN32)
-+ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+ CACHE STRING "Directory to install Python bindings to")
-+ else()
-+ set(PYTHON_SITE_PACKAGES_DIR
lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
-+ STRING "Directory to install Python bindings to")
-+ endif()
-+endif()
-+
- # # Checks using pylint
- # Note that we use exit 0 here to not mark the build as a failure on check
failure
- # In addition, the specified pylint configuration uses the spellchecker
plugin. This required python-enchant to be installed.
-@@ -48,11 +58,11 @@
- if(EXISTS /etc/debian_version)
- install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages)
- else()
--install(DIRECTORY UM DESTINATION
lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-+install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
- endif()
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
--DESTINATION
${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/
)
-+DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
--install(DIRECTORY plugins DESTINATION lib${LIB_SUFFIX}/uranium)
-+install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_LIBDIR}/uranium)
-
- include(CPackConfig.cmake)
diff --git a/dev-python/uranium/uranium-4.3.0-r1.ebuild
b/dev-python/uranium/uranium-4.3.0-r1.ebuild
deleted file mode 100644
index b5516dcefb7..000
--- a/dev-python/uranium/uranium-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium;
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
- test? (
- $(python_gen_cond_dep '
- dev-python/pytest[${PYTHON_MULTI_USEDEP}]
- dev-python/mypy[${PYTHON_MULTI_USEDEP}]
- ')
- )"
-
-RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
- sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
- ')
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/uranium/files/, dev-python/uranium/
commit: 2f2cb81c57845f317150d86599c387c7cd47f32f
Author: Alexey Shvetsov gentoo org>
AuthorDate: Mon Dec 5 09:40:08 2016 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Mon Dec 5 09:40:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2cb81c
dev-python/uranium: Version bump to 2.3.1
Package-Manager: portage-2.3.2
dev-python/uranium/Manifest| 1 +
.../files/uranium-2.3.1-fix-install-paths.patch| 30 +++
dev-python/uranium/uranium-2.3.1.ebuild| 58 ++
3 files changed, 89 insertions(+)
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 2f5caad..c0c16d5 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1 +1,2 @@
DIST uranium-2.1.0_beta.tar.gz 436367 SHA256
9e7969fdaccb761a261eaed0b72ea94c7b6c0e4455df8f352f93647a6344673e SHA512
aacddf202e633ed3c7dc216a2700900af2ef5935a021a6534e815d373b666bdc775ab116b34d46cdec1d9b50ef8c81b9d113799f0f6d2b8e229ea14c2d8a0e66
WHIRLPOOL
5050d7fd0b07bf1b36f423d8576a312f2d667efc9574314b5748cee357251b39f36b69cce97203a569d63e56f779ce5db91eacd6ee4a1eda1d121713114bf01e
+DIST uranium-2.3.1.tar.gz 509563 SHA256
e1fc3106845e5f635abd81ed75da7e8c095b11351322f4a5fc46c9870c1fa415 SHA512
4d0f959b8850608b6a34aef2901394734c994280b40bd863436b7c87eae2834214c1fe5264c4db6368f605076b42123dc7586a3ac7d217d4edd462edb6af9a88
WHIRLPOOL
519b78bc3fdba780b35c64531fc97de33922235ce7bb9c5f0891df3bef010ebb1439f73eb2307277198a32c00974639fe398693778b8973152c4a7eaa2f79ea0
diff --git a/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch
b/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch
new file mode 100644
index ..a82484a
--- /dev/null
+++ b/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch
@@ -0,0 +1,30 @@
+diff -urN Uranium-2.3.1.orig/CMakeLists.txt Uranium-2.3.1/CMakeLists.txt
+--- Uranium-2.3.1.orig/CMakeLists.txt 2016-10-27 18:22:23.0 +0300
Uranium-2.3.1/CMakeLists.txt 2016-12-05 12:25:53.190933188 +0300
+@@ -43,14 +43,20 @@
+ # Build Translations
+ CREATE_TRANSLATION_TARGETS()
+
+-if(APPLE OR WIN32)
+-install(DIRECTORY UM DESTINATION
lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+-else()
+-install(DIRECTORY UM DESTINATION
lib/python${PYTHON_VERSION_MAJOR}/dist-packages)
++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 UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
+-DESTINATION
${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/
)
++DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
+ install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+-install(DIRECTORY plugins DESTINATION lib/uranium)
++install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_LIBDIR}/uranium)
+
+ include(CPackConfig.cmake)
diff --git a/dev-python/uranium/uranium-2.3.1.ebuild
b/dev-python/uranium/uranium-2.3.1.ebuild
new file mode 100644
index ..90bd499
--- /dev/null
+++ b/dev-python/uranium/uranium-2.3.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+inherit cmake-utils python-single-r1
+
+MY_PN=Uranium
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium;
+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="doc test"
+
+RDEPEND="${PYTHON_DEPS}
+ ~dev-libs/libarcus-${PV}:*[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-qt/qtdeclarative:5
+ dev-qt/qtquickcontrols:5"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch" )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DOCS=( README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use doc; then
+ cmake-utils_src_compile doc
+
