diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-19 19:49:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-19 19:49:08 +0000 |
commit | f287ecad888abdeb38e617d0485de282cd6819db (patch) | |
tree | 874d56500040734c4dbb9e437e0d5ed80a0a1886 /sci-mathematics | |
parent | 844ae757702c53a56ee57056873a8204d256d47e (diff) |
gentoo auto-resync : 19:12:2022 - 19:49:08
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/Manifest.gz | bin | 16865 -> 16877 bytes | |||
-rw-r--r-- | sci-mathematics/cgal/Manifest | 8 | ||||
-rw-r--r-- | sci-mathematics/cgal/cgal-5.2-r2.ebuild | 77 | ||||
-rw-r--r-- | sci-mathematics/cgal/cgal-5.4.1.ebuild | 77 | ||||
-rw-r--r-- | sci-mathematics/cgal/metadata.xml | 5 | ||||
-rw-r--r-- | sci-mathematics/flint/Manifest | 3 | ||||
-rw-r--r-- | sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch | 146 | ||||
-rw-r--r-- | sci-mathematics/flint/flint-2.7.1-r1.ebuild | 70 | ||||
-rw-r--r-- | sci-mathematics/yacas/Manifest | 6 | ||||
-rw-r--r-- | sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch | 26 | ||||
-rw-r--r-- | sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch | 219 | ||||
-rw-r--r-- | sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch | 112 | ||||
-rw-r--r-- | sci-mathematics/yacas/yacas-1.7.0-r1.ebuild | 59 |
13 files changed, 1 insertions, 807 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz Binary files differindex c1c620364c1c..7fd4bce995e7 100644 --- a/sci-mathematics/Manifest.gz +++ b/sci-mathematics/Manifest.gz diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest index 041dfbf45669..8c4906d84cd5 100644 --- a/sci-mathematics/cgal/Manifest +++ b/sci-mathematics/cgal/Manifest @@ -1,11 +1,5 @@ AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad -DIST CGAL-5.2-doc_html.tar.xz 51123300 BLAKE2B 748b94d199343402baf6aef298b352fc23b9b01995adbe2d5157d8a4d3d772f4e029f0f0ac5282cdb387e5e7b9191082154840e32cd503c97f56295a59419cf4 SHA512 4ffaa9b36c20e62a62bd77fb79d9d9d54cf2b20a1542aa1bef9f6d27f6d7c1412a5f843968ae400d42e8d4bc8ae1d7a16c197503d0fd43fc72592d73213c5c72 -DIST CGAL-5.2.tar.xz 23250240 BLAKE2B eb80a81dd01b2b2e30fe72f45cceee0861b36f47e395d1c905f8551e23d57c36dd9a7c66e32f6c2a0a2cfbd4c780fd5d5ae098709bfc1072e7ac7f761d328fd3 SHA512 8dddec18bd7e375ea3b18c636ddb2ca4f3a318e177305058f702206b830e2605837024e4b1265789f1bdc46dda80133d6fa8d61a036cda3c93a227f4c244cc1a -DIST CGAL-5.4.1-doc_html.tar.xz 50436088 BLAKE2B 9f293349f054094ecdce7a04ca1f276c56e824b4c9edd7ef82b9c450e3bde5ae26c9e6d06c5feea370c345d2b419cd426427ce34f329ea9a88ad5fa5931a0446 SHA512 5167a0fb0e390ab72c7d6106bc7d34e4a6c927f9634b02f71b675f8456d17cdcbc4a5d944c5ebf5ba1d6b635f469ee474c484913b768bff8a7c8ba52669373e8 -DIST CGAL-5.4.1.tar.xz 24110884 BLAKE2B 2d01404333fdaa00d66028decbaa522d6767290e2f5be5c2b7d0323d16b9b44cd00fe58fb7d20cb02b2731893bc251bcdd4de7013107bc1d4c086e999bbf240d SHA512 751871952173c31b356284e12f3cd0840863dad51c8dad5eb8894f8285470d0e23b6b09d97d60c4ffe6eb93b14ff141a18e381eab07ea29cb48923e90f9b657b DIST CGAL-5.5-doc_html.tar.xz 53145672 BLAKE2B 7a575f09eed2fd97f3e68f37428d4ab41c267a6e4c158e653a8c2b5a17f2c56a31b64937fa161d3f256b473a1e617acbce2f3bfb71c2e810b8b0335b57a8b54c SHA512 41e16b44b93664ddd5185358165cce99f149fa33bdb308ce7230550ee79e3603c24df5b8d4f67de324ebf7e8a8c1e343e6d76341464cedd9d9af50f5d512af3b DIST CGAL-5.5.tar.xz 24156768 BLAKE2B e5f02cd082abfa8443e65430ed366cfdc3736c6a7af37284969ddd558ede1aa6c881d6928c65708504fd58f68ea01f56aa0749267d6dc83fd54f0b28e8c01374 SHA512 7fa6bf6c046727a9e0bce7cbde34cbe85979127a1ad0904f2865be83a80e89fa9af5118e5647572414f8096d29ecc808ee471d4bd3e7ecd41338be649b549290 -EBUILD cgal-5.2-r2.ebuild 1662 BLAKE2B a9b0ec72848616b2240e0c99b4237e0b451fe756e7c30f884d01e81ba2da45ab72a4bbce66caf44c2282dbf74285fbdc0459d239c8f9b8ba440a5d5e5d12fa6b SHA512 511271b99579a90906356b82c16a97e0652432c8c97987d0c2ff519702862693969c19b4c0e22cbea424d4377a8105b3db3852b4ebcca181d4f7ed64d6562d19 -EBUILD cgal-5.4.1.ebuild 1685 BLAKE2B 66e3698adbeb74179fd2e1f0bfa28affd46cfba76c4b17e7426604bff5cbc1358b01684491044b15d4f2c08277a87b5db13a43f45de73eb4c3a46f852c5a9cae SHA512 996a19e309b923452cf6be94d3214b9592984db7531ab0e74f1ca988c045499adfa495bb50549384efbb979431b6e7e378b4c846684466b6904133a386bc21f3 EBUILD cgal-5.5.ebuild 1229 BLAKE2B 5c810e807f9d28c9f7fb27c2724ae6af784a7d18ac910ff24773868252b7bbe9a7cf05fb9f6dc5cdb24088349657aacc33f8116d7e7ef04323f334aa2fe7d70e SHA512 35e0cd4f6baf57f8d4b02d8bdc19490cc7c5844bdb0575158d30ef43b4faa5123d64ce8047adef4805b77d83bd43885259aae237300e181ad2e028a09d39697e -MISC metadata.xml 1373 BLAKE2B 7e3ecb8f36476edb32f20a03775f01f916fa82ab2c7a6e0554066a4b47019d3a13350e442ba4f9e6f184eb7678707a683339f223d5c86e18c08e9de5b359218c SHA512 a99c724624e7cdd71c65424adef18966dc6a88bd8e56e38fa5ba0ad4c40010481548d6d7f3e51044f62597096fdbf9e52a361d3c71d0ab870753526df664f7d2 +MISC metadata.xml 1118 BLAKE2B ed180a3128a37bc151ce89a0edcc076b09449a43e9ce7633ac0c0343b20cdd585cf6b68dc92262730d8379b4eb0d4b26feba90327384f2e4546fba27336d96ca SHA512 c407490521df2908343dbc870684938dfe71e5f4a072f016361db9f08ebb598540c69a704ce97cf803b4e23846a18c259fc208f286f0d11d8acbadd32182142c diff --git a/sci-mathematics/cgal/cgal-5.2-r2.ebuild b/sci-mathematics/cgal/cgal-5.2-r2.ebuild deleted file mode 100644 index 50ee161a8143..000000000000 --- a/sci-mathematics/cgal/cgal-5.2-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_P=CGAL-${PV} -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="https://www.cgal.org/" -SRC_URI=" - https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz - doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3 GPL-3 Boost-1.0" -SLOT="0/14" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples +gmp mpfi ntl qt5" - -RDEPEND=" - dev-cpp/eigen - dev-libs/boost:= - dev-libs/mpfr:= - sys-libs/zlib - x11-libs/libX11:= - virtual/glu:= - virtual/opengl:= - gmp? ( dev-libs/gmp:=[cxx(+)] ) - mpfi? ( sci-libs/mpfi ) - ntl? ( dev-libs/ntl:= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch ) - -src_prepare() { - cmake_src_prepare - # modules provided by dev-cpp/eigen - rm cmake/modules/FindEigen3.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)" - -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL" - -DCGAL_HEADER_ONLY=OFF - -DWITH_LEDA=OFF - -DWITH_Eigen3=ON - -DWITH_ZLIB=ON - -DWITH_GMP=$(usex gmp) - -DWITH_GMPXX=$(usex gmp) - -DWITH_MPFI=$(usex mpfi) - -DWITH_NTL=$(usex ntl) - -DWITH_CGAL_Qt5=$(usex qt5) - ) - cmake_src_configure -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. ) - cmake_src_install - if use examples; then - dodoc -r examples demo - fi -} diff --git a/sci-mathematics/cgal/cgal-5.4.1.ebuild b/sci-mathematics/cgal/cgal-5.4.1.ebuild deleted file mode 100644 index b9662c1241e3..000000000000 --- a/sci-mathematics/cgal/cgal-5.4.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -MY_P=CGAL-${PV} -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="https://www.cgal.org/" -SRC_URI=" - https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz - doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3 GPL-3 Boost-1.0" -SLOT="0/14" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples +gmp mpfi ntl qt5 +shared" - -RDEPEND=" - dev-cpp/eigen - dev-libs/boost:= - dev-libs/mpfr:= - sys-libs/zlib - x11-libs/libX11:= - virtual/glu:= - virtual/opengl:= - gmp? ( dev-libs/gmp:=[cxx] ) - mpfi? ( sci-libs/mpfi ) - ntl? ( dev-libs/ntl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch ) - -src_prepare() { - cmake_src_prepare - # modules provided by dev-cpp/eigen - rm cmake/modules/FindEigen3.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)" - -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL" - -DCGAL_HEADER_ONLY=$(usex shared OFF ON) - -DWITH_LEDA=OFF - -DWITH_Eigen3=ON - -DWITH_ZLIB=ON - -DWITH_GMP=$(usex gmp) - -DWITH_GMPXX=$(usex gmp) - -DWITH_MPFI=$(usex mpfi) - -DWITH_NTL=$(usex ntl) - -DWITH_CGAL_Qt5=$(usex qt5) - ) - cmake_src_configure -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. ) - cmake_src_install - if use examples; then - dodoc -r examples demo - fi -} diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml index eb12c835ba04..b0571510639e 100644 --- a/sci-mathematics/cgal/metadata.xml +++ b/sci-mathematics/cgal/metadata.xml @@ -18,11 +18,6 @@ * the Support Library which offers interfaces to other packages, e.g., for visualisation, and I/O, and other support facilities. </longdescription> - <use> - <flag name="mpfi">Enable support for multiple recision interval arithmetic via <pkg>sci-libs/mpfi</pkg></flag> - <flag name="ntl">Enable support for <pkg>dev-libs/ntl</pkg></flag> - <flag name="shared">Build shared library</flag> - </use> <upstream> <remote-id type="github">CGAL/cgal</remote-id> </upstream> diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest index 631d6837879b..da7eead7ab92 100644 --- a/sci-mathematics/flint/Manifest +++ b/sci-mathematics/flint/Manifest @@ -1,9 +1,6 @@ -AUX flint-2.7.1-fix-cmake-findgmp.patch 5721 BLAKE2B db31d9e88304ec26a3fdd4ba9d53dd97044487413567e172235260fc238e6a4ad89225788726bdff94f36b699acda45c86025c23be04b895c1857d836a321113 SHA512 a364c4606fb9321443991d1356f9fb7b2c7fb946ad46760e6e1b1172acc1399f19fabd1eec4dbf8e75e1e61be5d8bfa88ac056ccff47d60f4d50fdff6e31193b -DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804 DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d SHA512 849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba -EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e EBUILD flint-2.8.4.ebuild 1527 BLAKE2B c74158618cb85471fda7e7a26b438f0d68ade93f0633ed34c65424488bb1b14b13dd7639ea599531099d87fb631474c26103d0c3e87233a589bb432c4c504399 SHA512 453b1404a1a99c8681d061b5373f50fb469122e45a1dd5c91be264f7714c8aeb5ffdca9c0d5e88d9c0c884c953b08ac094c680c012187f1bdece23f890514c87 EBUILD flint-2.8.5.ebuild 1646 BLAKE2B 5b3d7c1b59f785be7edc541b780ed8993a1b06746f0b3b779173586bad765a396739087375cc4ce3df712afd8c94b2e5d86c4b32650c5ceead998a3817a7e186 SHA512 aa1e0e6ca27a895d8d5cba76fed384c2914cd5c2ef4d89120c728dfcfb6a7f50dc7a93685fcf442983bce25143fdc3cab346ece094cb37927abf0a0dcbf99356 EBUILD flint-2.9.0.ebuild 1651 BLAKE2B 7cfaf9118887855e4fb91175ac52ddb2b51ed4635253e509eb88ee976f6f593adc81b58cb09afb0091410f6519f751d3c4fc7080d285456fdf9b63b682898ca7 SHA512 1169f1eb9d016d18cc0e1e490d97607836fc7b88e790f19857b29921fea6adff9e4b1782f447a7819c5eb6ab9514163f512d3095458f7240946b0f50844df844 diff --git a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch b/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch deleted file mode 100644 index ca6e56ce1970..000000000000 --- a/sci-mathematics/flint/files/flint-2.7.1-fix-cmake-findgmp.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 41c4a0869d68d894cbe74a63612df75fd1e93bdf Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Mon, 19 Apr 2021 16:56:54 -0400 -Subject: [PATCH 1/1] CMake/FindGMP.cmake: compile a test program to check the - gmp version. - -The existing GMP version check consists of grepping the contents of -the gmp.h header to parse out a few constants. This test fails, at -least, on Gentoo, where the usual header file is a wrapper that -includes the true header to allow for simultaneous 32/64-bit -support. - -This commit updates FindGMP to compile a test program against gmp.h -that compares version constants using the C preprocessor. If GMP is -too old, the test program will fail to compile and CMake will know. ---- - CMake/FindGMP.cmake | 91 +++++++++++++++++++++++---------------------- - 1 file changed, 47 insertions(+), 44 deletions(-) - -diff --git a/CMake/FindGMP.cmake b/CMake/FindGMP.cmake -index ce4df70f5..951151274 100644 ---- a/CMake/FindGMP.cmake -+++ b/CMake/FindGMP.cmake -@@ -2,28 +2,23 @@ - # https://gmplib.org/ - # - # This module supports requiring a minimum version, e.g. you can do --# find_package(GMP 6.0.0) --# to require version 6.0.0 to newer of GMP. -+# find_package(GMP 6.2.1) -+# to require version 6.2.1 to newer of GMP. - # - # Once done this will define - # - # GMP_FOUND - system has GMP lib with correct version - # GMP_INCLUDE_DIRS - the GMP include directory - # GMP_LIBRARIES - the GMP library --# GMP_VERSION - GMP version - # --# Copyright (c) 2016 Jack Poulson, <jack.poulson@gmail.com> --# Redistribution and use is allowed according to the terms of the BSD license. - --find_path(GMP_INCLUDE_DIRS NAMES gmp.h PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR}) -- --# Set GMP_FIND_VERSION to 5.1.0 if no minimum version is specified -+# Set GMP_FIND_VERSION to 6.0.0 if no minimum version is specified - if(NOT GMP_FIND_VERSION) - if(NOT GMP_FIND_VERSION_MAJOR) -- set(GMP_FIND_VERSION_MAJOR 5) -+ set(GMP_FIND_VERSION_MAJOR 6) - endif() - if(NOT GMP_FIND_VERSION_MINOR) -- set(GMP_FIND_VERSION_MINOR 1) -+ set(GMP_FIND_VERSION_MINOR 0) - endif() - if(NOT GMP_FIND_VERSION_PATCH) - set(GMP_FIND_VERSION_PATCH 0) -@@ -32,43 +27,51 @@ if(NOT GMP_FIND_VERSION) - "${GMP_FIND_VERSION_MAJOR}.${GMP_FIND_VERSION_MINOR}.${GMP_FIND_VERSION_PATCH}") - endif() - --if(GMP_INCLUDE_DIRS) -- # Since the GMP version macros may be in a file included by gmp.h of the form -- # gmp-.*[_]?.*.h (e.g., gmp-x86_64.h), we search each of them. -- file(GLOB GMP_HEADERS "${GMP_INCLUDE_DIRS}/gmp.h" "${GMP_INCLUDE_DIRS}/gmp-*.h" -- "${GMP_INCLUDE_DIRS}/x86*/gmp.h") -- foreach(gmp_header_filename ${GMP_HEADERS}) -- file(READ "${gmp_header_filename}" _gmp_version_header) -- string(REGEX MATCH -- "define[ \t]+__GNU_MP_VERSION[ \t]+([0-9]+)" _gmp_major_version_match -- "${_gmp_version_header}") -- if(_gmp_major_version_match) -- set(GMP_MAJOR_VERSION "${CMAKE_MATCH_1}") -- string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_MINOR[ \t]+([0-9]+)" -- _gmp_minor_version_match "${_gmp_version_header}") -- set(GMP_MINOR_VERSION "${CMAKE_MATCH_1}") -- string(REGEX MATCH "define[ \t]+__GNU_MP_VERSION_PATCHLEVEL[ \t]+([0-9]+)" -- _gmp_patchlevel_version_match "${_gmp_version_header}") -- set(GMP_PATCHLEVEL_VERSION "${CMAKE_MATCH_1}") -- set(GMP_VERSION -- ${GMP_MAJOR_VERSION}.${GMP_MINOR_VERSION}.${GMP_PATCHLEVEL_VERSION}) -- endif() -- endforeach() -+find_path(GMP_INCLUDE_DIRS -+ NAMES gmp.h -+ PATHS $ENV{GMPDIR} ${INCLUDE_INSTALL_DIR}) - -- # Check whether found version exists and exceeds the minimum requirement -- if(NOT GMP_VERSION) -- set(GMP_VERSION_OK FALSE) -- message(STATUS "GMP version was not detected") -- elseif(${GMP_VERSION} VERSION_LESS ${GMP_FIND_VERSION}) -- set(GMP_VERSION_OK FALSE) -- message(STATUS "GMP version ${GMP_VERSION} found in ${GMP_INCLUDE_DIRS}, " -- "but at least version ${GMP_FIND_VERSION} is required") -- else() -- set(GMP_VERSION_OK TRUE) -- endif() -+find_library(GMP_LIBRARIES -+ gmp -+ PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR}) -+ -+if(GMP_INCLUDE_DIRS AND GMP_LIBRARIES) -+ -+ # This program will fail to compile if GMP is too old. -+ # We prefer to perform this "test" at compile-time to -+ # avoid problems with e.g. try_run() during cross-compilation. -+ file(WRITE ${PROJECT_BINARY_DIR}/gmp-version-check.c "" -+ "#include <gmp.h>\n" -+ "\n" -+ "#define GMP_FIND_VERSION_MAJOR ${GMP_FIND_VERSION_MAJOR}\n" -+ "#define GMP_FIND_VERSION_MINOR ${GMP_FIND_VERSION_MINOR}\n" -+ "#define GMP_FIND_VERSION_PATCH ${GMP_FIND_VERSION_PATCH}\n" -+ "\n" -+ "#if __GNU_MP_VERSION < GMP_FIND_VERSION_MAJOR\n" -+ "#error insufficient GMP major version\n" -+ "#elif __GNU_MP_VERSION == GMP_FIND_VERSION_MAJOR\n" -+ "#if __GNU_MP_VERSION_MINOR < GMP_FIND_VERSION_MINOR\n" -+ "#error insufficient GMP minor version\n" -+ "#elif __GNU_MP_VERSION_MINOR == GMP_FIND_VERSION_MINOR\n" -+ "#if __GNU_MP_VERSION_PATCH < GMP_FIND_VERSION_PATCH\n" -+ "#error insufficient GMP patch version\n" -+ "#endif\n" -+ "#endif\n" -+ "#endif\n" -+ "\n" -+ "int main(int argc, char** argv) { return 0; }\n") -+ -+ # Try to compile the test program above with the appropriate version -+ # strings substituted in. -+ try_compile(GMP_VERSION_OK -+ "${PROJECT_BINARY_DIR}" -+ "${PROJECT_BINARY_DIR}/gmp-version-check.c" -+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${GMP_INCLUDE_DIRS}") - endif() - --find_library(GMP_LIBRARIES gmp PATHS $ENV{GMPDIR} ${LIB_INSTALL_DIR}) -+if(NOT GMP_VERSION_OK) -+ message(STATUS "No sufficient GMP version detected") -+endif() - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(GMP DEFAULT_MSG --- -2.26.3 - diff --git a/sci-mathematics/flint/flint-2.7.1-r1.ebuild b/sci-mathematics/flint/flint-2.7.1-r1.ebuild deleted file mode 100644 index f8e7471260ea..000000000000 --- a/sci-mathematics/flint/flint-2.7.1-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ninja doesn't like "-lcblas" so using make. -CMAKE_MAKEFILE_GENERATOR="emake" -PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake python-any-r1 - -DESCRIPTION="Fast Library for Number Theory" -HOMEPAGE="http://www.flintlib.org/" -SRC_URI="http://www.flintlib.org/${P}.tar.gz" - -LICENSE="LGPL-2.1+" - -# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15 -SLOT="0/15" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" -IUSE="doc ntl test" - -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( - dev-python/sphinx - app-text/texlive-core - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - dev-tex/latexmk - ) - ${PYTHON_DEPS}" -DEPEND="dev-libs/gmp:= - dev-libs/mpfr:= - ntl? ( dev-libs/ntl:= ) - virtual/cblas" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-fix-cmake-findgmp.patch" ) - -src_configure() { - local mycmakeargs=( - -DWITH_NTL="$(usex ntl)" - -DBUILD_TESTING="$(usex test)" - -DBUILD_DOCS="$(usex doc)" - -DCBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include" - -DCBLAS_LIBRARIES="-lcblas" - ) - - cmake_src_configure - - if use doc ; then - HTML_DOCS="${BUILD_DIR}/html/*" - DOCS=( - "${S}"/README - "${S}"/AUTHORS - "${S}"/NEWS - "${BUILD_DIR}"/latex/Flint.pdf - ) - fi -} - -src_compile() { - cmake_src_compile - - if use doc ; then - cmake_build html - cmake_build pdf - fi -} diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest index b7b47954d31a..1b6ff4a533c7 100644 --- a/sci-mathematics/yacas/Manifest +++ b/sci-mathematics/yacas/Manifest @@ -1,9 +1,3 @@ -AUX yacas-1.7.0-desktop.patch 716 BLAKE2B da20f28d890f0b436ca796779bd78baf1e4bfc5d6d3db4732a16178b4a68bbdace9d0122bdeba6c79bac369b7742d5d3504623bbccf988ecd96a2d2ab1997d39 SHA512 62723fbd948108b0b1d21b9a18a96a5d381ceaa9f8564f6391e9de1a6beabff46e75b60737b56c0541970f216f3e5f0f6ace3fd8e5ecb1a7e3f68cc744527248 -AUX yacas-1.7.0-gnuinstalldirs.patch 13706 BLAKE2B 67c024ecb5111ae0188140143c7d5a82119aac1aa653901dd787eb9a698828c46277aee2e15820e7902e8eb972b1011ab4a3250afb075734fd911257cecb70dd SHA512 5fdf24b613cccee2802f3047b80058d18fe707f82d94282d95d70c8f748a6f6ea75cf7760baf4b24ef29294038b2bc88c1975ee4516a5d953251f15f1f1f17f3 -AUX yacas-1.7.0-use-bundled-not-external.patch 7485 BLAKE2B 9f4653465fa7dcb21a915c67e138053296a8a0c446b198f1ab394c34223be3526b247a2de90a46bbc481d5cdeaac43711f979edada93fded89144ca21c4f34d8 SHA512 58e58aeae8a9b89ba7df18d3a9ed9168f4654d5501d3cc42ced9079c87b3177e7d57e9109729d57eb0441d9de40a5212573671bfd739916366957a3be659d3ba -DIST yacas-1.7.0.tar.gz 2610016 BLAKE2B 62400d8aaba192a088bb48e0e12ff79e7e2d24af4825b2d53aeffa7aace011beb728118d56e5a9dd9e7dedba545706bbf77cb9ef27b5075e555fc5cc1983dc5e SHA512 6da7d454b3a74638d743c5e8168b27b9a8a71e2c41fe3f35bcb397fb80e866277ddb5b4e15167e2c0d11dd6033491ca72b560440fe2db6dc34b91b2ad047ca1d DIST yacas-1.9.1.tar.gz 38815043 BLAKE2B 09ec83591a9c11220f4e74ea07f1cad679cfef8c7a679c379f9bbc5708a70ccf9eb09a2ec6ca3fee7d76bc86082afcbd03e3d20df2e703dc579d93e94feee3e1 SHA512 1af1d7d490cf2d98fa861c476c7a7051a28535edc815f69a58edd2d96053332a8de7125017f18acbe2bf7b4eaf561cdf4e22d3c3f8e6656aaa3fbc46d0f633ef -DIST yacas-bundled-1.7.0.tar.xz 4940180 BLAKE2B e191f3806df0c15149df053c47b1f11a5113ee3b55cbc9a78bfaec058fb5d783e4157687bf4ee9a953bcd23a4e3e49a59e6743e4471e31209a9e24e03ddc8ff5 SHA512 a9c519d0721df69ec81998a3ec17043b59230f5b0650fc2fd6555eccb5503460f387433c019ae15bbd0fd3ff11e697d6da56a3d08aac5fadf4ff023ca5d8691c -EBUILD yacas-1.7.0-r1.ebuild 1404 BLAKE2B efdf7cacc453179b9160a9e4eb6a9d5874dcd4a7bb5e8f574b5bf02c78b1fe74f3993b8e69902e06583fb67f9a521c0f95aedee524cec1c6f91dc47408c24830 SHA512 81fabcde11a797c837f8de983e47ac20ee018a0d95939b10a507c9da85fd6d16c6dea5c0bbbf6d77d4b0c4f9e7edc129650671dba85735ffda2e4799a1375b5a EBUILD yacas-1.9.1.ebuild 1902 BLAKE2B 59169b7c2d8943064bf1900151a2c786e557b03b785ceccdca1f5d864a48a231c254042a7883462fb05ac112ed1ae7b0ab0469759164d7bb503f7d249216a847 SHA512 3a85161560f7a4ca6171f607f0efa63c074d1621b94d4b3b9527e8997c32d65676710ac9ac0cbc806dc41e85bb67e96e462f37ef24b8dcf01542e43688fe718f MISC metadata.xml 850 BLAKE2B ae5238a5de38646997fdc6ccfa9085d56cefc395295fc2372e049de80547cd75870dedb075ed011084ad686bb51c27dc182a879c07ae1fcd942c0b1520d89ebb SHA512 c2d259bc09555b6aeeee9d922b8a1a6a13c637999b30b47534f810a9b8994e351328add99f789d72a7c09326d98771b4e8e94d7698da5422965fcaa84bcc42de diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch b/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch deleted file mode 100644 index b1ad58468e63..000000000000 --- a/sci-mathematics/yacas/files/yacas-1.7.0-desktop.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ab5ba061c9beecb00064cb5698f1196d38cf0b6d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 24 Jul 2019 10:07:44 +0200 -Subject: [PATCH] Fix desktop icon name - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cyacas/yacas-gui/yacas-gui.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cyacas/yacas-gui/yacas-gui.desktop b/cyacas/yacas-gui/yacas-gui.desktop -index b7d44574..ab509a2c 100644 ---- a/cyacas/yacas-gui/yacas-gui.desktop -+++ b/cyacas/yacas-gui/yacas-gui.desktop -@@ -2,7 +2,7 @@ - Name=yacas-gui - Comment=Yacas GUI - Exec=yacas-gui --Icon=yacas_gui -+Icon=yacas-gui - Terminal=false - Type=Application - Categories=Science;Math --- -2.22.0 - diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch b/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch deleted file mode 100644 index 88e61dccbc53..000000000000 --- a/sci-mathematics/yacas/files/yacas-1.7.0-gnuinstalldirs.patch +++ /dev/null @@ -1,219 +0,0 @@ -From f1665438b617e312d96fbe771603424cbebeee4e Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 16 Jul 2019 23:25:12 +0200 -Subject: [PATCH] Use GNUInstallDirs - ---- - CMakeLists.txt | 5 +-- - cyacas/libyacas/CMakeLists.txt | 8 +++-- - cyacas/libyacas_mp/CMakeLists.txt | 8 +++-- - cyacas/yacas-gui/CMakeLists.txt | 4 +-- - cyacas/yacas-gui/resources/CMakeLists.txt | 40 +++++++++++------------ - cyacas/yacas-kernel/CMakeLists.txt | 2 +- - cyacas/yacas/CMakeLists.txt | 2 +- - docs/CMakeLists.txt | 2 +- - tests/CMakeLists.txt | 4 +-- - 9 files changed, 40 insertions(+), 35 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9982f519..596cec3c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,12 +30,13 @@ if (ENABLE_JYACAS) - set (LANGUAGES ${LANGUAGES} Java) - endif () - --project (YACAS VERSION 1.7.0 LANGUAGES ${LANGUAGES}) -+project (yacas VERSION 1.7.0 LANGUAGES ${LANGUAGES}) - - set (CMAKE_CXX_STANDARD 17) - set (CMAKE_CXX_STANDARD_REQUIRED ON) - set (CMAKE_CXX_EXTENSIONS OFF) - -+include (GNUInstallDirs) - include (CTest) - - set (YACAS_SCRIPTS -@@ -251,7 +252,7 @@ set (YACAS_SCRIPTS - scripts/yacasinit.ys) - - if (ENABLE_CYACAS) -- install (DIRECTORY scripts/ DESTINATION share/yacas/scripts COMPONENT app) -+ install (DIRECTORY scripts/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/scripts COMPONENT app) - endif () - - if (ENABLE_DOCS) -diff --git a/cyacas/libyacas/CMakeLists.txt b/cyacas/libyacas/CMakeLists.txt -index 14841f60..6839bb0a 100644 ---- a/cyacas/libyacas/CMakeLists.txt -+++ b/cyacas/libyacas/CMakeLists.txt -@@ -94,9 +94,11 @@ set_target_properties (libyacas PROPERTIES OUTPUT_NAME "yacas") - target_include_directories (libyacas PUBLIC include "${CMAKE_CURRENT_BINARY_DIR}/config") - target_link_libraries (libyacas libyacas_mp) - --install (TARGETS libyacas LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT app) --install (DIRECTORY include/ DESTINATION include COMPONENT dev) --install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config/yacas/yacas_version.h" DESTINATION include/yacas COMPONENT dev) -+install (TARGETS libyacas LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app) -+install (DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev) -+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/config/yacas/yacas_version.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/yacas COMPONENT dev) - - # if (APPLE) - # add_library (libyacas_framework SHARED ${SOURCES} ${HEADERS}) -diff --git a/cyacas/libyacas_mp/CMakeLists.txt b/cyacas/libyacas_mp/CMakeLists.txt -index 06a3fc9d..3ebabfe6 100644 ---- a/cyacas/libyacas_mp/CMakeLists.txt -+++ b/cyacas/libyacas_mp/CMakeLists.txt -@@ -29,8 +29,10 @@ add_library (libyacas_mp ${SOURCES} ${HEADERS}) - set_target_properties (libyacas_mp PROPERTIES OUTPUT_NAME "yacas_mp") - target_include_directories (libyacas_mp PUBLIC include) - --install (TARGETS libyacas_mp LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT app) --install (DIRECTORY include/ DESTINATION include COMPONENT dev) -+install (TARGETS libyacas_mp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app) -+install (DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT dev) - - # if (APPLE) - # add_library (libyacas_mp_framework SHARED ${SOURCES} ${HEADERS}) -@@ -48,4 +50,4 @@ endif () - - if (ENABLE_CYACAS_UNIT_TESTS) - add_subdirectory (test) --endif () -\ No newline at end of file -+endif () -diff --git a/cyacas/yacas-gui/CMakeLists.txt b/cyacas/yacas-gui/CMakeLists.txt -index 981de305..ed5550b7 100644 ---- a/cyacas/yacas-gui/CMakeLists.txt -+++ b/cyacas/yacas-gui/CMakeLists.txt -@@ -121,11 +121,11 @@ add_subdirectory (resources) - if (APPLE) - install (TARGETS yacas-gui BUNDLE DESTINATION ${CMAKE_INSTALL_BUNDLE_PREFIX}) - else () -- install (TARGETS yacas-gui DESTINATION bin) -+ install (TARGETS yacas-gui DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif () - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") -- install (PROGRAMS yacas-gui.desktop PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION share/applications) -+ install (PROGRAMS yacas-gui.desktop PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) - endif () - - if (WIN32) -diff --git a/cyacas/yacas-gui/resources/CMakeLists.txt b/cyacas/yacas-gui/resources/CMakeLists.txt -index dbdedcfa..a7d8d305 100644 ---- a/cyacas/yacas-gui/resources/CMakeLists.txt -+++ b/cyacas/yacas-gui/resources/CMakeLists.txt -@@ -42,24 +42,24 @@ ExternalProject_Add (yacas-gui_delanuay - BUILD_COMMAND "" - INSTALL_COMMAND "") - --install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION share/yacas/resources/plot3d) -+install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d) - - if (NOT APPLE) -- install (FILES plot3d/plot3d.js DESTINATION share/yacas/resources/plot3d) -- install (DIRECTORY jquery DESTINATION share/yacas/resources) -- install (DIRECTORY webchannel DESTINATION share/yacas/resources) -- install (DIRECTORY mathbar DESTINATION share/yacas/resources) -- install (DIRECTORY yacas_gui DESTINATION share/yacas/resources) -- install (FILES yacas_gui.html DESTINATION share/yacas/resources) -- install (DIRECTORY pixmaps DESTINATION share) -- install (DIRECTORY icons DESTINATION share) -+ install (FILES plot3d/plot3d.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d) -+ install (DIRECTORY jquery DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources) -+ install (DIRECTORY webchannel DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources) -+ install (DIRECTORY mathbar DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources) -+ install (DIRECTORY yacas_gui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources) -+ install (FILES yacas_gui.html DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources) -+ install (DIRECTORY pixmaps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) -+ install (DIRECTORY icons DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) - -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION share/yacas/resources/codemirror) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION share/yacas/resources/codemirror/mode) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION share/yacas/resources/codemirror/addon) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION share/yacas/resources/codemirror/addon) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon) - -- install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION share/yacas/resources/flot) -+ install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot) - - install (FILES - ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/build/three.min.js -@@ -68,12 +68,12 @@ if (NOT APPLE) - ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/CanvasRenderer.js - ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/Projector.js - ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/utils/SceneUtils.js -- DESTINATION share/yacas/resources/three) -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/three) - -- install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION share/yacas/resources/vis) -+ install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis) - -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION share/yacas/resources/mathjax/fonts/HTML-CSS/TeX) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION share/yacas/resources/mathjax) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX) -+ install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax) - endif () -diff --git a/cyacas/yacas-kernel/CMakeLists.txt b/cyacas/yacas-kernel/CMakeLists.txt -index ae2c7298..1e6c4cf1 100644 ---- a/cyacas/yacas-kernel/CMakeLists.txt -+++ b/cyacas/yacas-kernel/CMakeLists.txt -@@ -33,4 +33,4 @@ include_directories (include) - add_executable (yacas-kernel src/main.cpp src/yacas_kernel.cpp src/yacas_engine.cpp src/hmac_sha256.cpp) - target_link_libraries (yacas-kernel libyacas ${ZMQPP_LIBRARY} ${ZEROMQ_LIBRARY} ${JSONCPP_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${Boost_LIBRARIES} pthread) - --install (TARGETS yacas-kernel DESTINATION bin) -\ No newline at end of file -+install (TARGETS yacas-kernel DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/cyacas/yacas/CMakeLists.txt b/cyacas/yacas/CMakeLists.txt -index 3bdc3563..5e97c0af 100644 ---- a/cyacas/yacas/CMakeLists.txt -+++ b/cyacas/yacas/CMakeLists.txt -@@ -36,4 +36,4 @@ if (WIN32) - target_link_libraries (yacas wsock32 ws2_32 shlwapi) - endif() - --install (TARGETS yacas RUNTIME DESTINATION bin COMPONENT app) -+install (TARGETS yacas RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT app) -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index 869cd57c..f69d9740 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -38,6 +38,6 @@ add_custom_target(yacas_docs ALL - COMMENT "Building HTML documentation with Sphinx") - - install (DIRECTORY "${SPHINX_SINGLEHTML_DIR}" -- DESTINATION share/yacas/documentation -+ DESTINATION ${CMAKE_INSTALL_DOCDIR} - COMPONENT doc - PATTERN ".buildinfo" EXCLUDE) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 55ba67ef..9bb9c0e2 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -55,8 +55,8 @@ set (YACAS_TESTS - transforms.yts) - - --install (FILES ${YACAS_TESTS} DESTINATION share/yacas/tests COMPONENT app) --install (PROGRAMS ${TEST_YACAS_CMD} DESTINATION share/yacas/tests COMPONENT app) -+install (FILES ${YACAS_TESTS} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/tests COMPONENT app) -+install (PROGRAMS ${TEST_YACAS_CMD} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/tests COMPONENT app) - - if (ENABLE_CYACAS_CONSOLE) - foreach (_test ${YACAS_TESTS}) --- -2.22.0 - diff --git a/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch b/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch deleted file mode 100644 index f66a62987e45..000000000000 --- a/sci-mathematics/yacas/files/yacas-1.7.0-use-bundled-not-external.patch +++ /dev/null @@ -1,112 +0,0 @@ -From deda267cd182e48c8af657c0d26dbeeb04879d6f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 24 Jul 2019 09:58:58 +0200 -Subject: [PATCH] Install bundled files from repacked tarball, disable external - downloads - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cyacas/yacas-gui/resources/CMakeLists.txt | 77 +++++------------------ - 1 file changed, 17 insertions(+), 60 deletions(-) - -diff --git a/cyacas/yacas-gui/resources/CMakeLists.txt b/cyacas/yacas-gui/resources/CMakeLists.txt -index ca3bf32..bae7076 100644 ---- a/cyacas/yacas-gui/resources/CMakeLists.txt -+++ b/cyacas/yacas-gui/resources/CMakeLists.txt -@@ -1,49 +1,6 @@ - include (ExternalProject) - --ExternalProject_Add (yacas-gui_codemirror -- PREFIX external_packages -- URL https://github.com/codemirror/CodeMirror/archive/5.35.0.zip -- CONFIGURE_COMMAND npm install --no-progress -- BUILD_IN_SOURCE 1 -- BUILD_COMMAND npm run-script build -- INSTALL_COMMAND "") -- --ExternalProject_Add (yacas-gui_flot -- PREFIX external_packages -- URL https://github.com/flot/flot/archive/v0.8.3.zip -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -- --ExternalProject_Add (yacas-gui_three -- PREFIX external_packages -- URL https://github.com/mrdoob/three.js/archive/r90.zip -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -- --ExternalProject_Add (yacas-gui_vis -- PREFIX external_packages -- URL https://github.com/almende/vis/archive/v4.21.0.zip -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -- --ExternalProject_Add (yacas-gui_mathjax -- PREFIX external_packages -- URL https://github.com/mathjax/MathJax/archive/2.7.3.zip -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -- --ExternalProject_Add (yacas-gui_delanuay -- PREFIX external_packages -- URL https://github.com/ironwallaby/delaunay/archive/1.0.1.zip -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -- --install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d) -+install (FILES yacas-gui_delanuay/delaunay.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d) - - if (NOT APPLE) - install (FILES plot3d/plot3d.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/plot3d) -@@ -55,26 +12,26 @@ if (NOT APPLE) - install (DIRECTORY pixmaps DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) - install (DIRECTORY icons DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) - -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon) -+ install (DIRECTORY yacas-gui_codemirror/lib DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror) -+ install (DIRECTORY yacas-gui_codemirror/mode/yacas DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/mode) -+ install (DIRECTORY yacas-gui_codemirror/addon/edit DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon) -+ install (DIRECTORY yacas-gui_codemirror/addon/hint DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/codemirror/addon) - -- install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.js ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot) -+ install (FILES yacas-gui_flot/jquery.flot.js yacas-gui_flot/jquery.flot.resize.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/flot) - - install (FILES -- ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/build/three.min.js -- ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/Detector.js -- ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/controls/TrackballControls.js -- ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/CanvasRenderer.js -- ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/renderers/Projector.js -- ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_three/examples/js/utils/SceneUtils.js -+ yacas-gui_three/build/three.min.js -+ yacas-gui_three/examples/js/Detector.js -+ yacas-gui_three/examples/js/controls/TrackballControls.js -+ yacas-gui_three/examples/js/renderers/CanvasRenderer.js -+ yacas-gui_three/examples/js/renderers/Projector.js -+ yacas-gui_three/examples/js/utils/SceneUtils.js - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/three) - -- install (FILES ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.css ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis) -+ install (FILES yacas-gui_vis/dist/vis.min.css yacas-gui_vis/dist/vis.min.js DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/vis) - -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX) -- install (DIRECTORY ${CMAKE_BINARY_DIR}/cyacas/yacas-gui/resources/external_packages/src/yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax) -+ install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -+ install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/STIX-Web/woff DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/STIX-Web) -+ install (DIRECTORY yacas-gui_mathjax/fonts/HTML-CSS/TeX/otf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax/fonts/HTML-CSS/TeX) -+ install (DIRECTORY yacas-gui_mathjax/unpacked DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yacas/resources/mathjax) - endif () --- -2.22.0 - diff --git a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild b/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild deleted file mode 100644 index 5848e44b18fd..000000000000 --- a/sci-mathematics/yacas/yacas-1.7.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop - -DESCRIPTION="General purpose computer algebra system" -HOMEPAGE="http://www.yacas.org/" -SRC_URI="https://codeload.github.com/grzegorzmazur/${PN}/tar.gz/v${PV} -> ${P}.tar.gz -gui? ( https://dev.gentoo.org/~asturm/distfiles/${PN}-bundled-${PV}.tar.xz )" - -LICENSE="GPL-2 gui? ( MIT Apache-2.0 OFL-1.1 )" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" -IUSE="gui +jupyter static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - gui? ( - dev-qt/qtcore:5[icu] - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - ) - jupyter? ( - dev-libs/boost:= - dev-libs/jsoncpp:= - dev-libs/openssl:0= - dev-python/jupyter - net-libs/zeromq - >=net-libs/zmqpp-4.1.2 - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-gnuinstalldirs.patch" - "${FILESDIR}/${P}-desktop.patch" - "${FILESDIR}/${P}-use-bundled-not-external.patch" # bug 690534 -) - -src_configure() { - local mycmakeargs=( - -DENABLE_CYACAS_BENCHMARKS=OFF - -DENABLE_DOCS=OFF # requires sphinxcontrib-bibtex - -DENABLE_JYACAS=OFF # requires manual install - -DENABLE_CYACAS_GUI=$(usex gui) - -DENABLE_CYACAS_KERNEL=$(usex jupyter) - -DENABLE_CYACAS_UNIT_TESTS=$(usex test) - ) - cmake_src_configure -} |