From 1ee3cfd5ba6fc6501a1878a32dde832d9d931ae8 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Thu, 14 May 2020 10:38:14 +0200 Subject: [PATCH] media-gfx/cgal-ipelets: Cleanup and EAPI=7 CGAL seems to have added C++11 support so patch is removed. --- media-gfx/cgal-ipelets/Manifest | 3 +-- media-gfx/cgal-ipelets/cgal-ipelets-4.11.3.ebuild | 9 ++------- media-gfx/cgal-ipelets/files/c++11.patch | 11 ----------- 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 media-gfx/cgal-ipelets/files/c++11.patch diff --git a/media-gfx/cgal-ipelets/Manifest b/media-gfx/cgal-ipelets/Manifest index 8e5380b..fd5ee31 100644 --- a/media-gfx/cgal-ipelets/Manifest +++ b/media-gfx/cgal-ipelets/Manifest @@ -1,3 +1,2 @@ -AUX c++11.patch 487 BLAKE2B 560d96acf6a6ebb6e0579976ead90a1a2de6550f6dcba2a8d37f522b1bf0eeff8c6d7ae8d679c60eab679588d2b8c89192326d6c98a6579f479b750ffa215040 SHA512 5e611b87c7f57380cdbd6ab50dddc28b5c671f5a1701c9505b7d8fdbc9384faecfd19e54f184231852f9f6334dd99092679521fce01518d1c381021541e48b58 DIST cgal-4.11.3.tar.xz 14657412 BLAKE2B a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0 SHA512 44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e -EBUILD cgal-ipelets-4.11.3.ebuild 700 BLAKE2B dc77b7e2ae451163fc0845d150c6843a9741017484f68416edbdebc550087e7d178bd1dda82440266cec99aa8bc0a337ba5f863892ad0f488851f8acf2a4f0f0 SHA512 8367d016cdad4c2c6df1b4555eb892f0d13a09026edb1a2bf32cfece52f6076c61a01d262f5e2510999f9e931e43f9236669ede970dc2b53d2f711da23cc365a +EBUILD cgal-ipelets-4.11.3.ebuild 619 BLAKE2B 09fb9f8fbe8ca99dce9b71bec4d7742c76cedc70fb310611aa9c1694ee8da3c1159f07f5e82d23d25776e4f603b4bfc3ee88baf7ba083d92793fec88aca4fafe SHA512 cb1b411e64ed989241de015f31eff68c7673caa19301c776a22373ed5d864c11e3077e35a767b6bbbf1769244b30473a719c9cab08f3f7bde857d154259bc00e diff --git a/media-gfx/cgal-ipelets/cgal-ipelets-4.11.3.ebuild b/media-gfx/cgal-ipelets/cgal-ipelets-4.11.3.ebuild index dfabd43..656918d 100644 --- a/media-gfx/cgal-ipelets/cgal-ipelets-4.11.3.ebuild +++ b/media-gfx/cgal-ipelets/cgal-ipelets-4.11.3.ebuild @@ -1,11 +1,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 CMAKE_BUILD_TYPE=Release -inherit base multilib cmake-utils +inherit multilib cmake-utils MY_P=CGAL-${PV} @@ -26,8 +26,3 @@ DEPEND=" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}/demo/CGAL_ipelets" - -src_prepare() { - cmake-utils_src_prepare - epatch ${FILESDIR}/c++11.patch -} diff --git a/media-gfx/cgal-ipelets/files/c++11.patch b/media-gfx/cgal-ipelets/files/c++11.patch deleted file mode 100644 index 5e8f4f1..0000000 --- a/media-gfx/cgal-ipelets/files/c++11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- demo/CGAL_ipelets/CMakeLists.txt 2016-01-24 16:00:03.071470747 +0100 -+++ demo/CGAL_ipelets/CMakeLists.txt 2016-01-24 15:59:39.377947184 +0100 -@@ -118,6 +118,8 @@ if ( CGAL_FOUND ) - message(STATUS "Set Ipelets install dir: ${IPELET_INSTALL_DIR}") - endif() - -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -+ - foreach(IPELET ${CGAL_IPELETS}) - add_library(CGAL_${IPELET} MODULE ${IPELET}.cpp) - add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_${IPELET}) -- 2.30.2