Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pynest2d/files/, dev-python/pynest2d/
Date: Mon, 09 May 2022 07:01:01
Message-Id: 1652079652.26070d32bdfe0c38f3f7d1bd4e559083f41a53c0.mgorny@gentoo
1 commit: 26070d32bdfe0c38f3f7d1bd4e559083f41a53c0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 9 06:59:50 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 07:00:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26070d32
7
8 dev-python/pynest2d: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pynest2d/Manifest | 2 --
13 .../files/pynest2d-4.8.0-fix-cpp-version.patch | 11 --------
14 ....8.0-required-flags-from-Libnest2D-target.patch | 24 -----------------
15 dev-python/pynest2d/pynest2d-4.12.1.ebuild | 29 ---------------------
16 dev-python/pynest2d/pynest2d-4.9.1.ebuild | 30 ----------------------
17 5 files changed, 96 deletions(-)
18
19 diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
20 index 953b96b37059..6e5a58045d41 100644
21 --- a/dev-python/pynest2d/Manifest
22 +++ b/dev-python/pynest2d/Manifest
23 @@ -1,3 +1 @@
24 -DIST pynest2d-4.12.1.tar.gz 18448 BLAKE2B 5432d7acfe600afd32a0fb4543728eed351dea442ff23c9397182919f43015c4aed530aa7ec5b59c75d6373ea6ed122262d7018eb12cdd1b4586bf3ec960586b SHA512 0494efbc0ad6379fde4bdf9cdfe902cb4cbce30129771d34e01661b58ee38d6256910e10184c121de3b2d7139e6dbfee5b4e039d7d35507347efa2c475977625
25 DIST pynest2d-4.13_beta.tar.gz 18455 BLAKE2B 1c5cbc72d8557f6c8031ea6e5b7e0344c7315dacfe3bf96dc98cd5fc353574811100728f665a27d538c1a9dfb90dce8a7fca477be9f8b589c6174364cc072bfb SHA512 b1918efa18c8d3b641271803ada6fd9122e456181854bb7a62dc574673791ad5a294d239c79cfc4590cb1ef760d410fed5764e81e938df64f5646751746b1250
26 -DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
27
28 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
29 deleted file mode 100644
30 index 1fe895892de2..000000000000
31 --- a/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch
32 +++ /dev/null
33 @@ -1,11 +0,0 @@
34 ---- a/CMakeLists.txt
35 -+++ b/CMakeLists.txt
36 -@@ -17,7 +17,7 @@ find_package(Boost REQUIRED) # Dependency of libnest2d.
37 - 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.
38 -
39 - # Some build options.
40 --set(CMAKE_CXX_STANDARD 11)
41 -+set(CMAKE_CXX_STANDARD 14)
42 - if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
43 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
44 - endif()
45
46 diff --git a/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch b/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch
47 deleted file mode 100644
48 index c2c9452756fb..000000000000
49 --- a/dev-python/pynest2d/files/pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch
50 +++ /dev/null
51 @@ -1,24 +0,0 @@
52 -See https://github.com/Ultimaker/pynest2d/pull/3
53 ---- a/CMakeLists.txt
54 -+++ b/CMakeLists.txt
55 -@@ -10,11 +10,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
56 - find_package(PythonInterp 3.5 REQUIRED) # Dependency of SIP.
57 - find_package(PythonLibs 3.5 REQUIRED) # Dependency of SIP.
58 - find_package(SIP REQUIRED) # To create Python bindings.
59 --find_package(libnest2d REQUIRED) # The library we're creating bindings for.
60 --find_package(Clipper REQUIRED) # Dependency of libnest2d.
61 --find_package(NLopt REQUIRED) # Dependency of libnest2d.
62 --find_package(Boost REQUIRED) # Dependency of libnest2d.
63 --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.
64 -+find_package(Libnest2D REQUIRED) # The library we're creating bindings for.
65 -
66 - # Some build options.
67 - set(CMAKE_CXX_STANDARD 11)
68 -@@ -45,5 +41,5 @@ set(SIP_EXTRA_FILES_DEPEND
69 - )
70 -
71 - set(SIP_EXTRA_OPTIONS -g) # Always release the GIL before calling C++ methods.
72 --include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
73 --add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES} ${NLopt_LIBRARIES})
74 -+include_directories(src/ ${SIP_INCLUDE_DIRS})
75 -+add_sip_python_module(pynest2d src/Pynest2D.sip Libnest2D::libnest2d_headeronly)
76
77 diff --git a/dev-python/pynest2d/pynest2d-4.12.1.ebuild b/dev-python/pynest2d/pynest2d-4.12.1.ebuild
78 deleted file mode 100644
79 index f6c4eeb7065b..000000000000
80 --- a/dev-python/pynest2d/pynest2d-4.12.1.ebuild
81 +++ /dev/null
82 @@ -1,29 +0,0 @@
83 -# Copyright 1999-2022 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=8
87 -
88 -PYTHON_COMPAT=( python3_{8..10} )
89 -
90 -inherit cmake python-single-r1
91 -
92 -DESCRIPTION="Python bindings for libnest2d"
93 -HOMEPAGE="https://github.com/Ultimaker/pynest2d"
94 -SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
95 -
96 -LICENSE="LGPL-3"
97 -SLOT="0"
98 -KEYWORDS="amd64 ~arm64 ~x86"
99 -
100 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
101 -
102 -RDEPEND="${PYTHON_DEPS}
103 - dev-libs/libnest2d
104 - $(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_USEDEP}]')
105 - "
106 -
107 -DEPEND="${RDEPEND}"
108 -
109 -PATCHES=(
110 - "${FILESDIR}"/${PN}-4.12.1-required-flags-from-Libnest2D-target.patch
111 -)
112
113 diff --git a/dev-python/pynest2d/pynest2d-4.9.1.ebuild b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
114 deleted file mode 100644
115 index d7a3591a7c44..000000000000
116 --- a/dev-python/pynest2d/pynest2d-4.9.1.ebuild
117 +++ /dev/null
118 @@ -1,30 +0,0 @@
119 -# Copyright 1999-2021 Gentoo Authors
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=7
123 -
124 -PYTHON_COMPAT=( python3_{8..10} )
125 -
126 -inherit cmake python-single-r1
127 -
128 -DESCRIPTION="Python bindings for libnest2d"
129 -HOMEPAGE="https://github.com/Ultimaker/pynest2d"
130 -SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
131 -
132 -LICENSE="LGPL-3"
133 -SLOT="0"
134 -KEYWORDS="~amd64 ~arm64 ~x86"
135 -
136 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
137 -
138 -RDEPEND="${PYTHON_DEPS}
139 - dev-libs/libnest2d
140 - $(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_USEDEP}]')
141 - "
142 -
143 -DEPEND="${RDEPEND}"
144 -
145 -PATCHES=(
146 - "${FILESDIR}"/${PN}-4.8.0-required-flags-from-Libnest2D-target.patch
147 - "${FILESDIR}"/${PN}-4.8.0-fix-cpp-version.patch
148 -)