commit: f2b2889067305d38cb8a00598c0c2d56d04f7f1c Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sun Jan 24 13:48:13 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 24 13:48:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b28890
dev-cpp/cpp-taskflow: Remove old Closes: https://github.com/gentoo/gentoo/pull/19174 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-cpp/cpp-taskflow/Manifest | 2 - dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild | 33 --------- dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild | 53 -------------- ...pp-taskflow-2.4.0-do_not_compile_examples.patch | 82 ---------------------- .../cpp-taskflow-2.4.0-fix_installation_path.patch | 22 ------ 5 files changed, 192 deletions(-) diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest index dc4673ee858..d9afaa56ca8 100644 --- a/dev-cpp/cpp-taskflow/Manifest +++ b/dev-cpp/cpp-taskflow/Manifest @@ -1,3 +1 @@ -DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f -DIST cpp-taskflow-2.6.0.tar.gz 68626469 BLAKE2B d85b1615be47c1e98e613e7875424892613205a0cc3f380f7d6fd0521045c5750441e9267382ec5282299e4074a7b85f442e53f38a2f12aff7d3d925a94b8773 SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133 DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild deleted file mode 100644 index b3df053c1da..00000000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="Modern C++ Parallel Task Programming" -HOMEPAGE="https://cpp-taskflow.github.io"; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND="" -DEPEND="" - -PATCHES=( - "${FILESDIR}"/${P}-do_not_compile_examples.patch - "${FILESDIR}"/${P}-fix_installation_path.patch -) - -HTML_DOCS=( docs/. ) - -src_install() { - cmake-utils_src_install - - if $(use doc); then - einstalldocs - fi -} diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild deleted file mode 100644 index aba4692adef..00000000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="Modern C++ Parallel Task Programming" -HOMEPAGE="https://cpp-taskflow.github.io"; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND="" -DEPEND="" - -S="${WORKDIR}/taskflow-${PV}" - -PATCHES=( -) - -HTML_DOCS=( docs/. ) - -src_prepare() { - default - - # fix library directoy - sed -i "s#/lib#/$(get_libdir)#g" CMakeLists.txt || die "sed failed" - - cmake-utils_src_prepare -} - -src_configure() { - # FIXME: enable CUDA and TESTS via use flag - local mycmakeargs=( - -DTF_BUILD_CUDA=OFF - -DTF_BUILD_TESTS=OFF - -DTF_BUILD_EXAMPLES=OFF - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if $(use doc); then - einstalldocs - fi -} diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch deleted file mode 100644 index 99f4658adfe..00000000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bf8ed3..190dabe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,76 +223,10 @@ target_include_directories(${PROJECT_NAME} INTERFACE - $<INSTALL_INTERFACE:include/> - ) - --# ----------------------------------------------------------------------------- --# Example program --# ----------------------------------------------------------------------------- -- --message(STATUS "Building examples ...") --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) -- --add_executable(simple ${TF_EXAMPLE_DIR}/simple.cpp) --target_link_libraries( -- simple ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(observer ${TF_EXAMPLE_DIR}/observer.cpp) --target_link_libraries( -- observer ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(subflow ${TF_EXAMPLE_DIR}/subflow.cpp) --target_link_libraries( -- subflow ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(condition ${TF_EXAMPLE_DIR}/condition.cpp) --target_link_libraries( -- condition ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(visualization ${TF_EXAMPLE_DIR}/visualization.cpp) --target_link_libraries( -- visualization ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(reduce ${TF_EXAMPLE_DIR}/reduce.cpp) --target_link_libraries( -- reduce ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(parallel_for ${TF_EXAMPLE_DIR}/parallel_for.cpp) --target_link_libraries( -- parallel_for ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(run ${TF_EXAMPLE_DIR}/run.cpp) --target_link_libraries( -- run ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(composition ${TF_EXAMPLE_DIR}/composition.cpp) --target_link_libraries( -- composition ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --#### CUDA examples --if(${TF_ENABLE_CUDA}) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}/cuda) -- --add_executable(saxpy ${TF_EXAMPLE_DIR}/cuda/saxpy.cu) --target_link_libraries( -- saxpy ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(device_property ${TF_EXAMPLE_DIR}/cuda/device_property.cu) --target_link_libraries( -- device_property ${PROJECT_NAME} Threads::Threads tf::default_settings --) --endif(${TF_ENABLE_CUDA}) -- - # ----------------------------------------------------------------------------- - # Unittest - # ----------------------------------------------------------------------------- -+ - enable_testing() - message(STATUS "Building unit tests ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR}) diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch deleted file mode 100644 index f68e572f5ab..00000000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 190dabe..6d613d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,7 @@ MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT}) - #_cmake_modify_IGNORE set(CMAKE_VERBOSE_MAKEFILE ON) - - # Project name --project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX) -+project(Cpp-Taskflow VERSION 2.4.0 LANGUAGES CXX) - - # build options - option(TF_ENABLE_CUDA "Enables build of cuda code" OFF) -@@ -748,7 +748,7 @@ write_basic_package_version_file( - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - -
