From f635a60b5dea7e49794ad43fcd010e97736c8536 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 3 May 2022 21:49:52 +0200 Subject: [PATCH] sci-mathematics/clasp: add 3.3.8, drop 3.3.7 Signed-off-by: Alessandro Barbieri --- sci-mathematics/clasp/Manifest | 2 +- ...{clasp-3.3.7.ebuild => clasp-3.3.8.ebuild} | 4 --- .../files/clasp-3.3.7-find-Potassco.patch | 11 -------- .../files/clasp-3.3.7-libclasp_app.patch | 28 ------------------- 4 files changed, 1 insertion(+), 44 deletions(-) rename sci-mathematics/clasp/{clasp-3.3.7.ebuild => clasp-3.3.8.ebuild} (91%) delete mode 100644 sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch delete mode 100644 sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch diff --git a/sci-mathematics/clasp/Manifest b/sci-mathematics/clasp/Manifest index 0aae4bccec..3b8e3bb612 100644 --- a/sci-mathematics/clasp/Manifest +++ b/sci-mathematics/clasp/Manifest @@ -1 +1 @@ -DIST clasp-3.3.7.tar.gz 628370 BLAKE2B 48519646055ceb7f122d2efc8745f5bc7a444d6b90e0506edde139cccb8efb9d81391d8c8bc6fab654b1c652c986676e34f9e66797fb13d12b9eb8a82da847a4 SHA512 1615224838eb31b90ea9b9daaf192a059833db7dec90567c063c73cc33d7cf2ba7de49960c090c0522794b29fb2ca85c091f23e8a8402f7ff0ca99d6973e4fc7 +DIST clasp-3.3.8.tar.gz 677825 BLAKE2B 2b4e6b14d9d2a964477b70a387e7fe91d8f28c3e8e2e4cb800fae51459d5168be1c5384e4464ce24c79bc2f494ea9e48a0318f0a7eb77712a4ebd80b18bf1ab9 SHA512 a30269c1f0b5f118df56f3e9ec00bff6fc1896cc4e1c4bfe47242756040a0a520d4329af288f34468c59ae43f7af16fd4f318d533da46301836c4319466091b6 diff --git a/sci-mathematics/clasp/clasp-3.3.7.ebuild b/sci-mathematics/clasp/clasp-3.3.8.ebuild similarity index 91% rename from sci-mathematics/clasp/clasp-3.3.7.ebuild rename to sci-mathematics/clasp/clasp-3.3.8.ebuild index d4690201cf..a9aa8e7e44 100644 --- a/sci-mathematics/clasp/clasp-3.3.7.ebuild +++ b/sci-mathematics/clasp/clasp-3.3.8.ebuild @@ -24,10 +24,6 @@ DEPEND=" " RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}/${P}-find-Potassco.patch" - "${FILESDIR}/${P}-libclasp_app.patch" -) src_prepare() { rm tests/catch.hpp || die diff --git a/sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch b/sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch deleted file mode 100644 index 1a59a199cd..0000000000 --- a/sci-mathematics/clasp/files/clasp-3.3.7-find-Potassco.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -98,7 +98,7 @@ - - # Check for or build external dependency - if (NOT CLASP_USE_LOCAL_LIB_POTASSCO) -- find_package(potassco 1.0 REQUIRED CONFIG) -+ find_package(Potassco 1.0 REQUIRED CONFIG) - else() - if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libpotassco/CMakeLists.txt) - message(STATUS "Potassco is not installed - fetching submodule") diff --git a/sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch b/sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch deleted file mode 100644 index f8138010b5..0000000000 --- a/sci-mathematics/clasp/files/clasp-3.3.7-libclasp_app.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff '--color=auto' -ru /var/tmp/portage/sci-mathematics/clasp-3.3.7/work/clasp-3.3.7/app/CMakeLists.txt clasp-3.3.7/app/CMakeLists.txt ---- /var/tmp/portage/sci-mathematics/clasp-3.3.7/work/clasp-3.3.7/app/CMakeLists.txt 2022-04-28 06:43:26.295108990 +0200 -+++ clasp-3.3.7/app/CMakeLists.txt 2022-04-28 07:03:05.488454553 +0200 -@@ -1,8 +1,8 @@ --set(files -- clasp_app.cpp -- clasp_app.h -- main.cpp) --add_executable(clasp ${files}) -+add_library(clasp_app SHARED clasp_app.cpp) -+set(clasp_app_header clasp_app.h) -+add_executable(clasp main.cpp) -+target_include_directories(clasp_app PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -+target_include_directories(clasp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - set_target_properties(clasp PROPERTIES FOLDER exe) - if (NOT CMAKE_INSTALL_BINDIR) - message(STATUS "BINDIR not set - using bin") -@@ -19,6 +19,9 @@ - endif() - target_link_libraries(clasp "-static") - endif() --target_link_libraries(clasp libclasp) -+target_link_libraries(clasp_app libclasp) -+target_link_libraries(clasp clasp_app) - - install(TARGETS clasp EXPORT clasp DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS clasp_app EXPORT clasp_app DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES ${clasp_app_header} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clasp/app)