gentoo resync : 20.03.2022

4 files changed, 96 insertions, 0 deletions

diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index 4af3e3207fbd..8ef52bd080e6 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,5 +1,10 @@
+AUX pynest2d-4.12.1-required-flags-from-Libnest2D-target.patch 1245 BLAKE2B 2425aad2a72d94dc7e4b39a2ed61ec5bcdfc5e9921a4aab3faa9b51d9b1d270350092d325086cfff754d7d026de6f01ecbb95f7accd836f7ac0866241df2c7cb SHA512 16754083200599ffbd84d08dd7f86a3405c50f5b26ca593d6805715a09d642e613f159861b05a5a1fae219f385ca73c87bffecb0475e066cdcadc3fdc8698add
 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.12.1.tar.gz 18448 BLAKE2B 5432d7acfe600afd32a0fb4543728eed351dea442ff23c9397182919f43015c4aed530aa7ec5b59c75d6373ea6ed122262d7018eb12cdd1b4586bf3ec960586b SHA512 0494efbc0ad6379fde4bdf9cdfe902cb4cbce30129771d34e01661b58ee38d6256910e10184c121de3b2d7139e6dbfee5b4e039d7d35507347efa2c475977625
+DIST pynest2d-4.13_beta.tar.gz 18455 BLAKE2B 1c5cbc72d8557f6c8031ea6e5b7e0344c7315dacfe3bf96dc98cd5fc353574811100728f665a27d538c1a9dfb90dce8a7fca477be9f8b589c6174364cc072bfb SHA512 b1918efa18c8d3b641271803ada6fd9122e456181854bb7a62dc574673791ad5a294d239c79cfc4590cb1ef760d410fed5764e81e938df64f5646751746b1250
 DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
+EBUILD pynest2d-4.12.1.ebuild 664 BLAKE2B b1c79da2848f7c4d79aa39c3f7ab4cb1ee16fb4a2b0b150a8784ecb6efd35c5610f4873ea5fdda8815344f59605c925a55b0387404eea0f97435efb3a0206d00 SHA512 7e172c21eeadc274b9e1cfcefab381bffad7dd23c891a1304b635c6c176844a10c056134ab900bd268ad97c6ab97fea3c913b2ad95a7bc51ca27a0e0af5530e9
+EBUILD pynest2d-4.13_beta.ebuild 820 BLAKE2B ea62b71e1542a29ec585087376c289c7ef4e5346bf2a3ecaf05e996d77e645df083025719d1ad96d22831f45db165a117ddd1e535e16e3fa526c5c91b40889e7 SHA512 d7661c3048f6c1643e81ca302fb98cbe1eb821840f83ba3f8eb03b3be0baec9ded5049e3718ce2490f48325991f9dda973cf47f167bcf41dba5d79482eb79529
 EBUILD pynest2d-4.9.1.ebuild 713 BLAKE2B 45811d912c37008a210f1b5bd6d4b2c43214c30c57698d6ad8409b5c98785221194b606b9103246bbbb62b3672c83ca1a02d3d16ecaaac71ad03b2ca29958ca0 SHA512 22af425ddf9f79c1ec2307a877e6fcdf15ca734ca8ee917dbfa45e75f1dc14f88eb1943a8e6f3196fd77466210f862f29148e413fb530b10cfc5abc11301538e
 MISC metadata.xml 410 BLAKE2B ca450f3ba075ee6d2fd14a913b4ca7490b1be6181cb5354fc4dfc05ba6813630c38eec71342fe3b7108ee20a16ea3902d72833d697f6816add8ecb498271ba23 SHA512 95519c23b3d8783c70a770ead0dca24c6afb917a864d15cf712f99a8303c5917020f1eb0d227df8782d163cf1bd09bba5b9e2a0de6bff0c5613b82b370746c6d
diff --git a/dev-python/pynest2d/files/pynest2d-4.12.1-required-flags-from-Libnest2D-target.patch b/dev-python/pynest2d/files/pynest2d-4.12.1-required-flags-from-Libnest2D-target.patch
new file mode 100644
index 000000000000..ff4482d197bf
--- /dev/null
+++ b/dev-python/pynest2d/files/pynest2d-4.12.1-required-flags-from-Libnest2D-target.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,11 +21,7 @@
+ endif()
+ 
+ find_package(SIP REQUIRED)  # To create Python bindings.
+-find_package(libnest2d REQUIRED)  # The library we're creating bindings for.
+-find_package(Clipper REQUIRED)  # Dependency of libnest2d.
+-find_package(NLopt REQUIRED)  # Dependency of libnest2d.
+-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.
++find_package(Libnest2D REQUIRED)  # The library we're creating bindings for.
+ 
+ # Some build options.
+ set(CMAKE_CXX_STANDARD 17)
+@@ -56,5 +52,5 @@
+ )
+ 
+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip)  # Always release the GIL before calling C++ methods. -n PyQt5.sip is required to not get the PyCapsule error
+-include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
+-add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES} ${NLopt_LIBRARIES})
++include_directories(src/ ${SIP_INCLUDE_DIRS})
++add_sip_python_module(pynest2d src/Pynest2D.sip Libnest2D::libnest2d_headeronly)
diff --git a/dev-python/pynest2d/pynest2d-4.12.1.ebuild b/dev-python/pynest2d/pynest2d-4.12.1.ebuild
new file mode 100644
index 000000000000..f6c4eeb7065b
--- /dev/null
+++ b/dev-python/pynest2d/pynest2d-4.12.1.ebuild
@@ -0,0 +1,29 @@
+# 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 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-5[${PYTHON_USEDEP}]')
+	"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.1-required-flags-from-Libnest2D-target.patch
+)
diff --git a/dev-python/pynest2d/pynest2d-4.13_beta.ebuild b/dev-python/pynest2d/pynest2d-4.13_beta.ebuild
new file mode 100644
index 000000000000..363744e35591
--- /dev/null
+++ b/dev-python/pynest2d/pynest2d-4.13_beta.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 2 -)
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Python bindings for libnest2d"
+HOMEPAGE="https://github.com/Ultimaker/pynest2d"
+SRC_URI="https://github.com/Ultimaker/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+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-5[${PYTHON_USEDEP}]')
+	"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.1-required-flags-from-Libnest2D-target.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}