summaryrefslogtreecommitdiff
path: root/dev-python/uranium
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-16 05:02:38 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-16 05:02:38 +0100
commitf1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
treec48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /dev-python/uranium
parentcb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)
gentoo resync : 16.06.2018
Diffstat (limited to 'dev-python/uranium')
-rw-r--r--dev-python/uranium/Manifest8
-rw-r--r--dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch30
-rw-r--r--dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch34
-rw-r--r--dev-python/uranium/metadata.xml19
-rw-r--r--dev-python/uranium/uranium-3.3.0.ebuild (renamed from dev-python/uranium/uranium-2.6.0.ebuild)31
5 files changed, 75 insertions, 47 deletions
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 81d3490b0577..6e2f06e27bb4 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,4 +1,4 @@
-AUX uranium-2.3.1-fix-install-paths.patch 1440 BLAKE2B 59007c093f0e2921629ade8b39c2003e58eca03914a203a47a79958bf480e2ce96d173097b3a481ad8ddca1924c9aa32ed09a61cbef0c06e9ef14e5b9c7a8b33 SHA512 4dd1f75c29a6982a62560dcd3d27f5070e57246c4438dfa6ff52ec487c4d250df4fd6779023a524adf7500c6edba73086e619528df68b47c253d47c292c115c4
-DIST uranium-2.6.0.tar.gz 826489 BLAKE2B c83a7276502b96c1e4ab942b55a99bedbb1edc615aad0a38dde94877e243c82977c21900a8c59561b7849ccd6917d1377c98cb533c4105306437d885b7dd73b2 SHA512 1c0b1381ffa213f7f1f7bfa86c31fd270d16506f672636f558be6c7bc375dcfe76f73fe2d0600caf055528a268372f91eead005c737348b774a78ee272a4650b
-EBUILD uranium-2.6.0.ebuild 1353 BLAKE2B 8a995b14fe1073eaf8fb50a56462e9491ad0dd07db66d25cd06355731fae33c77f7967d487ac5f4f4eef0d2b78a4b409e2b2ddb2ea1a9b9aaba9a5d78923d39b SHA512 0a04bb2f4001a9221f62b7663736e39221024e09f329082f606368da7ae6f3b3a067344ccd39488bbf8886539ff6c4b9699cfa89871bea0ce48398b41514984b
-MISC metadata.xml 458 BLAKE2B 91c2ae345eacf5a37ea08f7b5a84a5b655c338b7bbd789c9b308d2ff7e4a6b62cccf02d6dea61538e468c12a2a8ec8a65fbb4d5180f291d5c712aebf5d935bdf SHA512 9a98e7b56736acc646a333ec203e7f82dfb9b5bf56e227f024f5cca545ffb6fb755a6e0912faf8ad1c1dc5a6fd6c51e513ea1109cf176e437b2d15b121dd088c
+AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
+DIST uranium-3.3.0.tar.gz 906093 BLAKE2B d41608170da64f93d6149e76cc28fa476e439f6b291bc667f8b562dbcde047f234aa77cfa52b73420f286b926ef05ef50df8fd74722fc81dd3fe94b407bee7f4 SHA512 48de8ecf100f6bfbaa6b3bc6562fef25991ad07375f3d8f752f130b44c2e4728b2979f99de23570cd46367d868bb7139dfd9d73a7d3755d2141edc1fd46939b3
+EBUILD uranium-3.3.0.ebuild 1389 BLAKE2B 66d6d70799f21ba5906e78e0308c83beebaa28b7809d831b032a5b41f451a403e119536f45959bbd38816f85f21354a73e2f9301adbe3cbde439e4ff2a7a93a2 SHA512 7b662a387df685fbc46af0acbe82428a05835edca3e2a3ad1867634c21da027254295394735e43684f3ee5b1eaaee160ee8144a46b596bcffe7c697de7f8b582
+MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
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
deleted file mode 100644
index a82484afd4f8..000000000000
--- a/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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.000000000 +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/files/uranium-3.3.0-fix-install-paths.patch b/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
new file mode 100644
index 000000000000..598b93346a4f
--- /dev/null
+++ b/dev-python/uranium/files/uranium-3.3.0-fix-install-paths.patch
@@ -0,0 +1,34 @@
+--- Uranium-3.1.0-orig/CMakeLists.txt 2017-12-04 18:02:00.000000000 +0200
++++ Uranium-3.1.0/CMakeLists.txt 2017-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/metadata.xml b/dev-python/uranium/metadata.xml
index ecd46ad18564..a1111722f75c 100644
--- a/dev-python/uranium/metadata.xml
+++ b/dev-python/uranium/metadata.xml
@@ -9,6 +9,25 @@
<email>python@gentoo.org</email>
<name>Gentoo Python Project</name>
</maintainer>
+ <maintainer type="person">
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mathy@vanvoorden.be</email>
+ <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>perlovka@gmail.com</email>
+ <name>Michael Perlov</name>
+ </maintainer>
+ <slots>
+ <subslots>soname major version number</subslots>
+ </slots>
<upstream>
<remote-id type="github">Ultimaker/Uranium</remote-id>
</upstream>
diff --git a/dev-python/uranium/uranium-2.6.0.ebuild b/dev-python/uranium/uranium-3.3.0.ebuild
index 42085e598e26..ea926475cda6 100644
--- a/dev-python/uranium/uranium-2.6.0.ebuild
+++ b/dev-python/uranium/uranium-3.3.0.ebuild
@@ -1,38 +1,43 @@
-# 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=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
+
inherit cmake-utils python-single-r1
-MY_PN=Uranium
-MY_PV=${PV/_beta}
+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/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="AGPL-3+"
+LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:*[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
+ <dev-python/PyQt5-5.10[${PYTHON_USEDEP},declarative,network,svg]
dev-python/numpy[${PYTHON_USEDEP}]
- dev-qt/qtdeclarative:5
- dev-qt/qtquickcontrols:5"
+ >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtquickcontrols2: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 )
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
src_configure() {
local mycmakeargs=(
-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 06:16:34 +0000