From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- dev-python/pynest2d/Manifest | 3 +- .../files/pynest2d-4.8.0-fix-cpp-version.patch | 11 ++++++ dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild | 30 +++++++++++++++++ dev-python/pynest2d/pynest2d-4.8.0.ebuild | 39 ---------------------- 4 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch create mode 100644 dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild delete mode 100644 dev-python/pynest2d/pynest2d-4.8.0.ebuild (limited to 'dev-python/pynest2d') diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest index d79ac82934e7..0eea8d2bfef5 100644 --- a/dev-python/pynest2d/Manifest +++ b/dev-python/pynest2d/Manifest @@ -1,4 +1,5 @@ +AUX pynest2d-4.8.0-fix-cpp-version.patch 516 BLAKE2B f10567673b4347a45446de9f97561faff615685df9027cea0f2c3625ed8ecd4df1ae80981da0295ef0795529795295ebb37e285f6926e3d1c69fe70081aa4b03 SHA512 0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30 AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6 DIST pynest2d-4.8.0.tar.gz 18174 BLAKE2B 3720815b3d5ba5d4a0dd24ec4104af318d2d7f2e86e66ada68ead8249ed28184d9a153995f143cc4e00d603804da959a086a27decfe2b1e0ef00256a891e0d17 SHA512 1304450f94589b5212f11d83fb228f0deb919698b44b1651f248105c23b65cf3d233e67526bbfb47df74b9b18d0c465f4188d02a0a6941564b551f50d9a3c84f -EBUILD pynest2d-4.8.0.ebuild 892 BLAKE2B 513a0f81ba0de1a72550f19f8e521269f1c8fa162161006b6e6351133e0cb2f2aa6694a23a184c193ca24e924cf5a48160cc5ccd36b6ee55a14cf81888184b63 SHA512 0beb2834dea7c184953f9368fa1073c4ac3882b0437a673a5136697767bffdfa3fceeab2fefd435a47b9c65aade2e7fec2ce6b7c999a73310ff411c682292bf3 +EBUILD pynest2d-4.8.0-r1.ebuild 701 BLAKE2B 667826e64bc8f64d5fd93da87b53aff760b2c749c0216b22dd2d3460009293252baf52d3760054ecebfc7f96835e981935c25f37124b326825b9df24908cc600 SHA512 3e0c323f32c79d2607a7e2cd38155f5703df37f77c5d4281d31ec4f17539f17fe63214e02cd0509ccc5b6ffbc810e9abb0522467c1fc71d53d6c776d8f2df211 MISC metadata.xml 409 BLAKE2B d2b4665c2ecc55b12a8058ea9875761523b925461731bc3e9cdfc87b946b950dce07511c3404047dfe283edf761a3b69e71af29618fd39040a04bc3500413a5e SHA512 4e95045f37666488ae3b2dc2277e97bd3e5f832da3d23a20f601d71ede313d51ffe3407ab23536827d9b449a4cf5b38b49b410997e0f3a9bb90ad02ab8e4cbbf diff --git a/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch b/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch new file mode 100644 index 000000000000..1fe895892de2 --- /dev/null +++ b/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ find_package(Boost REQUIRED) # Dependency of libnest2d. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper -DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std") # Tell libnest2d to use Clipper and NLopt, and standard threads. + + # Some build options. +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 14) + if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + endif() diff --git a/dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild b/dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild new file mode 100644 index 000000000000..b2b6ecd0a450 --- /dev/null +++ b/dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild @@ -0,0 +1,30 @@ +# 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 python-single-r1 + +DESCRIPTION="Python bindings for libnest2d" +HOMEPAGE="https://github.com/Ultimaker/pynest2d" +SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libnest2d + $(python_gen_cond_dep 'dev-python/sip[${PYTHON_MULTI_USEDEP}]') + " + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-required-flags-from-Libnest2D-target.patch + "${FILESDIR}"/${P}-fix-cpp-version.patch +) diff --git a/dev-python/pynest2d/pynest2d-4.8.0.ebuild b/dev-python/pynest2d/pynest2d-4.8.0.ebuild deleted file mode 100644 index 5f57d42dca50..000000000000 --- a/dev-python/pynest2d/pynest2d-4.8.0.ebuild +++ /dev/null @@ -1,39 +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 python-single-r1 - -DESCRIPTION="Python bindings for libnest2d" -HOMEPAGE="https://github.com/Ultimaker/pynest2d" -SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libnest2d - $(python_gen_cond_dep 'dev-python/sip[${PYTHON_MULTI_USEDEP}]') - " - -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${P}-required-flags-from-Libnest2D-target.patch" ) - -# test? ( ) -# "" - -#DEPENDENCIES - -# Clipper, a polygon clipping library. -# NLopt, a library to solve non-linear optimization problems. -# Boost, the headers only. -# Sip, an application to generate Python bindings more easily. -- cgit v1.2.3