From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F373113835B for ; Sun, 7 Feb 2021 21:30:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37A00E08BF; Sun, 7 Feb 2021 21:30:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 147C2E08BF for ; Sun, 7 Feb 2021 21:30:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECA1733BEAC for ; Sun, 7 Feb 2021 21:30:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D5D24C0 for ; Sun, 7 Feb 2021 21:30:49 +0000 (UTC) From: "Dennis Lamm" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Lamm" Message-ID: <1612733442.99cc07357a435b95ba665fa7e935111464bc64bf.expeditioneer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/curaengine/, media-gfx/curaengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/curaengine/Manifest media-gfx/curaengine/curaengine-4.7.0.ebuild media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch X-VCS-Directories: media-gfx/curaengine/ media-gfx/curaengine/files/ X-VCS-Committer: expeditioneer X-VCS-Committer-Name: Dennis Lamm X-VCS-Revision: 99cc07357a435b95ba665fa7e935111464bc64bf X-VCS-Branch: master Date: Sun, 7 Feb 2021 21:30:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 211693ba-20bc-46d3-a576-dc48377d8508 X-Archives-Hash: f27dc3acdf20bd58f07e3e5f5347a286 commit: 99cc07357a435b95ba665fa7e935111464bc64bf Author: Dennis Lamm gentoo org> AuthorDate: Sun Feb 7 18:51:30 2021 +0000 Commit: Dennis Lamm gentoo org> CommitDate: Sun Feb 7 21:30:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99cc0735 media-gfx/curaengine: drop old Signed-off-by: Dennis Lamm gentoo.org> media-gfx/curaengine/Manifest | 1 - media-gfx/curaengine/curaengine-4.7.0.ebuild | 86 ---------------------- .../files/curaengine-4.7.0-fix-tests.patch | 13 ---- 3 files changed, 100 deletions(-) diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest index 253c8d29ee4..ac812d6972c 100644 --- a/media-gfx/curaengine/Manifest +++ b/media-gfx/curaengine/Manifest @@ -1,2 +1 @@ -DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3 DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670 diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild deleted file mode 100644 index 74a7ec34474..00000000000 --- a/media-gfx/curaengine/curaengine-4.7.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -MY_PN="CuraEngine" - -DESCRIPTION="A 3D model slicing engine for 3D printing" -HOMEPAGE="https://github.com/Ultimaker/CuraEngine" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+arcus doc openmp test" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - arcus? ( - ~dev-libs/libarcus-${PV}:* - dev-libs/protobuf:= - ) - dev-libs/clipper - dev-libs/rapidjson - dev-libs/stb" - -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" -BDEPEND="doc? ( app-doc/doxygen )" - -DOCS=( README.md ) -PATCHES=( "${FILESDIR}/${PN}-4.7.0-fix-tests.patch" ) -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - rm -r "${S}"/libs || die - - # remove static linking - # respect cflags - sed -i \ - -e "s/-static-libstdc++//g" \ - -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \ - -e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \ - CMakeLists.txt || die - - if use test; then - find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \ - -type f -name '*.cpp' | xargs sed -i \ - -e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\ - -e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \ - -e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\ - -e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\ - -e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\ - -e 's <../src/utils/string.h> "../../src/utils/string.h" g' \ - -e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \ - -e 's#include "../src#include "../../src#g'|| die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test ON OFF) - -DENABLE_ARCUS=$(usex arcus ON OFF) - -DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF - -DENABLE_OPENMP=$(usex openmp ON OFF) - -DUSE_SYSTEM_LIBS=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - doxygen || die "generating docs failed" - mv docs/html . || die - find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die - HTML_DOCS=( html/. ) - fi -} diff --git a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch deleted file mode 100644 index 33feab3d394..00000000000 --- a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream issue: https://github.com/Ultimaker/CuraEngine/issues/1318 - ---- a/tests/utils/SparseGridTest.cpp -+++ b/tests/utils/SparseGridTest.cpp -@@ -1,6 +1,7 @@ - //Copyright (c) 2019 Ultimaker B.V. - //CuraEngine is released under the terms of the AGPLv3 or higher. - -+#include - #include - #include - #include -