diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /sci-physics/reduze | |
parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) |
gentoo resync : 12.03.2021
Diffstat (limited to 'sci-physics/reduze')
-rw-r--r-- | sci-physics/reduze/Manifest | 7 | ||||
-rw-r--r-- | sci-physics/reduze/files/reduze-2.2-db.patch | 6 | ||||
-rw-r--r-- | sci-physics/reduze/files/reduze-2.4-cmake.patch | 81 | ||||
-rw-r--r-- | sci-physics/reduze/reduze-2.2.ebuild | 67 | ||||
-rw-r--r-- | sci-physics/reduze/reduze-2.4.ebuild | 58 |
5 files changed, 146 insertions, 73 deletions
diff --git a/sci-physics/reduze/Manifest b/sci-physics/reduze/Manifest index 64d5a9b439d9..4bf7fa9fa9b0 100644 --- a/sci-physics/reduze/Manifest +++ b/sci-physics/reduze/Manifest @@ -1,4 +1,5 @@ -AUX reduze-2.2-db.patch 815 BLAKE2B be6be6a6f84d63653dfcf04892421365d19ba53ea0e2ec8e81004d15bddb2df9d124601b780f2e02ec502a5734affb5a7dc88341931f83ef24c72c9d9811b245 SHA512 466414af3dcc00ba446b5790abf1eafbde622e9c4a744c2098e2dbd4bf4864656b2a1c3d9eb028c7889e6d9d998dbd3c7b5e64148375accee324466ae749f415 -DIST reduze-2.2.tar.gz 669858 BLAKE2B 52c48f5547055087dc2969fe5a7a42281519cf1d9a454a675ea54741f3d5912cd9b135816994241fa206585038d683ba5a3849308ff0403f1d3507ec9b77fe00 SHA512 ca4ed6f754fc75511b0916e8c2eea26a69e0e30c604a714af76995038a8e11dc3b129157bf1a170e639ea0fc39f9f5102bba4ad503874f044ac91855d9a95dab -EBUILD reduze-2.2.ebuild 1429 BLAKE2B becbc74d69a1b2ebb9127938475e206901fa951bb68d66ec67bcbd19d98d44cbcc92cf9bf0c0a7454806fbb07a56afc061ae24efe78d4853c72e27bfccd28106 SHA512 f33ec0ef4b50770b81f0ae43812c9965fb0dd4094e58af965d0b6abdef34e2c9c99adfd80c90c62a17c7b82b7aa7ea0db7b471ae3f235c6698cc7385c3189c8a +AUX reduze-2.2-db.patch 769 BLAKE2B ca63fda001317c010ebfe04a34276cf087971f8993cac2bdf2147c58fe2c91d1951ea347455eb4427468f7cab8ddb8aab43159c40ce633d06a9b9649f5814df1 SHA512 b558348d9895058fd4a1f4f1e4c536eca3cefc00fc392fe107ea609403704327cb2a70cdf53a53c7db618d0e6e63dc439e81a3c9d0ffb10df1d03814737b0ea1 +AUX reduze-2.4-cmake.patch 3026 BLAKE2B 534b17b84a4c4eb460877a011a3b1a276a75620c537907966b0f973b854000acd17323b9a7f762ed773a275e8617efec72ee145c0475d61b8902d76cee369fc2 SHA512 a896e86a99a285d86296140c574d28861e79c255a963b825edb7983cbdfc6504f60aed37b4ee149965df8a3dcdef18c192c3a97f09561876a9839f981dbc8e60 +DIST reduze-2.4.tar.gz 671780 BLAKE2B f401c9b50df0801b0b3305a8b77c3fd3f82b7f36419f4b76a28994c4db1f1a267dc40f91b42ee11ec5c911f6fab0a39eaf9f5cb2e099aa08e6489cea05760795 SHA512 06d5fbd371a4c5e88b6b77ddab5231438dae288c58122a6060e09c525deecf013b664a016d916b10e29373cefbc1f13af708a0a71a1f8da4204a63074424f6c1 +EBUILD reduze-2.4.ebuild 1226 BLAKE2B a2fc62f5ea65ca449eb0f890a20745e30433c5b92471cacb16ba0794317b915d627a7e7dc5e70a36463370ce9bb1902a906ff91ce369753bd1ae467af517745e SHA512 606779d1543f6d4aa86f20fedf7f3a56700ac6db30173ac78d24814fa772f25d98867c4ca9d5a35dad9756c290504b984072366836ec436d940f20cfd46ce23a MISC metadata.xml 364 BLAKE2B 7007e2d355688fc44ce145854bd64212bc14632a253c6fc8289eb777afb4abdb6b85ae2558465a59c3c83da71d17d4b058f641f7c650a2d593a3a63a42aa3e2e SHA512 2af1ad98025a28d4beb1081e81642f9a02c0139f94e76739c1a0b63a1fcd5aa6b6b34d39738361b14542252bee23189af24a43905409a6953ae369b40e4671ad diff --git a/sci-physics/reduze/files/reduze-2.2-db.patch b/sci-physics/reduze/files/reduze-2.2-db.patch index 671cd5565e0a..a43de911be7a 100644 --- a/sci-physics/reduze/files/reduze-2.2-db.patch +++ b/sci-physics/reduze/files/reduze-2.2-db.patch @@ -1,6 +1,6 @@ -diff -r -U2 reduze-2.2.orig/reduze/CMakeLists.txt reduze-2.2/reduze/CMakeLists.txt ---- reduze-2.2.orig/reduze/CMakeLists.txt 2017-11-17 14:11:58.000000000 +0700 -+++ reduze-2.2/reduze/CMakeLists.txt 2017-12-19 20:27:17.508528174 +0700 +diff -r -U2 a/reduze/CMakeLists.txt b/reduze/CMakeLists.txt +--- a/reduze/CMakeLists.txt 2017-11-17 14:11:58.000000000 +0700 ++++ b/reduze/CMakeLists.txt 2017-12-19 20:27:17.508528174 +0700 @@ -84,9 +84,8 @@ message (STATUS "Building with Berkeley DB support") find_path(DB_INCLUDE_PATH NAMES dbstl_common.h diff --git a/sci-physics/reduze/files/reduze-2.4-cmake.patch b/sci-physics/reduze/files/reduze-2.4-cmake.patch new file mode 100644 index 000000000000..d45af23374b5 --- /dev/null +++ b/sci-physics/reduze/files/reduze-2.4-cmake.patch @@ -0,0 +1,81 @@ +From a64b26c6e5c6c49e5842280a8690ec0d31832ce8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 7 Mar 2021 18:20:11 +0100 +Subject: [PATCH] Use GNUInstallDirs, add ENABLE_EXAMPLES option + +--- + CMakeLists.txt | 17 +++++++++++------ + reduze/CMakeLists.txt | 2 +- + tools/reduze1to2/CMakeLists.txt | 2 +- + 3 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6207bd..a0cab4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,11 +29,10 @@ + # - 'make package_source' creates the source tarball + # - 'make doc' creates the source code documentation using Doxygen + +-message (STATUS "Configuring package Reduze") +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 2.8.12) + + project (Reduze) +-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules") ++set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules") + include (GetGitRevisionDescription) + #git_describe_new (GIT_TAG) + git_describe(GIT_TAG) +@@ -76,6 +75,9 @@ if (NOT HAVE_TUTORIAL_PDF) + message (FATAL_ERROR "File ${TUTORIAL_PDF} not found") + endif (NOT HAVE_TUTORIAL_PDF) + ++include(GNUInstallDirs) ++ ++option (ENABLE_EXAMPLES "Install tools, examples" ON) + + # include configured file with git tag in source package + # NOTE1: make sure to build before pack (make; make package_source) ! +@@ -89,9 +91,12 @@ add_subdirectory ("reduze") + add_subdirectory ("tools/reduze1to2") + add_subdirectory ("check") + add_subdirectory ("doc/code") +-install (FILES "doc/tutorial/reduze2-tutorial.pdf" DESTINATION share/reduze/tutorial) +-install (FILES "tools/reduze-mma.m" DESTINATION share/reduze/tools) +-install (DIRECTORY "example" DESTINATION share/reduze PATTERN ".git" EXCLUDE) ++install (FILES "doc/tutorial/reduze2-tutorial.pdf" DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++ ++if (ENABLE_EXAMPLES) ++ install (FILES "tools/reduze-mma.m" DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) ++ install (DIRECTORY "example" DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples PATTERN ".git" EXCLUDE) ++endif () + + include (CPack) + +diff --git a/reduze/CMakeLists.txt b/reduze/CMakeLists.txt +index b296081..a76c307 100644 +--- a/reduze/CMakeLists.txt ++++ b/reduze/CMakeLists.txt +@@ -201,5 +201,5 @@ target_link_libraries (reduze yaml-cpp) + # installation + #------------------------------------------------------------------------------ + +-install (TARGETS reduze DESTINATION bin) ++install (TARGETS reduze DESTINATION ${CMAKE_INSTALL_BINDIR}) + +diff --git a/tools/reduze1to2/CMakeLists.txt b/tools/reduze1to2/CMakeLists.txt +index d1d4bd5..4822910 100644 +--- a/tools/reduze1to2/CMakeLists.txt ++++ b/tools/reduze1to2/CMakeLists.txt +@@ -9,6 +9,6 @@ add_executable (reduze1to2 ${reduze1to2_SOURCES}) + + set (CMAKE_CXX_FLAGS "-Wall -pedantic -Wno-long-long") + +-install (TARGETS reduze1to2 DESTINATION bin) ++install (TARGETS reduze1to2 DESTINATION ${CMAKE_INSTALL_BINDIR}) + + message (STATUS "Added build target 'reduze1to2'") +-- +2.30.1 + diff --git a/sci-physics/reduze/reduze-2.2.ebuild b/sci-physics/reduze/reduze-2.2.ebuild deleted file mode 100644 index 7e8241f3c736..000000000000 --- a/sci-physics/reduze/reduze-2.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Program for reducing Feynman integrals" -HOMEPAGE="http://reduze.hepforge.org/" -SRC_URI="http://reduze.hepforge.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="berkdb doc mpi" - -RDEPEND=">=sci-mathematics/ginac-1.4.1 - berkdb? ( sys-libs/db:6.0[cxx] ) - mpi? ( virtual/mpi )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -PATCHES=( "${FILESDIR}"/${P}-db.patch ) - -src_prepare() { - cmake-utils_src_prepare - # gentoo doc directory - sed -i \ - -e "s:share/reduze:share/doc/${PF}:g" \ - CMakeLists.txt || die - if ! use doc ; then - sed -i -e '/share/d' CMakeLists.txt || die - fi - # prefix fix - sed -i \ - -e "s:/usr:${EPREFIX}/usr:g" \ - reduze/CMakeLists.txt || die - - # remove bundled yaml-cpp - # no: it does not build. is it patched? - # sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_HASH_TABLE=ON - -DUSE_DATABASE=$(usex berkdb) - -DUSE_MPI=$(usex mpi) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usev doc) -} - -src_test() { - cmake-utils_src_compile check - use mpi && cmake-utils_src_compile check_mpi -} - -src_install() { - use doc && HTML_DOCS+=( "${BUILD_DIR}"/doc/code/html/. ) - cmake-utils_src_install -} diff --git a/sci-physics/reduze/reduze-2.4.ebuild b/sci-physics/reduze/reduze-2.4.ebuild new file mode 100644 index 000000000000..c7ea66e3ee54 --- /dev/null +++ b/sci-physics/reduze/reduze-2.4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Program for reducing Feynman integrals" +HOMEPAGE="https://reduze.hepforge.org/" +SRC_URI="https://reduze.hepforge.org/download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="berkdb doc examples mpi" + +RDEPEND=" + >=sci-mathematics/ginac-1.4.1 + berkdb? ( sys-libs/db:6.0[cxx] ) + mpi? ( virtual/mpi )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${PN}-2.2-db.patch +) + +# remove bundled yaml-cpp +# no: it does not build. is it patched? +# sed -i -e '/add_subdirectory ("yaml")/d' CMakeLists.txt || die + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks + -DUSE_HASH_TABLE=ON + -DUSE_DATABASE=$(usex berkdb) + -DENABLE_EXAMPLES=$(usex examples) + -DUSE_MPI=$(usex mpi) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usev doc) +} + +src_test() { + cmake_build check + use mpi && cmake_build check_mpi +} + +src_install() { + use doc && local HTML_DOCS+=( "${BUILD_DIR}"/doc/code/html/. ) + cmake_src_install +} |