diff options
Diffstat (limited to 'sci-mathematics')
90 files changed, 333 insertions, 4403 deletions
diff --git a/sci-mathematics/acl2/Manifest b/sci-mathematics/acl2/Manifest deleted file mode 100644 index b824d2c10..000000000 --- a/sci-mathematics/acl2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST acl2-8.3.tar.gz 116808616 BLAKE2B 77bba8c91231c2ae6ebae34ceeec9939101862156bfda4be2a0e3389f51cfdc183004d9cb3b27511a7494a9ead8ced5016f648a1712ab468c781dd8f8feca822 SHA512 92b59d1b31ce8d980bf043d02d4ee6ae36c69b3c2cc7be106e4d8f46e660a813e42f6e41a0903159ce65e9332dccb770cbd69472602889724f8ba724bfa301e2 -DIST acl2-8.4.tar.gz 202242463 BLAKE2B 887273910c7913d08455e5053a4c4d065743e0ba247f94f994a3400f27c97f8fce07debb145dbf26287c8b72e9335d995fcbc49f7085e17384b38035d260c8b8 SHA512 5a38271ffa9f9aad79d2aaf575144a58cf1b926b9ba3f9fb34af927862c95f6f683e870c9b453b2527abe8bdcd5603c6b5ad4c50b70c407606db78e0a79545bb diff --git a/sci-mathematics/acl2/acl2-8.3-r1.ebuild b/sci-mathematics/acl2/acl2-8.3-r1.ebuild deleted file mode 100644 index d0bb4eade..000000000 --- a/sci-mathematics/acl2/acl2-8.3-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common - -DESCRIPTION="Industrial strength theorem prover" -HOMEPAGE="https://www.cs.utexas.edu/users/moore/acl2/" -SRC_URI="https://github.com/acl2/acl2/archive/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="books doc emacs" - -BDEPEND=" - dev-lisp/sbcl - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND=" - dev-lisp/sbcl:= - books? ( dev-lang/perl ) - doc? ( dev-lang/perl ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-use_make_variable.patch ) - -src_prepare() { - find . -type f -name "*.bak" -delete - find . -type f -name "*.orig" -delete - # Remove sparc binary inadvertently included in upstream - rm books/workshops/2003/schmaltz-al-sammane-et-al/support/acl2link || die - default -} - -src_compile() { - emake LISP="sbcl --noinform --noprint \ - --no-sysinit --no-userinit --disable-debugger" - - if use books; then - emake "ACL2=${S}/saved_acl2" basic - fi - - if use doc; then - emake "ACL2=${S}/saved_acl2" DOC - fi - - if use emacs; then - elisp-compile emacs/*.el - fi -} - -src_install() { - local SAVED_NAME=saved_acl2 - sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die - dobin ${SAVED_NAME} - - insinto /usr/share/acl2 - doins ${SAVED_NAME}.core - if use books; then - sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \ - -i ${SAVED_NAME} || die - doins -r books - fi - - DOCS=( books/README.md ) - if use doc; then - HTML_DOCS=( doc/HTML/. ) - fi - einstalldocs - - if use emacs; then - elisp-install ${PN} emacs/*{.el,elc} - doins TAGS - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/acl2/acl2-8.4.ebuild b/sci-mathematics/acl2/acl2-8.4.ebuild deleted file mode 100644 index dfc3967ed..000000000 --- a/sci-mathematics/acl2/acl2-8.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common - -DESCRIPTION="Industrial strength theorem prover" -HOMEPAGE="https://www.cs.utexas.edu/users/moore/acl2/" -SRC_URI="https://github.com/acl2/acl2/archive/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="books doc emacs" - -BDEPEND=" - >=dev-lisp/sbcl-1.5.2 - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND=" - dev-lisp/sbcl:= - books? ( dev-lang/perl ) - doc? ( dev-lang/perl ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-use_make_variable.patch ) - -src_prepare() { - find . -type f -name "*.bak" -delete - find . -type f -name "*.orig" -delete - # Remove sparc binary inadvertently included in upstream - rm books/workshops/2003/schmaltz-al-sammane-et-al/support/acl2link || die - default -} - -src_compile() { - emake LISP="sbcl --noinform --noprint \ - --no-sysinit --no-userinit --disable-debugger" - - if use books; then - emake "ACL2=${S}/saved_acl2" basic - fi - - if use doc; then - emake "ACL2=${S}/saved_acl2" DOC - fi - - if use emacs; then - elisp-compile emacs/*.el - fi -} - -src_install() { - local SAVED_NAME=saved_acl2 - sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die - dobin ${SAVED_NAME} - - insinto /usr/share/acl2 - doins ${SAVED_NAME}.core - if use books; then - sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \ - -i ${SAVED_NAME} || die - doins -r books - fi - - DOCS=( books/README.md ) - if use doc; then - HTML_DOCS=( doc/HTML/. ) - fi - einstalldocs - - if use emacs; then - elisp-install ${PN} emacs/*{.el,elc} - doins TAGS - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/acl2/files/acl2-use_make_variable.patch b/sci-mathematics/acl2/files/acl2-use_make_variable.patch deleted file mode 100644 index 32e0f05da..000000000 --- a/sci-mathematics/acl2/files/acl2-use_make_variable.patch +++ /dev/null @@ -1,13 +0,0 @@ -use make variable to avoid QA issue: "make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule" - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -576,7 +576,7 @@ doc/home-page.html: doc/home-page.lisp - # xdoc::save that populates doc/manual/ (not under books/). - acl2-manual: check-books - rm -rf doc/manual books/system/doc/acl2-manual.cert -- cd books ; make USE_QUICKLISP=1 system/doc/acl2-manual.cert -+ cd books ; $(MAKE) USE_QUICKLISP=1 system/doc/acl2-manual.cert - rm -rf doc/manual/download/* - - # WARNING: The dependency list just below isn't complete, since it diff --git a/sci-mathematics/acl2/metadata.xml b/sci-mathematics/acl2/metadata.xml deleted file mode 100644 index b3d826757..000000000 --- a/sci-mathematics/acl2/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>dongxuli2011@gmail.com</email> - <name>Dongxu Li</name> - <description>Industrial strength theorem prover</description> - </maintainer> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> - ACL2 is both a programming language in which you can model computer systems and - a tool to help you prove properties of those models. ACL2 is part of the - Boyer-Moore family of provers, for which its authors have received the 2005 ACM - Software System Award. - </longdescription> - <use> - <flag name="books">build community books, the canonical collection of open-source libraries</flag> - </use> - <upstream> - <remote-id type="github">acl2/acl2</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-mathematics/cipi/cipi-1.0-r1.ebuild b/sci-mathematics/cipi/cipi-1.0-r1.ebuild new file mode 100644 index 000000000..6cd189e33 --- /dev/null +++ b/sci-mathematics/cipi/cipi-1.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Computing information projections iteratively" +HOMEPAGE="https://github.com/tom111/cipi" +SRC_URI="https://github.com/tom111/cipi/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="doc" + +DEPEND=" + dev-libs/boost:= + doc? ( virtual/latex-base )" +RDEPEND="${DEPEND}" + +DOCS="AUTHORS README" + +CMAKE_IN_SOURCE_BUILD="yes" + +PATCHES=( + "${FILESDIR}/${P}-boost.patch" +) + +src_prepare() { + cmake_src_prepare + append-ldflags -Wl,--copy-dt-needed-entries +} + +src_configure() { + mycmakeargs=( + -DENABLE_DOC=$(usex doc ON OFF) + ) + + cmake_src_configure +} + +pkg_postinst() { + elog + elog "The sample PARAM file has been installed to /usr/share/${PN}-${PV}" + elog + if use doc; then + elog "A pdf manual has been installed to /usr/share/${PN}-${PV}" + fi +} diff --git a/sci-mathematics/cipi/cipi-1.0.ebuild b/sci-mathematics/cipi/cipi-1.0.ebuild index 2dae2c71a..33d744c7c 100644 --- a/sci-mathematics/cipi/cipi-1.0.ebuild +++ b/sci-mathematics/cipi/cipi-1.0.ebuild @@ -7,7 +7,7 @@ inherit cmake flag-o-matic DESCRIPTION="Computing information projections iteratively" HOMEPAGE="https://github.com/tom111/cipi" -SRC_URI="https://github.com/tom111/cipi/archive/1.0.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/tom111/cipi/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/sci-mathematics/cipi/files/cipi-1.0-boost.patch b/sci-mathematics/cipi/files/cipi-1.0-boost.patch new file mode 100644 index 000000000..66aa9fd3f --- /dev/null +++ b/sci-mathematics/cipi/files/cipi-1.0-boost.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt 2024-02-16 21:36:58.808186061 +0100 ++++ b/src/CMakeLists.txt 2024-02-16 21:36:55.288131610 +0100 +@@ -8,7 +8,7 @@ + Message("Boost found" ${Boost_LIBRARY_DIR}) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + #MESSAGE("Boost was found" ${Boost_INCLUDE_DIR}) +- TARGET_LINK_LIBRARIES (cipi boost_thread-mt) ++ TARGET_LINK_LIBRARIES (cipi boost_thread) + ENDIF (Boost_FOUND) + + INSTALL(PROGRAMS cipi DESTINATION bin) diff --git a/sci-mathematics/flocq/Manifest b/sci-mathematics/flocq/Manifest deleted file mode 100644 index 21dee2252..000000000 --- a/sci-mathematics/flocq/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flocq-3.4.0.tar.gz 453124 BLAKE2B 0c3e7f7fe18f9722e341a62b8770ebe94a9195fc6e47a2beb6493ed976e8fac6da6eecae23a77d394a6b3dee89897f2fc918307130e7e8d3b1d08f2eb175c87e SHA512 26be9e6d0d30f0035f898c3cfd973ca954195af2068b1fc1ddcffe6ea81d9c3d8b9d72fad1ae75a816f67942bb4bef269bf9739e95ecf6cc17aecdbe1fcaf7a0 diff --git a/sci-mathematics/flocq/flocq-3.4.0-r1.ebuild b/sci-mathematics/flocq/flocq-3.4.0-r1.ebuild deleted file mode 100644 index f0e6c73a8..000000000 --- a/sci-mathematics/flocq/flocq-3.4.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing - -DESCRIPTION="A floating-point formalization for the Coq system" -HOMEPAGE="http://flocq.gforge.inria.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38385/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=sci-mathematics/coq-8.7" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i Remakefile.in \ - -e "s:mkdir -p @libdir@:mkdir -p \${DESTDIR}@libdir@:g" \ - -e "s:cp \$f @libdir@:cp \$f \${DESTDIR}@libdir@:g" -} - -src_configure() { - econf --libdir="`coqc -where`/user-contrib/Flocq" -} - -src_compile() { - ./remake --jobs=$(makeopts_jobs) || die "emake failed" -} - -src_install() { - DESTDIR="${D}" ./remake install || die - einstalldocs -} diff --git a/sci-mathematics/flocq/metadata.xml b/sci-mathematics/flocq/metadata.xml deleted file mode 100644 index de5ba354b..000000000 --- a/sci-mathematics/flocq/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> -Flocq (Floats for Coq) is a floating-point formalization for the Coq -system. It provides a comprehensive library of theorems on a multi-radix -multi-precision arithmetic. It also supports efficient numerical -computations inside Coq. -</longdescription> -</pkgmetadata> diff --git a/sci-mathematics/frama-c/files/ocamlgraph185_compat.patch b/sci-mathematics/frama-c/files/ocamlgraph185_compat.patch deleted file mode 100644 index 798d17fd3..000000000 --- a/sci-mathematics/frama-c/files/ocamlgraph185_compat.patch +++ /dev/null @@ -1,254 +0,0 @@ -From: Mehdi Dogguy <mehdi@debian.org> -Date: Sun, 27 Apr 2014 13:46:16 +0200 -Subject: Port to OCamlgraph 1.8.5 - ---- - src/impact/reason_graph.ml | 2 +- - src/kernel/stmts_graph.ml | 10 +++++----- - src/logic/property_status.ml | 8 ++++---- - src/misc/service_graph.ml | 4 ++-- - src/pdg_types/pdgTypes.ml | 6 +++--- - src/postdominators/print.ml | 2 +- - src/semantic_callgraph/register.ml | 4 ++-- - src/slicing/printSlice.ml | 10 +++++----- - src/syntactic_callgraph/register.ml | 4 ++-- - src/wp/cil2cfg.ml | 12 ++++++------ - 10 files changed, 31 insertions(+), 31 deletions(-) - -diff --git a/src/impact/reason_graph.ml b/src/impact/reason_graph.ml -index eabacb0..ce19b4a 100644 ---- a/src/impact/reason_graph.ml -+++ b/src/impact/reason_graph.ml -@@ -139,7 +139,7 @@ module Printer (X: AdditionalInfo) = struct - - let graph_attributes _ = [`Label "Impact graph"] - -- let default_vertex_attributes _g = [`Style [`Filled]; `Shape `Box] -+ let default_vertex_attributes _g = [`Style `Filled; `Shape `Box] - let default_edge_attributes _g = [] - - let vertex_attributes v = -diff --git a/src/kernel/stmts_graph.ml b/src/kernel/stmts_graph.ml -index a8fe121..16059c3 100644 ---- a/src/kernel/stmts_graph.ml -+++ b/src/kernel/stmts_graph.ml -@@ -157,12 +157,12 @@ module TP = struct - - let vertex_attributes s = - match s.skind with -- | Loop _ -> [`Color 0xFF0000; `Style [`Filled]] -- | If _ -> [`Color 0x00FF00; `Style [`Filled]; `Shape `Diamond] -- | Return _ -> [`Color 0x0000FF; `Style [`Filled]] -+ | Loop _ -> [`Color 0xFF0000; `Style `Filled] -+ | If _ -> [`Color 0x00FF00; `Style `Filled; `Shape `Diamond] -+ | Return _ -> [`Color 0x0000FF; `Style `Filled] - | Block _ -> [`Shape `Box; `Fontsize 8] -- | Goto _ -> [`Shape `Diamond; `Color 0x00FFFF ; `Style [`Filled]] -- | Instr (Skip _) -> [`Color 0x00FFFF ; `Style [`Filled]] -+ | Goto _ -> [`Shape `Diamond; `Color 0x00FFFF ; `Style `Filled] -+ | Instr (Skip _) -> [`Color 0x00FFFF ; `Style `Filled] - | _ -> [] - let default_vertex_attributes _ = [] - -diff --git a/src/logic/property_status.ml b/src/logic/property_status.ml -index f7c278d..47485f6 100644 ---- a/src/logic/property_status.ml -+++ b/src/logic/property_status.ml -@@ -1481,12 +1481,12 @@ module Consolidation_graph = struct - let s = get_status p in - let color = status_color p s in - let style = match s with -- | Never_tried -> [`Style [`Bold]; `Width 0.8 ] -- | _ -> [`Style [`Filled]] -+ | Never_tried -> [`Style `Bold; `Width 0.8 ] -+ | _ -> [`Style `Filled] - in - style @ [ label v; `Color color; `Shape `Box ] - | Emitter _ as v -> -- [ label v; `Shape `Diamond; `Color 0xb0c4de; `Style [`Filled] ] -+ [ label v; `Shape `Diamond; `Color 0xb0c4de; `Style `Filled ] - | Tuning_parameter _ as v -> - [ label v; (*`Style `Dotted;*) `Color 0xb0c4de; ] - (*| Correctness_parameter _ (*as v*) -> assert false (*[ label v; `Color 0xb0c4de ]*)*) -@@ -1495,7 +1495,7 @@ module Consolidation_graph = struct - | None -> [] - | Some s -> - let c = emitted_status_color s in -- [ `Color c; `Fontcolor c; `Style [`Bold] ] -+ [ `Color c; `Fontcolor c; `Style `Bold ] - - let default_vertex_attributes _ = [] - let default_edge_attributes _ = [] -diff --git a/src/misc/service_graph.ml b/src/misc/service_graph.ml -index 4f866c5..d158028 100644 ---- a/src/misc/service_graph.ml -+++ b/src/misc/service_graph.ml -@@ -289,7 +289,7 @@ Src root:%s in %s (is_root:%b) Dst:%s in %s (is_root:%b) [2d case]" - color e - else - match CallG.E.label e with -- | Inter_services -> [ `Style [`Invis] ] -+ | Inter_services -> [ `Style `Invis ] - | Inter_functions | Both -> color e - - let default_edge_attributes _ = [] -@@ -303,7 +303,7 @@ Src root:%s in %s (is_root:%b) Dst:%s in %s (is_root:%b) [2d case]" - sg_attributes = - [ `Label ("S " ^ cs); - `Color (Extlib.number_to_color id); -- `Style [`Bold] ] } -+ `Style `Bold ] } - - end - -diff --git a/src/pdg_types/pdgTypes.ml b/src/pdg_types/pdgTypes.ml -index 05754e4..74cdebf 100644 ---- a/src/pdg_types/pdgTypes.ml -+++ b/src/pdg_types/pdgTypes.ml -@@ -626,7 +626,7 @@ module Pdg = struct - - let graph_attributes _ = [`Rankdir `TopToBottom ] - -- let default_vertex_attributes _ = [`Style [`Filled]] -+ let default_vertex_attributes _ = [`Style `Filled] - let vertex_name v = string_of_int (Node.id v) - - let vertex_attributes v = -@@ -711,13 +711,13 @@ module Pdg = struct - if Dpd.is_ctrl d then (`Arrowtail `Odot)::attrib else attrib - in - let attrib = -- if Dpd.is_addr d then (`Style [`Dotted])::attrib else attrib -+ if Dpd.is_addr d then (`Style `Dotted)::attrib else attrib - in - attrib - - let get_subgraph v = - let mk_subgraph name attrib = -- let attrib = (`Style [`Filled]) :: attrib in -+ let attrib = (`Style `Filled) :: attrib in - Some { Graph.Graphviz.DotAttributes.sg_name= name; - sg_parent = None; - sg_attributes = attrib } -diff --git a/src/postdominators/print.ml b/src/postdominators/print.ml -index f2e3a25..15f4ff2 100644 ---- a/src/postdominators/print.ml -+++ b/src/postdominators/print.ml -@@ -63,7 +63,7 @@ module Printer = struct - - let graph_attributes (title, _) = [`Label title] - -- let default_vertex_attributes _g = [`Style [`Filled]] -+ let default_vertex_attributes _g = [`Style `Filled] - let default_edge_attributes _g = [] - - let vertex_attributes (s, has_postdom) = -diff --git a/src/semantic_callgraph/register.ml b/src/semantic_callgraph/register.ml -index 1c79dcc..071f061 100644 ---- a/src/semantic_callgraph/register.ml -+++ b/src/semantic_callgraph/register.ml -@@ -102,8 +102,8 @@ module Service = - let name = Kernel_function.get_name - let attributes v = - [ `Style -- [if Kernel_function.is_definition v then `Bold -- else `Dotted] ] -+ (if Kernel_function.is_definition v then `Bold -+ else `Dotted) ] - let entry_point () = - try Some (fst (Globals.entry_point ())) - with Globals.No_such_entry_point _ -> None -diff --git a/src/slicing/printSlice.ml b/src/slicing/printSlice.ml -index c5363f9..211e0bb 100644 ---- a/src/slicing/printSlice.ml -+++ b/src/slicing/printSlice.ml -@@ -227,7 +227,7 @@ module PrintProject = struct - - let graph_attributes (name, _) = [`Label name] - -- let default_vertex_attributes _ = [`Style [`Filled]] -+ let default_vertex_attributes _ = [`Style `Filled] - - let vertex_name v = match v with - | Src fi -> SlicingMacros.fi_name fi -@@ -280,16 +280,16 @@ module PrintProject = struct - - let edge_attributes (e, call) = - let attrib = match e with -- | (Src _, Src _) -> [`Style [`Invis]] -- | (OptSliceCallers _, _) -> [`Style [`Invis]] -- | (_, OptSliceCallers _) -> [`Style [`Invis]] -+ | (Src _, Src _) -> [`Style `Invis] -+ | (OptSliceCallers _, _) -> [`Style `Invis] -+ | (_, OptSliceCallers _) -> [`Style `Invis] - | _ -> [] - in match call with None -> attrib - | Some call -> (`Label (string_of_int call.sid)):: attrib - - let get_subgraph v = - let mk_subgraph name attrib = -- let attrib = (*(`Label name) ::*) (`Style [`Filled]) :: attrib in -+ let attrib = (*(`Label name) ::*) (`Style `Filled) :: attrib in - Some { Graph.Graphviz.DotAttributes.sg_name= name; - sg_parent = None; - sg_attributes = attrib } -diff --git a/src/syntactic_callgraph/register.ml b/src/syntactic_callgraph/register.ml -index d4669c4..d41980e 100644 ---- a/src/syntactic_callgraph/register.ml -+++ b/src/syntactic_callgraph/register.ml -@@ -37,8 +37,8 @@ module Service = - let name v = nodeName v.cnInfo - let attributes v = - [ match v.cnInfo with -- | NIVar (_,b) when not !b -> `Style [`Dotted] -- | _ -> `Style [`Bold] ] -+ | NIVar (_,b) when not !b -> `Style `Dotted -+ | _ -> `Style `Bold ] - let equal v1 v2 = id v1 = id v2 - let compare v1 v2 = - let i1 = id v1 in -diff --git a/src/wp/cil2cfg.ml b/src/wp/cil2cfg.ml -index 6d8cf09..ba5f410 100644 ---- a/src/wp/cil2cfg.ml -+++ b/src/wp/cil2cfg.ml -@@ -1278,9 +1278,9 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct - | Vstart | Vend | Vexit -> [`Color 0x0000FF; `Shape `Doublecircle] - | VfctIn | VfctOut -> [`Color 0x0000FF; `Shape `Box] - | VblkIn _ | VblkOut _ -> [`Shape `Box] -- | Vloop _ | Vloop2 _ -> [`Color 0xFF0000; `Style [`Filled]] -+ | Vloop _ | Vloop2 _ -> [`Color 0xFF0000; `Style `Filled] - | Vtest _ | Vswitch _ -> -- [`Color 0x00FF00; `Style [`Filled]; `Shape `Diamond] -+ [`Color 0x00FF00; `Style `Filled; `Shape `Diamond] - | Vcall _ | Vstmt _ -> [] - in (`Label (String.escaped label))::attr - -@@ -1290,15 +1290,15 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct - let attr = [] in - let attr = (`Label (String.escaped (PE.edge_txt e)))::attr in - let attr = -- if is_back_edge e then (`Constraint false)::(`Style [`Bold])::attr -+ if is_back_edge e then (`Constraint false)::(`Style `Bold)::attr - else attr - in - let attr = match (edge_type e) with - | Ethen | EbackThen -> (`Color 0x00FF00)::attr - | Eelse | EbackElse -> (`Color 0xFF0000)::attr -- | Ecase [] -> (`Color 0x0000FF)::(`Style [`Dashed])::attr -+ | Ecase [] -> (`Color 0x0000FF)::(`Style `Dashed)::attr - | Ecase _ -> (`Color 0x0000FF)::attr -- | Enext -> (`Style [`Dotted])::attr -+ | Enext -> (`Style `Dotted)::attr - | Eback -> attr (* see is_back_edge above *) - | Enone -> attr - in -@@ -1308,7 +1308,7 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct - - let get_subgraph v = - let mk_subgraph name attrib = -- let attrib = (`Style [`Filled]) :: attrib in -+ let attrib = (`Style `Filled) :: attrib in - Some { Graph.Graphviz.DotAttributes.sg_name= name; - sg_parent = None; - sg_attributes = attrib } --- diff --git a/sci-mathematics/frama-c/frama-c-22.0.ebuild b/sci-mathematics/frama-c/frama-c-22.0.ebuild index a64c05e82..aaf815f4f 100644 --- a/sci-mathematics/frama-c/frama-c-22.0.ebuild +++ b/sci-mathematics/frama-c/frama-c-22.0.ebuild @@ -20,7 +20,7 @@ RESTRICT="strip" DEPEND=" >=dev-lang/ocaml-3.12.1[ocamlopt?] - >=dev-ml/ocamlgraph-1.8.5[gtk(-)?,ocamlopt?] + >=dev-ml/ocamlgraph-1.8.5[ocamlopt?] dev-ml/zarith dev-ml/yojson sci-mathematics/coq diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest index dd9c40a52..cde77c554 100644 --- a/sci-mathematics/freefem++/Manifest +++ b/sci-mathematics/freefem++/Manifest @@ -1 +1 @@ -DIST freefem++-4.7.1.tar.gz 12522562 BLAKE2B a94cc91406486cf4acbd9d544ecdb3f9744d8e4172d84ee6c5bbad4aa8db04bd958e574f98537ec652deb2b1d74adb8d125138f6092030363cdf74c86c6f8a07 SHA512 e42b29f9aa4edf1e4a170425a304996d291b0c3127d75267d421d0f2ff757cdc64fb9b177e38f4e183edc6f256430c39880fea307698417721605b72f6d3c2d0 +DIST freefem++-4.10.tar.gz 12607380 BLAKE2B 2adcbcb48555c218bdec087b52b955fef7d2b8c0b17045be64d8acf9cde0910dd9c1a1856c046582e3d3e3024848db284cf8262f2e7c9a2e46024768f0dbad7a SHA512 768e8657884e92cd32f08ea82b3f384ed1522d1a693c6de95281fe1bf49e61d084d7d4d5c6c31f70a05ed95ba7cc0af75979242225466d06c2173176e862995e diff --git a/sci-mathematics/freefem++/freefem++-4.7.1.ebuild b/sci-mathematics/freefem++/freefem++-4.10.ebuild index 2afb7d92f..5791c4bf6 100644 --- a/sci-mathematics/freefem++/freefem++-4.7.1.ebuild +++ b/sci-mathematics/freefem++/freefem++-4.10.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic toolchain-funcs - -MY_PV="$(ver_rs 2 -)" +inherit autotools toolchain-funcs DESCRIPTION="Solve PDEs using FEM on 2d and 3d domains" HOMEPAGE="https://freefem.org/" -SRC_URI="https://github.com/FreeFem/FreeFem-sources/archive/v4.7-1.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/FreeFem/FreeFem-sources/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/FreeFem-sources-${PV}" LICENSE="LGPL-2.1" SLOT="0" @@ -22,7 +21,7 @@ RDEPEND=" virtual/lapack sci-libs/umfpack sci-libs/arpack - sci-libs/hdf5[cxx,mpi?] + sci-libs/hdf5[cxx] mpi? ( virtual/mpi ) opengl? ( media-libs/freeglut @@ -39,8 +38,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/FreeFem-sources-${MY_PV}" - src_prepare() { default diff --git a/sci-mathematics/freefem++/metadata.xml b/sci-mathematics/freefem++/metadata.xml index a605d78d7..5cee338ce 100644 --- a/sci-mathematics/freefem++/metadata.xml +++ b/sci-mathematics/freefem++/metadata.xml @@ -10,4 +10,7 @@ FreeFem++ is an implementation of a language dedicated to the finite element method. It enables you to solve Partial Differential Equations (PDE) easily. </longdescription> + <upstream> + <remote-id type="github">FreeFem/FreeFem-sources</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-mathematics/gap/Manifest b/sci-mathematics/gap/Manifest deleted file mode 100644 index b64b9f6e7..000000000 --- a/sci-mathematics/gap/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gap-4.11.0-core-packages.tar.gz 53096715 BLAKE2B 1cfec307efe95a91869e9bf4d3947dd9010a26a0cbe2c317eafb5f5402068f00f8f1518e995c92a7827e9a0fa387fc8db5dc6dd2f6cc5a1b24df1754c1e96c7f SHA512 e4ac9ffd7c33121af46ec3f255634c47efb8445429b570a8ad3c8784688f7e966d48c8f74aa50d039608974bd93e05bf61497df02e4b42f5577651c88c3884d4 -DIST gap-4.11.0-core.tar.bz2 13467788 BLAKE2B a0e1415bb2a6725f4ef6283e4823e1c1cd4d9813f981f5e6d02554fe2ae3ad05793320239e70d6412a4d4722da436bacd4fe127c79b9ec891ccbdfa3cd7c2d12 SHA512 94d5451e76ddcea33a5f83b1082f9b5d0ecb83f30491bdf510338f1eecea9faa868312cb682b5dd08c2b71c03cd3ca3f837df98fb96e52c8b89ab2443402ee49 diff --git a/sci-mathematics/gap/files/gap-4.11.0-autoconf.patch b/sci-mathematics/gap/files/gap-4.11.0-autoconf.patch deleted file mode 100644 index b220f3ada..000000000 --- a/sci-mathematics/gap/files/gap-4.11.0-autoconf.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 938fcd3..b3b2340 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,6 +6,7 @@ AC_INIT([GAP], [4.dev], [support@gap-system.org], [gap], [https://www.gap-system - - AC_CONFIG_SRCDIR([src/gap.c]) - AC_CONFIG_AUX_DIR([cnf]) -+AC_CONFIG_MACRO_DIR([m4]) - - AC_CONFIG_HEADERS([gen/config.h:src/config.h.in]) - AC_CONFIG_COMMANDS([gen/stamp-h], [echo timestamp > gen/stamp-h]) -@@ -207,29 +208,41 @@ dnl User setting: Debug mode (off by default) - dnl - AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], [enable debug mode])], -- [AC_DEFINE([GAP_KERNEL_DEBUG], [1], [define if building in debug mode]) -- AC_DEFINE([GAP_PRINT_BACKTRACE], [1], [to enable backtraces upon crashes])], -+ [], - [enable_debug=no] - ) - AC_MSG_CHECKING([whether to enable debug mode]) - AC_MSG_RESULT([$enable_debug]) - -+AS_IF([test "x$enable_debug" != "xno"], -+ [AC_DEFINE([GAP_KERNEL_DEBUG], [1], [define if building in debug mode]) -+ AC_DEFINE([GAP_PRINT_BACKTRACE], [1], [to enable backtraces upon crashes])], -+) -+ - AC_ARG_ENABLE([memory-checking], - [AS_HELP_STRING([--enable-memory-checking], [enable memory checking])], -- [AC_DEFINE([GAP_MEM_CHECK], [1], [define if building with memory checking])], -+ [], - [enable_memory_checking=no] - ) - AC_MSG_CHECKING([whether to enable memory checking]) - AC_MSG_RESULT([$enable_memory_checking]) - -+AS_IF([test "x$enable_memory_checking" != "xno"], -+ [AC_DEFINE([GAP_MEM_CHECK], [1], [define if building with memory checking])] -+) -+ - AC_ARG_ENABLE([valgrind], - [AS_HELP_STRING([--enable-valgrind], [enable valgrind extensions to GASMAN])], -- [AC_DEFINE([GAP_MEMORY_CANARY], [1], [define if building with valgrind extensions])], -+ [], - [enable_valgrind=no] - ) - AC_MSG_CHECKING([whether to enable valgrind extensions to GASMAN]) - AC_MSG_RESULT([$enable_valgrind]) - -+AS_IF([test "x$enable_valgrind" != "xno"], -+ [AC_DEFINE([GAP_MEMORY_CANARY], [1], [define if building with valgrind extensions])] -+) -+ - if test "x$enable_valgrind" != "xno" -a "x$enable_memory_checking" != "xno"; then - AC_MSG_ERROR([--enable-valgrind and --enable-memory-checking cannot be used at the same time]) - fi -@@ -549,10 +562,9 @@ AS_IF([test "x$with_gc" = xboehm], - # - # As a side benefit, users do not have to worry about installing dependencies. - -- BUILD_LIBATOMIC_OPS=yes -- LIBATOMIC_OPS_CPPFLAGS='-I${abs_builddir}/extern/install/libatomic_ops/include' -- LIBATOMIC_OPS_LDFLAGS='${abs_builddir}/extern/install/libatomic_ops/lib/libatomic_ops.la' -- LIBATOMIC_OPS_LIBS= -+ BUILD_LIBATOMIC_OPS=no -+ #PKG_CHECK_MODULES([LIBATOMIC_OPS], [atomic_ops]) -+ - AC_SUBST([BUILD_LIBATOMIC_OPS]) - AC_SUBST([LIBATOMIC_OPS_CPPFLAGS]) - AC_SUBST([LIBATOMIC_OPS_LDFLAGS]) -@@ -561,11 +573,8 @@ AS_IF([test "x$with_gc" = xboehm], - ATOMIC_OPS_CFLAGS=$LIBATOMIC_OPS_CPPFLAGS - ATOMIC_OPS_LIBS=$LIBATOMIC_OPS_LDFLAGS - -- -- BUILD_BOEHM_GC=yes -- BOEHM_GC_CPPFLAGS='-I${abs_builddir}/extern/install/gc/include' -- BOEHM_GC_LDFLAGS='${abs_builddir}/extern/install/gc/lib/libgc.la' -- BOEHM_GC_LIBS= -+ BUILD_BOEHM_GC=no -+ #PKG_CHECK_MODULES([BOEHM_GC], [bdw-gc]) - AC_SUBST([BUILD_BOEHM_GC]) - AC_SUBST([BOEHM_GC_CPPFLAGS]) - AC_SUBST([BOEHM_GC_LDFLAGS]) diff --git a/sci-mathematics/gap/gap-4.11.0.ebuild b/sci-mathematics/gap/gap-4.11.0.ebuild deleted file mode 100644 index d94a02143..000000000 --- a/sci-mathematics/gap/gap-4.11.0.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools python-any-r1 - -DESCRIPTION="Computational discrete algebra system - minimal GAP core system" -HOMEPAGE="https://www.gap-system.org/" -SRC_URI="https://github.com/gap-system/gap/releases/download/v${PV}/gap-${PV}-core.tar.bz2 - https://github.com/gap-system/gap/releases/download/v${PV}/packages-required-v${PV}.tar.gz -> ${P}-core-packages.tar.gz -" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64" -# broken HPC and boehm -IUSE="boehm debug hpc julia julia-gc memcheck valgrind" -REQUIRED_USE="valgrind? ( memcheck ) julia-gc? ( julia ) hpc? ( boehm )" - -RDEPEND+=" - dev-libs/gmp - net-libs/zeromq - sci-libs/cddlib - sys-libs/readline - sys-libs/zlib - julia? ( || ( - dev-lang/julia - dev-lang/julia-bin:* - ) ) - valgrind? ( dev-util/valgrind ) -" -DEPEND+="${RDEPEND}" -BDEPEND+="${PYTHON_DEPS}" - -PATCHES=( "${FILESDIR}"/${PN}-4.11.0-autoconf.patch ) - -pkg_setup() { - if use valgrind; then - elog "If you enable the use of valgrind duing building" - elog "be sure that you have enabled the proper flags" - elog "in gcc to support it:" - elog "https://wiki.gentoo.org/wiki/Debugging#Valgrind" - fi -} - -src_unpack() { - default - mkdir -p "${S}"/pkg || die - mv "${WORKDIR}"/{GAPDoc*,primgrp*,SmallGrp*,transgrp*} "${S}"/pkg || die -} - -src_prepare() { - default - eautoreconf -f -i - - # use GNUmakefile - rm Makefile || die - - # make sure of no external gmp/zlib being build - # gap uses bundled libatomic_ops and boehm-gc - rm -rf extern || die - - # this test takes TOO long - rm tst/teststandard/opers/AutomorphismGroup.tst || die -} - -src_configure() { - addwrite /proc/self - local myconf=( - --enable-shared - --disable-static - --with-gmp - --with-zlib - --with-readline - --enable-popcnt - $(use_enable memcheck memory-checking) - $(use_enable valgrind) - $(use_enable hpc hpcgap) - $(use_enable debug) - $(use_with julia) - ) - # garbage collector settings - if use boehm; then - myconf+=( --with-gc=boehm ) - elif use julia-gc; then - myconf+=( --with-gc=julia ) - else - myconf+=( --with-gc=gasman ) - fi - - # only supporting amd64 builds - econf ${myconf[@]} ABI=64 -} - -src_test() { - emake testinstall testlibgap -} - -src_install() { - # upstream has no install function - # we try to simulate on as best as we can - - dodoc README{,.buildsys,.hpcgap}.md \ - CHANGES.md CITATION - - sed -e "s:^abs_top_builddir=.*$:abs_top_builddir=\"${EPREFIX}/usr/share/gap\":" \ - -e "s:^abs_top_srcdir=.*$:abs_top_srcdir=\"${EPREFIX}/usr/share/gap\":" \ - -i gac || die - dobin gac - - exeinto /usr/share/gap/ - doexe gap - - cat <<-EOF > gap.sh || die - #!/bin/sh - exec "${EPREFIX}"/usr/share/gap/gap -l "${EPREFIX}"/usr/share/gap "\$@" - EOF - newbin gap.sh gap - - dolib.so .libs/libgap.so* - - dodir /usr/include/gap - cp -a src/*.h gen/*.h "${ED}"/usr/include/gap || die - if use hpc; then - dodir /usr/include/gap/hpc - cp -a src/hpc/*.h "${ED}"/usr/include/gap/hpc || die - fi - - cp -a doc grp lib libtool pkg "${ED}"/usr/share/gap || die - - sed -e "s:${S}:${EPREFIX}/usr/share/gap:g" -i sysinfo.gap - insinto /usr/share/gap - doins sysinfo.gap* - - # remove objects and static lib files - find "${ED}" \( -name "*.o" -o -name "*.a" -o -name "*.la" \) \ - -delete || die -} diff --git a/sci-mathematics/gap/metadata.xml b/sci-mathematics/gap/metadata.xml deleted file mode 100644 index f1f953b82..000000000 --- a/sci-mathematics/gap/metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription lang="en"> - Groups, Algorithms, Programming is a system for computational - discrete algebra, with particular emphasis on Computational Group - Theory. GAP provides a programming language, a library of thousands - of functions implementing algebraic algorithms written in the GAP - language as well as large data libraries of algebraic objects. GAP - is used in research and teaching for studying groups and their - representations, rings, vector spaces, algebras, combinatorial - structures, and more. - </longdescription> - <use> - <flag name="boehm">Use <pkg>dev-libs/boehm-gc</pkg> as garbage collector</flag> - <flag name="hpc">Build gap with multithreading and parallel process support</flag> - <flag name="julia">Build julia bindings</flag> - <flag name="julia-gc">Use the julia garbage collector</flag> - <flag name="memcheck">Enable memory checking</flag> - <flag name="valgrind">Build symbols to be used by valgrind</flag> - </use> -</pkgmetadata> diff --git a/sci-mathematics/gappa/Manifest b/sci-mathematics/gappa/Manifest deleted file mode 100644 index 132e4af1c..000000000 --- a/sci-mathematics/gappa/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gappa-1.3.5.tar.gz 412527 BLAKE2B cf3dc69e9ef538cda7eee42c81dfa5cdfb765967745f68dabd5937cb00ea075f6c6b1614afefe10e7dfe69377ec5ba7f5fed5e4d45b45efd4362090a0bb136cb SHA512 60b5719e3a321df43e33045fa8f4511fc02a4218d1ae7e476e7c6ebcf90ae208832881f6eea5b99a3296dfcc3a18c7e1f4ea9dbea446fc502e14306b6975f6e6 -DIST gappa-1.4.0.tar.gz 387988 BLAKE2B f1c4666b3e3048686753a2cee12b64e7d8c4b2007723c364541458e127b0575836d0b831e2a837cb833b0b7d9a609ab708595ac9498d166a8ae67a566347a0f1 SHA512 fe8ee10b74a257b3df8d7c3fdb9095a10a7d5ee5af41b031d5bb9b981db00832a025bc1d6fce92f97f294fc9f3ab846531a864548e57e9fe191c79b828eb6475 diff --git a/sci-mathematics/gappa/gappa-1.3.5.ebuild b/sci-mathematics/gappa/gappa-1.3.5.ebuild deleted file mode 100644 index 58ce7ffe7..000000000 --- a/sci-mathematics/gappa/gappa-1.3.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multiprocessing - -DESCRIPTION="Verifying and proving properties on floating-point or fixed-point arithmetic" -HOMEPAGE="http://gappa.gforge.inria.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38044/${P}.tar.gz" - -LICENSE="|| ( CeCILL-2 GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=" - dev-libs/gmp:0= - dev-libs/mpfr:0= - dev-libs/boost -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_prepare() { - default - sed -i Remakefile.in \ - -e "s:mkdir -p @bindir@:mkdir -p \${DESTDIR}@bindir@:g" \ - -e "s:cp src/gappa @bindir@:cp src/gappa \${DESTDIR}@bindir@:g" -} - -src_compile() { - # Only accept number of parrellel jobs because remake does not understand --load-average - ./remake -d -j$(makeopts_jobs) || die "emake failed" - if use doc; then - ./remake doc/html/index.html - fi -} - -src_install() { - DESTDIR="${D}" ./remake install - einstalldocs - use doc && dodoc -r doc/html/* -} diff --git a/sci-mathematics/gappa/gappa-1.4.0.ebuild b/sci-mathematics/gappa/gappa-1.4.0.ebuild deleted file mode 100644 index 7395c8ea3..000000000 --- a/sci-mathematics/gappa/gappa-1.4.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOCS_BUILDER="doxygen" -DOCS_DIR="doc/doxygen" - -inherit docs multiprocessing - -DESCRIPTION="Verifying and proving properties on floating-point or fixed-point arithmetic" -HOMEPAGE="https://gappa.gitlabpages.inria.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38436/${P}.tar.gz" - -LICENSE="|| ( CeCILL-2 GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/gmp:0= - dev-libs/mpfr:0= - dev-libs/boost -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -i Remakefile.in \ - -e "s:mkdir -p @bindir@:mkdir -p \${DESTDIR}@bindir@:g" \ - -e "s:cp src/gappa @bindir@:cp src/gappa \${DESTDIR}@bindir@:g" || die -} - -src_compile() { - # Only accept number of parrellel jobs because remake does not understand --load-average - ./remake -d -j$(makeopts_jobs) || die "emake failed" - docs_compile -} - -src_install() { - DESTDIR="${D}" ./remake install - einstalldocs -} diff --git a/sci-mathematics/gappa/metadata.xml b/sci-mathematics/gappa/metadata.xml deleted file mode 100644 index 448d16798..000000000 --- a/sci-mathematics/gappa/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> -Gappa is a tool intended to help verifying and formally proving -properties on numerical programs dealing with floating-point or -fixed-point arithmetic. It has been used to write robust floating-point -filters for CGAL and it is used to certify elementary functions in -CRlibm. -</longdescription> -</pkgmetadata> diff --git a/sci-mathematics/gappalib-coq/Manifest b/sci-mathematics/gappalib-coq/Manifest deleted file mode 100644 index aaea09aac..000000000 --- a/sci-mathematics/gappalib-coq/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gappalib-coq-1.4.6.tar.gz 114284 BLAKE2B 2c1b38b324786f20d7503d1c2243b95b7f8b090068563120669de37ef6cd5dc4fa479b5f3e0559372f4d1fdafa833619191c73780adad45056972108a32e1d1e SHA512 bb9c431d320d9c66998ec02ba7d459ee3f00cb7b16f89e57f3d7eb4b89cd3c9254e98e3906a8dfac31f73e5a32918ad12eaeaf7504750d3bfdce878913b745d3 diff --git a/sci-mathematics/gappalib-coq/gappalib-coq-1.4.6.ebuild b/sci-mathematics/gappalib-coq/gappalib-coq-1.4.6.ebuild deleted file mode 100644 index 82b02933c..000000000 --- a/sci-mathematics/gappalib-coq/gappalib-coq-1.4.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Allows the certificates Gappa generates to be imported by the Coq" -HOMEPAGE="http://gappa.gforge.inria.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38386/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - >=sci-mathematics/gappa-1.3.2 - >=sci-mathematics/coq-8.8 - >=sci-mathematics/flocq-3.0 -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i Remakefile.in \ - -e "s:mkdir -p @libdir@:mkdir -p \${DESTDIR}@libdir@:g" \ - -e "s:cp \$(OBJS) \$(MLTARGETS) @libdir@:cp \$(OBJS) \$(MLTARGETS) \${DESTDIR}@libdir@:g" -} - -src_compile() { - ./remake || die "emake failed" -} - -src_install() { - DESTDIR="${D}" ./remake install || die "emake install failed" - einstalldocs -} diff --git a/sci-mathematics/gappalib-coq/metadata.xml b/sci-mathematics/gappalib-coq/metadata.xml deleted file mode 100644 index 182ed0520..000000000 --- a/sci-mathematics/gappalib-coq/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> -While Gappa is intended to be used directly, it can also act as a -backend prover for the Why software verification plateform or as an -automatic tactic for the Coq proof assistant. -</longdescription> -</pkgmetadata> diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest deleted file mode 100644 index 49385c665..000000000 --- a/sci-mathematics/giac/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST giac-1.6.0.47.tar.gz 81226671 BLAKE2B 6c2226772ebbd57589610b0c14221fd6c80baf66bac0972c7be3c03c14e8bf2c838f03609b239125d849380369c9ad978f79e6e802b594f8e3fb4be1e102266f SHA512 bf9b137efd7603e80152a22a665b91df2fb2b62f82037860bbf338ffb01d0af25b0cd06fda04b19bcb2e08fdf7c605931ebd9dcb6344c27f464c7a03262ab2c2 diff --git a/sci-mathematics/giac/files/giac-1.6.0.17-gsl_lapack.patch b/sci-mathematics/giac/files/giac-1.6.0.17-gsl_lapack.patch deleted file mode 100644 index 24d6c8f56..000000000 --- a/sci-mathematics/giac/files/giac-1.6.0.17-gsl_lapack.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1e38e50..6625bc7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,6 +38,7 @@ AC_LANG([C++]) - AC_PROG_LIBTOOL - AC_PROG_YACC - AM_PROG_LEX -+PKG_PROG_PKG_CONFIG - AC_C_BIGENDIAN - - dnl Check for standard C+headers -@@ -145,47 +146,17 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) - - dnl Checking for Gnu Sci Lib --CONFIG_GSL="yes" --AC_ARG_ENABLE([gsl],[ -- AS_HELP_STRING([--enable-gsl], [Use GNU scientific library [[default=yes]]])], -- [ if test "x$enableval" = "xno"; then CONFIG_GSL="no"; fi], []) -- --if test "$CONFIG_GSL" = "yes"; then -- AC_CHECK_HEADERS(gsl/gsl_blas.h) -- AC_CHECK_HEADERS(gsl/gsl_eigen.h) -- if test "$ac_cv_header_gsl_gsl_blas_h" != "yes" -o "$ac_cv_header_gsl_gsl_eigen_h" != "yes"; then -- CONFIG_GSL="no" -- fi --fi --if test "$CONFIG_GSL" = "yes"; then -- save_LIBS="$LIBS" -- AC_CHECK_LIB(gslcblas, main, [], [CONFIG_GSL="no"]) -- AC_CHECK_LIB(gsl, gsl_sf_gamma, [], [CONFIG_GSL="no"]) -- LIBS="$save_LIBS" -- fi --GSL_LIBS="" --if test "$CONFIG_GSL" = "yes"; then -- GSL_LIBS="-lgsl -lgslcblas" -- fi --AC_SUBST(CONFIG_GSL) --AC_SUBST(GSL_LIBS) --AM_CONDITIONAL(CONFIG_GSL, [test "$CONFIG_GSL" = "yes"]) -- --CONFIG_LAPACK="yes" --AC_ARG_ENABLE([lapack], -- [AS_HELP_STRING([--enable-lapack], [Use LAPACK [[default=yes]]])], -- [ if test "$enableval" = "no"; then CONFIG_LAPACK="no"; fi], []) -- --if test "$CONFIG_LAPACK" = "yes"; then --# AC_CHECK_LIB(f2c, main, [], [CONFIG_LAPACK="no"]) --# AC_CHECK_LIB(blas, main, [], [CONFIG_LAPACK="no"]) --# AC_CHECK_LIB(tmglib, main, [], [CONFIG_LAPACK="no"]) -- AC_CHECK_LIB(gfortran, main) -- AC_CHECK_LIB(blas, main) -- AC_CHECK_LIB(lapack, main, [], [CONFIG_LAPACK="no"]) --# AX_BLAS([have_blas=yes],[have_blas=no]) --# AX_LAPACK([have_lapack=yes],[have_lapack=no]) --fi -+PKG_CHECK_MODULES([GSL], [gsl],[ -+ AC_DEFINE(HAVE_LIBGSL,1, [Define if gsl is installed]) -+ AC_SUBST(GSL_LIBS)]) -+ -+PKG_CHECK_MODULES([LAPACK], [lapack],[ -+ AC_DEFINE(HAVE_LIBLAPACK,1,[Define if LAPACK is installed]) -+ AC_SUBST(LAPACK_LIBS)]) -+ -+PKG_CHECK_MODULES([BLAS], [blas],[ -+ AC_DEFINE(HAVE_BLAS,1,[Define if BLAS is installed]) -+ AC_SUBST(BLAS_LIBS)]) - - CONFIG_PARI="yes" - AC_ARG_ENABLE([pari], -diff --git a/src/Makefile.am b/src/Makefile.am -index a142067..2ebcce0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -14,7 +14,7 @@ libgiac_la_SOURCES = input_lexer.ll sym2poly.cc gausspol.cc threaded.cc \ - help.cc lpsolve.cc optimization.cc signalprocessing.cc \ - graphe.cc graphtheory.cc nautywrapper.c markup.cc kdisplay.cc kadd.cc # Ugh.. - --libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) -+libgiac_la_LIBADD = $(NTL_LIBS) $(COCOA_LIBS) $(PARI_LIBS) $(GSL_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) - - giacincludedir = $(includedir)/giac - giacinclude_HEADERS = dispatch.h fraction.h gen.h desolve.h misc.h ti89.h \ diff --git a/sci-mathematics/giac/files/pari_2_11.patch b/sci-mathematics/giac/files/pari_2_11.patch deleted file mode 100644 index 24142257a..000000000 --- a/sci-mathematics/giac/files/pari_2_11.patch +++ /dev/null @@ -1,17 +0,0 @@ -Change test output for PARI 2.11 - -See https://trac.sagemath.org/ticket/25567 -and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102 - -diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1 ---- a/check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200 -+++ b/check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200 -@@ -10,7 +10,7 @@ - 1073741824000000000000000000061203284109000000000000000000000000008409, - 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241, - "Done", --matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]], -+1, - 0, - [], - 1, diff --git a/sci-mathematics/giac/giac-1.6.0.47.ebuild b/sci-mathematics/giac/giac-1.6.0.47.ebuild deleted file mode 100644 index aeb36f76f..000000000 --- a/sci-mathematics/giac/giac-1.6.0.47.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic xdg - -MY_PV="$(ver_rs 3-4 -)" - -DESCRIPTION="A free C++ CAS (Computer Algebra System) library and its interfaces" -HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" -SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${PN}_${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# French documentation is not GPL, and is subject to a non commercial use license, so skipping it. -LANGS="el en es pt" -IUSE="ao doc +ecm examples gc +glpk gui static-libs test" -for X in ${LANGS} ; do - IUSE="${IUSE} l10n_${X}" -done - -RDEPEND=" - dev-libs/gmp:=[cxx] - sys-libs/readline:= - gui? ( - >=x11-libs/fltk-1.1.9 - media-libs/libpng:= - ) - ao? ( media-libs/libao ) - dev-libs/mpfr:= - sci-libs/mpfi - sci-libs/gsl:= - >=sci-mathematics/pari-2.7:=[threads] - dev-libs/ntl:= - virtual/lapack - virtual/blas - net-misc/curl - >=sci-mathematics/nauty-2.6.7 - ecm? ( >=sci-mathematics/gmp-ecm-7.0.0 ) - glpk? ( sci-mathematics/glpk ) - gc? ( dev-libs/boehm-gc )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-tex/hevea - virtual/pkgconfig - virtual/yacc -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0.17-gsl_lapack.patch - "${FILESDIR}"/pari_2_11.patch - ) - -REQUIRED_USE="test? ( gui )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${PN}-$(ver_cut 1-3)" - -src_prepare(){ - default - - eautoreconf -} - -src_configure(){ - if use gui; then - append-cppflags -I$(fltk-config --includedir) - append-lfs-flags - append-libs $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/') || die - fi - - # Using libsamplerate is currently broken - econf \ - --enable-gmpxx \ - --disable-samplerate \ - $(use_enable static-libs static) \ - $(use_enable gui) \ - $(use_enable gui png) \ - $(use_enable ao) \ - $(use_enable ecm) \ - $(use_enable glpk) \ - $(use_enable gc) -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES - if !(use gui); then - rm -rf \ - "${ED}"/usr/bin/x* \ - "${ED}"/usr/share/application-registry \ - "${ED}"/usr/share/applications \ - "${ED}"/usr/share/icons - fi - - if use !doc; then - rm -R "${ED}"/usr/share/doc/giac* "${ED}"/usr/share/giac/doc/ || die - else - for lang in ${LANGS}; do - if use l10n_$lang; then - ln "${ED}"/usr/share/giac/doc/aide_cas "${ED}"/usr/share/giac/doc/"${lang}"/aide_cas || die - else - rm -rf "${ED}"/usr/share/giac/doc/"${lang}" - fi - done - # Deleting French documentation for copyright reasons - rm -rf "${ED}"/usr/share/giac/doc/fr - fi - - if use !examples; then - rm -R "${ED}"/usr/share/giac/examples || die - fi - - # remove .la file - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/giac/metadata.xml b/sci-mathematics/giac/metadata.xml deleted file mode 100644 index 7b8a11df2..000000000 --- a/sci-mathematics/giac/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> - Giac is a free computer algebra system that can be used to perform - computer algebra, function graphs, interactive geometry (2-d and 3-d), - spreadsheet and statistics, programmation. It may be used as a replacement - for high end graphic calculators for example on netbooks (for about - the same price as a calculator but with much more performances). - </longdescription> - <use> - <flag name="glpk">Enable the use of <pkg>sci-mathematics/glpk</pkg></flag> - <flag name="ecm">Enable the use of <pkg>sci-mathematics/gmp-ecm</pkg></flag> - <flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag> - </use> -</pkgmetadata> diff --git a/sci-mathematics/lie/lie-2.2.2.ebuild b/sci-mathematics/lie/lie-2.2.2.ebuild index 9577bf240..173e0715e 100644 --- a/sci-mathematics/lie/lie-2.2.2.ebuild +++ b/sci-mathematics/lie/lie-2.2.2.ebuild @@ -21,7 +21,7 @@ RDEPEND=" sys-libs/ncurses:= " DEPEND="${RDEPEND}" -BDEPEND="${RDEPEND} +BDEPEND=" sys-devel/bison " diff --git a/sci-mathematics/ltl2ba/Manifest b/sci-mathematics/ltl2ba/Manifest index 4d6528d6b..659c1c6e6 100644 --- a/sci-mathematics/ltl2ba/Manifest +++ b/sci-mathematics/ltl2ba/Manifest @@ -1 +1,3 @@ DIST ltl2ba-1.1.tar.gz 29629 BLAKE2B 06ba7f7b5e3c6b72d2f0ea3b991346c803669e24d66dc38e311109ee08ed6dcc72bfd9f2ebe0f8864b0f80f010a4438029f4f5dbbf0087469ca2d07cdfce6b3f SHA512 8d010e2bb59fa5d682a56a50133865da938fd3bfcde6386184880eec6989bc1b694d6af9146b4b708cefdcdbcf98248f87074b8c973ea8cab65d658b394ccf69 +DIST ltl2ba-1.2.tar.gz 33026 BLAKE2B f19359e33d4eeb4dde75425ed03d940c08f46dd265b1b9c6773807e7dca67fd44f694f685d4153ca786118e336fab736104a865c5d0e9883390fca694f72b492 SHA512 148ffb1b4dbe134b69c6e946a4a9f1a95a809bf36ef3533117eedeceb721dd4c8a3238bbda2de5782a79b7aee70e33adf6ff193917441092a1ccb4e56a53a655 +DIST ltl2ba-1.3.tar.gz 38265 BLAKE2B bd74d9b9e22589ac00fbaa15f745dd6371894f68b50f85507694648274d9391ad3a90cdf1ee6c342abbceb04d0e2eb5d71473d43969b469a933517cfcd1e16c1 SHA512 1bcef13d98879c083dc907939c652e694802ed91c33a5d90bbeb6fc22d6265a0b153932c5fb3f8557aad30582322c16d0be822bf4208f40faf9384b367a84aa6 diff --git a/sci-mathematics/ltl2ba/ltl2ba-1.2.ebuild b/sci-mathematics/ltl2ba/ltl2ba-1.2.ebuild new file mode 100644 index 000000000..0678dcf8e --- /dev/null +++ b/sci-mathematics/ltl2ba/ltl2ba-1.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Fast LTL to Buechi Automata Translation" +HOMEPAGE="http://www.lsv.ens-cachan.fr/~gastin/ltl2ba" +SRC_URI="http://www.lsv.ens-cachan.fr/~gastin/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + sed -i Makefile \ + -e "s/CC=gcc/#CC=gcc/g" \ + -e "s/CFLAGS= -O3 -ansi -DNXT/CFLAGS+= -ansi -DNXT/g" || die +} + +src_configure() { + append-cflags -fcommon + default +} + +src_install() { + dobin ltl2ba + dodoc README +} diff --git a/sci-mathematics/ltl2ba/ltl2ba-1.3.ebuild b/sci-mathematics/ltl2ba/ltl2ba-1.3.ebuild new file mode 100644 index 000000000..0678dcf8e --- /dev/null +++ b/sci-mathematics/ltl2ba/ltl2ba-1.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Fast LTL to Buechi Automata Translation" +HOMEPAGE="http://www.lsv.ens-cachan.fr/~gastin/ltl2ba" +SRC_URI="http://www.lsv.ens-cachan.fr/~gastin/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + sed -i Makefile \ + -e "s/CC=gcc/#CC=gcc/g" \ + -e "s/CFLAGS= -O3 -ansi -DNXT/CFLAGS+= -ansi -DNXT/g" || die +} + +src_configure() { + append-cflags -fcommon + default +} + +src_install() { + dobin ltl2ba + dodoc README +} diff --git a/sci-mathematics/netgen/Manifest b/sci-mathematics/netgen/Manifest deleted file mode 100644 index 4da893b4b..000000000 --- a/sci-mathematics/netgen/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netgen-5.3.1.tar.gz 1857185 BLAKE2B 943c0d94f9f74d9d83674bde416ad63d2b0b1eb1029d901504d95285530998e03a92b6e71b4d844aab541c3e6a533613f0e90e4343c38f20f28321118b8e73c5 SHA512 6f5b5b8ab47fc3bf57281b26f26b13675aa719146c90a928eda3d704163e20a0a3baf27d520978ec6c4828ee6323eaef65deb851988eefef5d768a9ecad69fc8 -DIST netgen-6.0-beta.tar.gz 1914050 BLAKE2B c7549d7344e3f514c3df6c6f213720fd2fdf1d0f403ffa4225ff470b3a1a7235bfea695de56e8718a1e1e9f0aebf311063bf1aae85f5cddd3df6d8b38e70077b SHA512 ce540f609a50ec7bb01aa2494a4a46885929367f2cdf4ee5842149ba0dec7a6b913cb92b283fd2b3fc9b5ba653ad2628ce5ea4423f94c6339a4f54941be02cf4 diff --git a/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch b/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch deleted file mode 100644 index ce581cee3..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- libsrc/occ/Partition_Spliter.cxx.old 2012-11-14 16:14:39.440625195 +0100 -+++ libsrc/occ/Partition_Spliter.cxx 2012-11-14 16:15:20.035646075 +0100 -@@ -1169,8 +1169,8 @@ - for (; j<=nbj && ok; ++j) { - if (Extrema.IsMin(j)) { - hasMin = Standard_True; -- ok = Extrema.Value(j) <= tol; // V6.3 -- // ok = Extrema.SquareDistance(j) <= tol; // V6.5 -+ // ok = Extrema.Value(j) <= tol; // V6.3 -+ ok = Extrema.SquareDistance(j) <= tol; // V6.5 - } - } - } ---- libsrc/occ/Partition_Inter3d.cxx.old 2012-11-14 16:13:11.149581085 +0100 -+++ libsrc/occ/Partition_Inter3d.cxx 2012-11-14 16:14:20.017615214 +0100 -@@ -243,9 +243,9 @@ - Standard_Integer i, nbExt = anExtPS.NbExt(); - Extrema_POnSurf aPOnSurf; - for (i = 1; i <= nbExt; ++i ) -- if (anExtPS.Value( i ) <= TolE) // V6.3 -- // if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 -- { -+ // if (anExtPS.Value( i ) <= TolE) // V6.3 -+ if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 -+ { - aPOnSurf = anExtPS.Point( i ); - break; - } diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch deleted file mode 100644 index 5cb399edb..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.cpp netgen/libsrc/meshing/meshtype.cpp ---- netgen-5.3.1/libsrc/meshing/meshtype.cpp 2016-02-20 21:55:59.226450843 +0100 -+++ netgen/libsrc/meshing/meshtype.cpp 2016-02-20 23:54:12.293646166 +0100 -@@ -1,4 +1,5 @@ - #include <mystdlib.h> -+#include <float.h> // to get DBL_MIN defined - - #include "meshing.hpp" - -@@ -666,7 +667,8 @@ - - double det = trans.Det(); - -- if (det <= 0) -+ // if (det <= 0) -+ if (det <= DBL_MIN) // avoid FPE - err += 1e12; - else - err += frob * frob / det; -@@ -722,7 +724,8 @@ - - double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1); - -- if (det <= 0) -+ // if (det <= 0) -+ if (det <= DBL_MIN) // avoid FPE - { - dd = 0; - return 1e12; -@@ -806,7 +809,8 @@ - = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0) - + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0); - -- if (det <= 0) -+ // if (det <= 0) -+ if (det <= DBL_MIN) // avoid FPE - err += 1e12; - else - { -@@ -856,7 +860,8 @@ - frob /= 2; - - double det = trans.Det(); -- if (det <= 0) -+ //if (det <= 0) -+ if (det <= DBL_MIN) // avoid FPE - err += 1e12; - else - err += frob * frob / det; -@@ -1864,7 +1869,8 @@ - case PYRAMID: - { - double noz = 1-p(2); -- if (noz == 0.0) noz = 1e-10; -+ //if (noz == 0.0) noz = 1e-10; -+ if (noz <= DBL_MIN) noz = 1e-10; // avoid FPE - - double xi = p(0) / noz; - double eta = p(1) / noz; -@@ -2513,10 +2519,10 @@ - - MeshingParameters :: MeshingParameters () - { -- optimize3d = "cmdmustm"; -+ optimize3d = (char*)"cmdmustm"; // optimize3d = "cmdmustm"; - //optimize3d = "cmdmstm"; - optsteps3d = 3; -- optimize2d = "smsmsmSmSmSm"; -+ optimize2d = (char*)"smsmsmSmSmSm"; // optimize2d = "smsmsmSmSmSm"; - optsteps2d = 3; - opterrpow = 2; - blockfill = 1; -diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.hpp netgen/libsrc/meshing/meshtype.hpp ---- netgen-5.3.1/libsrc/meshing/meshtype.hpp 2016-02-20 21:55:59.226450843 +0100 -+++ netgen/libsrc/meshing/meshtype.hpp 2016-02-20 23:54:12.295646166 +0100 -@@ -15,6 +15,7 @@ - Classes for NETGEN - */ - -+class Mesh; // added due to compilation errors on some platforms - - - enum ELEMENT_TYPE { -diff -uwrN netgen-5.3.1/libsrc/meshing/smoothing2.cpp netgen/libsrc/meshing/smoothing2.cpp ---- netgen-5.3.1/libsrc/meshing/smoothing2.cpp 2016-02-20 21:55:59.228450843 +0100 -+++ netgen/libsrc/meshing/smoothing2.cpp 2016-02-20 23:54:12.298646166 +0100 -@@ -361,7 +361,8 @@ - vgrad = 0; - double badness = 0; - -- ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n); -+ //normal already computed: ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n); -+ n = ld.normal; - pp1 = ld.sp1 + x(0) * ld.t1 + x(1) * ld.t2; - - // meshthis -> ProjectPoint (surfi, pp1); -@@ -577,7 +578,8 @@ - vgrad = 0; - badness = 0; - -- ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n); -+ //normal already computed: ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n); -+ n = ld.normal; - - pp1 = ld.sp1 + x(0) * ld.t1 + x(1) * ld.t2; - -@@ -649,7 +651,8 @@ - vgrad = 0; - badness = 0; - -- ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n); -+ //normal already computed: ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n); -+ n = ld.normal; - - // pp1 = sp1; - // pp1.Add2 (x.Get(1), t1, x.Get(2), t2); -diff -uwrN netgen-5.3.1/libsrc/occ/occconstruction.cpp netgen/libsrc/occ/occconstruction.cpp ---- netgen-5.3.1/libsrc/occ/occconstruction.cpp 2016-02-20 21:53:44.420447131 +0100 -+++ netgen/libsrc/occ/occconstruction.cpp 2016-02-20 23:54:12.299646166 +0100 -@@ -28,7 +28,7 @@ - #include <BRepAlgoAPI_Common.hxx> - #include <BRepAlgoAPI_Fuse.hxx> - #include <BRepAlgoAPI_Section.hxx> --#include <BRepOffsetAPI_Sewing.hxx> -+//#include <BRepOffsetAPI_Sewing.hxx> - //#include <BRepAlgo_Sewing.hxx> - #include <BRepOffsetAPI_MakeOffsetShape.hxx> - #include <ShapeFix_Shape.hxx> -diff -uwrN netgen-5.3.1/libsrc/occ/occmeshsurf.cpp netgen/libsrc/occ/occmeshsurf.cpp ---- netgen-5.3.1/libsrc/occ/occmeshsurf.cpp 2016-02-20 21:53:44.421447131 +0100 -+++ netgen/libsrc/occ/occmeshsurf.cpp 2016-02-20 23:54:12.310646166 +0100 -@@ -6,6 +6,7 @@ - #include <meshing.hpp> - #include <GeomLProp_SLProps.hxx> - #include <ShapeAnalysis_Surface.hxx> -+#include <GeomAPI_ProjectPointOnCurve.hxx> // -- moved here from occgeom.hpp - - - namespace netgen -@@ -689,7 +691,7 @@ - } - - newp = hnewp; -- } -+ }//; -- to compile with -Wall -pedantic - - - void OCCRefinementSurfaces :: - - -diff -uwrN netgen-5.3.1/libsrc/occ/Partition_Inter3d.cxx netgen/libsrc/occ/Partition_Inter3d.cxx ---- netgen-5.3.1/libsrc/occ/Partition_Inter3d.cxx 2016-02-20 21:53:44.418447131 +0100 -+++ netgen/libsrc/occ/Partition_Inter3d.cxx 2016-02-20 23:54:12.311646166 +0100 -@@ -243,8 +243,10 @@ - Standard_Integer i, nbExt = anExtPS.NbExt(); - Extrema_POnSurf aPOnSurf; - for (i = 1; i <= nbExt; ++i ) -+ // porting to OCCT6.5.1 - // if (anExtPS.Value( i ) <= TolE) // V6.3 -- if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 -+ // if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 -+ if (anExtPS.SquareDistance( i ) <= TolE * TolE) - { - aPOnSurf = anExtPS.Point( i ); - break; -diff -uwrN netgen-5.3.1/libsrc/occ/Partition_Spliter.cxx netgen/libsrc/occ/Partition_Spliter.cxx ---- netgen-5.3.1/libsrc/occ/Partition_Spliter.cxx 2016-02-20 21:53:44.420447131 +0100 -+++ netgen/libsrc/occ/Partition_Spliter.cxx 2016-02-20 23:54:12.313646166 +0100 -@@ -1169,8 +1169,10 @@ - for (; j<=nbj && ok; ++j) { - if (Extrema.IsMin(j)) { - hasMin = Standard_True; -+ // porting to OCCT6.5.1 - // ok = Extrema.Value(j) <= tol; // V6.3 -- ok = Extrema.SquareDistance(j) <= tol; // V6.5 -+ // ok = Extrema.SquareDistance(j) <= tol; // V6.5 -+ ok = Extrema.SquareDistance(j) <= tol * tol; - } - } - } -diff -uwrN netgen-5.3.1/libsrc/occ/utilities.h netgen/libsrc/occ/utilities.h ---- netgen-5.3.1/libsrc/occ/utilities.h 2016-02-20 21:53:44.421447131 +0100 -+++ netgen/libsrc/occ/utilities.h 2016-02-20 23:54:12.314646166 +0100 -@@ -33,6 +33,7 @@ - - #include <string> - #include <iostream> -+#include <iomanip> - #include <cstdlib> - // #include "SALOME_Log.hxx" - -diff -uwrN netgen-5.3.1/libsrc/stlgeom/stlgeommesh.cpp netgen/libsrc/stlgeom/stlgeommesh.cpp ---- netgen-5.3.1/libsrc/stlgeom/stlgeommesh.cpp 2016-02-20 21:55:59.234450844 +0100 -+++ netgen/libsrc/stlgeom/stlgeommesh.cpp 2016-02-20 23:54:12.315646166 +0100 -@@ -1435,7 +1435,8 @@ - /* - if (!optstring || strlen(optstring) == 0) - { -- mparam.optimize2d = "smcm"; -+ //mparam.optimize2d = (char*)"smcm"; -+ mparam.optimize2d = (char*)"smcm"; - } - else - { -@@ -1453,7 +1454,7 @@ - mesh -> LoadLocalMeshSize (mparam.meshsizefilename); - mesh -> CalcLocalHFromSurfaceCurvature (mparam.grading, - stlparam.resthsurfmeshcurvfac); -- mparam.optimize2d = "cmsmSm"; -+ mparam.optimize2d = "(char*)cmsmSm"; - STLSurfaceOptimization (*stlgeometry, *mesh, mparam); - #ifdef STAT_STREAM - (*statout) << GetTime() << " & "; -@@ -1560,7 +1561,8 @@ - /* - if (!optstring || strlen(optstring) == 0) - { -- mparam.optimize3d = "cmdmstm"; -+ //mparam.optimize3d = "cmdmstm"; -+ mparam.optimize3d = (char*)"cmdmstm"; - } - else - { diff --git a/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch deleted file mode 100644 index 650b575c9..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -uwrN -x.git netgen-5.3.1/libsrc/include/meshing.hpp netgen/libsrc/include/meshing.hpp ---- netgen-5.3.1/libsrc/include/meshing.hpp 2016-02-21 20:12:55.885186643 +0100 -+++ netgen/libsrc/include/meshing.hpp 2016-02-21 20:09:26.275180871 +0100 -@@ -1 +1 @@ --#include <../meshing/meshing.hpp> -+#include "../meshing/meshing.hpp" -diff -uwrN -x.git netgen-5.3.1/libsrc/include/myadt.hpp netgen/libsrc/include/myadt.hpp ---- netgen-5.3.1/libsrc/include/myadt.hpp 2016-02-21 20:12:55.886186643 +0100 -+++ netgen/libsrc/include/myadt.hpp 2016-02-21 20:09:26.275180871 +0100 -@@ -1 +1 @@ --#include <../general/myadt.hpp> -+#include "../general/myadt.hpp" -diff -uwrN -x.git netgen-5.3.1/libsrc/include/stlgeom.hpp netgen/libsrc/include/stlgeom.hpp ---- netgen-5.3.1/libsrc/include/stlgeom.hpp 2016-02-21 20:12:55.886186643 +0100 -+++ netgen/libsrc/include/stlgeom.hpp 2016-02-21 20:09:26.275180871 +0100 -@@ -1 +1 @@ --#include <../stlgeom/stlgeom.hpp> -+#include "../stlgeom/stlgeom.hpp" -diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp netgen/libsrc/meshing/parallelmesh.cpp ---- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:12:55.888186643 +0100 -+++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:09:26.276180871 +0100 -@@ -1,6 +1,6 @@ - #ifdef PARALLEL - --#include <meshing.hpp> -+#include "meshing.hpp" - #include "paralleltop.hpp" - - // #define METIS4 diff --git a/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch deleted file mode 100644 index b6c8fd4c1..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch +++ /dev/null @@ -1,412 +0,0 @@ -diff -uwrN -x.git netgen-5.3.1/configure.ac netgen/configure.ac ---- netgen-5.3.1/configure.ac 2016-02-21 21:40:41.852331652 +0100 -+++ netgen/configure.ac 2016-02-21 21:39:31.355329711 +0100 -@@ -14,7 +14,6 @@ - AC_DISABLE_STATIC - - AC_LANG([C++]) --AM_PROG_AR - AC_PROG_CXX - - AC_OPENMP -@@ -36,15 +35,15 @@ - [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])], - [occdir=$withval] - [occon=true], -- [occdir=/opt/OpenCASCADE] -+ [occdir=$CASROOT] - ) - - - - if test a$occon = atrue ; then - -- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"]) -- AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) -+ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc"]) -+ AC_SUBST([OCCLIBS], ["-lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) - - # -lTKDCAF - -@@ -90,18 +89,18 @@ - [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])], - [if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi]) - --metisdir=/usr/local -+metisdir=/usr - AC_ARG_WITH([metis], - [AC_HELP_STRING([--with-metis=dir],[path to metis 5.x])], - [metisdir=$withval], -- [metisdir=/usr/local] -+ [metisdir=/usr] - ) - - AC_ARG_ENABLE([parallel], - [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], -- [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")] -+ [AC_SUBST([MPI_INCLUDES], "-DMETIS")] - [CXXFLAGS="$CXXFLAGS -DPARALLEL"] -- [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")] -+ [AC_SUBST([MPI_LIBS], "-lmetis")] - ) - # -DVTRACE - # -lvt-hyb -diff -uwrN -x.git netgen-5.3.1/libsrc/csg/Makefile.am netgen/libsrc/csg/Makefile.am ---- netgen-5.3.1/libsrc/csg/Makefile.am 2016-02-21 21:40:41.852331652 +0100 -+++ netgen/libsrc/csg/Makefile.am 2016-02-21 21:39:31.355329711 +0100 -@@ -8,24 +8,24 @@ - AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) - METASOURCES = AUTO - --lib_LTLIBRARIES = libcsg.la -+lib_LTLIBRARIES = libngcsg.la - - --libcsg_la_SOURCES = algprim.cpp brick.cpp \ -+libngcsg_la_SOURCES = algprim.cpp brick.cpp \ - bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \ - explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \ - manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \ - solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp - --libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la -+libngcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la - - - - if NGGUI --lib_LTLIBRARIES += libcsgvis.la -+lib_LTLIBRARIES += libngcsgvis.la - --libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp --libcsgvis_la_LIBADD = libcsg.la -+libngcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp -+libngcsgvis_la_LIBADD = libngcsg.la - endif - - # $(top_builddir)/libsrc/geom2d/libgeom2d.la -diff -uwrN -x.git netgen-5.3.1/libsrc/general/Makefile.am netgen/libsrc/general/Makefile.am ---- netgen-5.3.1/libsrc/general/Makefile.am 2016-02-21 21:40:41.852331652 +0100 -+++ netgen/libsrc/general/Makefile.am 2016-02-21 21:39:31.356329711 +0100 -@@ -4,8 +4,8 @@ - - AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include - METASOURCES = AUTO --noinst_LTLIBRARIES = libgen.la --libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ -+noinst_LTLIBRARIES = libnggen.la -+libnggen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ - hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ - profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \ - mpi_interface.cpp gzstream.cpp -diff -uwrN -x.git netgen-5.3.1/libsrc/geom2d/Makefile.am netgen/libsrc/geom2d/Makefile.am ---- netgen-5.3.1/libsrc/geom2d/Makefile.am 2016-02-21 21:40:41.852331652 +0100 -+++ netgen/libsrc/geom2d/Makefile.am 2016-02-21 21:39:31.356329711 +0100 -@@ -4,18 +4,18 @@ - - METASOURCES = AUTO - --lib_LTLIBRARIES = libgeom2d.la -+lib_LTLIBRARIES = libnggeom2d.la - - if NGGUI --lib_LTLIBRARIES += libgeom2dvis.la -+lib_LTLIBRARIES += libnggeom2dvis.la - endif - - - --libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp --libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la -+libnggeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp -+libnggeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) - --libgeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp --libgeom2dvis_la_LIBADD = libgeom2d.la -+libnggeom2dvis_la_SOURCES = geom2dpkg.cpp vsgeom2d.cpp -+libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS) - - -diff -uwrN -x.git netgen-5.3.1/libsrc/gprim/Makefile.am netgen/libsrc/gprim/Makefile.am ---- netgen-5.3.1/libsrc/gprim/Makefile.am 2016-02-21 21:40:41.853331652 +0100 -+++ netgen/libsrc/gprim/Makefile.am 2016-02-21 21:39:31.357329711 +0100 -@@ -2,6 +2,6 @@ - - AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include - METASOURCES = AUTO --noinst_LTLIBRARIES = libgprim.la --libgprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ -+noinst_LTLIBRARIES = libnggprim.la -+libnggprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ - geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp -diff -uwrN -x.git netgen-5.3.1/libsrc/interface/Makefile.am netgen/libsrc/interface/Makefile.am ---- netgen-5.3.1/libsrc/interface/Makefile.am 2016-02-21 21:40:41.853331652 +0100 -+++ netgen/libsrc/interface/Makefile.am 2016-02-21 21:39:31.357329711 +0100 -@@ -2,14 +2,14 @@ - - AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(MPI_INCLUDES) $(TCL_INCLUDES) -DOPENGL - METASOURCES = AUTO --lib_LTLIBRARIES = libinterface.la --libinterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \ -+lib_LTLIBRARIES = libnginterface.la -+libnginterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \ - read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ - writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp \ - writepermas.cpp writetecplot.cpp writetet.cpp writetochnog.cpp writeuser.cpp \ - wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp - - --libinterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la -+libnginterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la - - # libinterface_la_LDFLAGS = -rdynamic -diff -uwrN -x.git netgen-5.3.1/libsrc/linalg/Makefile.am netgen/libsrc/linalg/Makefile.am ---- netgen-5.3.1/libsrc/linalg/Makefile.am 2016-02-21 21:40:41.853331652 +0100 -+++ netgen/libsrc/linalg/Makefile.am 2016-02-21 21:39:31.357329711 +0100 -@@ -1,8 +1,8 @@ - noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp - AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include - METASOURCES = AUTO --noinst_LTLIBRARIES = libla.la --libla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp -+noinst_LTLIBRARIES = libngla.la -+libngla_la_SOURCES = densemat.cpp polynomial.cpp bfgs.cpp linopt.cpp linsearch.cpp - - # vector.cpp - -diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/Makefile.am netgen/libsrc/meshing/Makefile.am ---- netgen-5.3.1/libsrc/meshing/Makefile.am 2016-02-21 21:40:41.853331652 +0100 -+++ netgen/libsrc/meshing/Makefile.am 2016-02-21 21:39:31.358329711 +0100 -@@ -15,9 +15,9 @@ - - METASOURCES = AUTO - --lib_LTLIBRARIES = libmesh.la -+lib_LTLIBRARIES = libngmesh.la - --libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ -+libngmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ - clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp \ - geomsearch.cpp global.cpp hprefinement.cpp improve2.cpp \ - improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \ -@@ -30,8 +30,8 @@ - topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp \ - parallelmesh.cpp paralleltop.cpp paralleltop.hpp basegeom.cpp - --libmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libla.la \ -- $(top_builddir)/libsrc/gprim/libgprim.la \ -- $(top_builddir)/libsrc/general/libgen.la \ -- -lz -+libngmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libngla.la \ -+ $(top_builddir)/libsrc/gprim/libnggprim.la \ -+ $(top_builddir)/libsrc/general/libnggen.la \ -+ $(MPI_LIBS) -lz - -diff -uwrN -x.git netgen-5.3.1/libsrc/occ/Makefile.am netgen/libsrc/occ/Makefile.am ---- netgen-5.3.1/libsrc/occ/Makefile.am 2016-02-21 21:40:41.853331652 +0100 -+++ netgen/libsrc/occ/Makefile.am 2016-02-21 21:39:31.358329711 +0100 -@@ -14,20 +14,20 @@ - - METASOURCES = AUTO - --lib_LTLIBRARIES = libocc.la -+lib_LTLIBRARIES = libngocc.la - - if NGGUI --lib_LTLIBRARIES += liboccvis.la -+lib_LTLIBRARIES += libngoccvis.la - endif - - --libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ -+libngocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ - Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \ - occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp - --libocc_la_LIBADD = $(OCCLIBS) -+libngocc_la_LIBADD = $(OCCLIBS) - --liboccvis_la_SOURCES = occpkg.cpp vsocc.cpp --liboccvis_la_LIBADD = libocc.la -+libngoccvis_la_SOURCES = occpkg.cpp vsocc.cpp -+libngoccvis_la_LIBADD = libngocc.la $(TCL_LIB_SPEC) - - -diff -uwrN -x.git netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen/libsrc/stlgeom/Makefile.am ---- netgen-5.3.1/libsrc/stlgeom/Makefile.am 2016-02-21 21:40:41.854331653 +0100 -+++ netgen/libsrc/stlgeom/Makefile.am 2016-02-21 21:39:31.359329711 +0100 -@@ -4,18 +4,18 @@ - AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) - METASOURCES = AUTO - --lib_LTLIBRARIES = libstl.la -+lib_LTLIBRARIES = libngstl.la - - if NGGUI --lib_LTLIBRARIES += libstlvis.la -+lib_LTLIBRARIES += libngstlvis.la - endif - --libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ -+libngstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ - stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp - - --libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp --libstlvis_la_LIBADD = libstl.la --libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la -+libngstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp -+libngstlvis_la_LIBADD = libngstl.la -lGL $(MPI_LIBS) $(TCL_LIB_SPEC) -+libngstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS) - # libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la - -diff -uwrN -x.git netgen-5.3.1/libsrc/visualization/Makefile.am netgen/libsrc/visualization/Makefile.am ---- netgen-5.3.1/libsrc/visualization/Makefile.am 2016-02-21 21:40:41.854331653 +0100 -+++ netgen/libsrc/visualization/Makefile.am 2016-02-21 21:39:31.359329711 +0100 -@@ -7,11 +7,11 @@ - METASOURCES = AUTO - - if NGGUI --noinst_LTLIBRARIES = libvisual.la -+noinst_LTLIBRARIES = libngvisual.la - endif - - --libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ -+libngvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ - vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp - -- -+libngvisual_la_LIBADD = -lGL -diff -uwrN -x.git netgen-5.3.1/libsrc/visualization/Makefile.in netgen/libsrc/visualization/Makefile.in ---- netgen-5.3.1/libsrc/visualization/Makefile.in 2016-02-21 21:40:41.855331653 +0100 -+++ netgen/libsrc/visualization/Makefile.in 2016-02-21 21:39:31.360329711 +0100 -@@ -275,7 +275,7 @@ - visual.hpp vssolution.hpp - - include_HEADERS = soldata.hpp --AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) -+AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) - METASOURCES = AUTO - @NGGUI_TRUE@noinst_LTLIBRARIES = libvisual.la - libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \ -diff -uwrN -x.git netgen-5.3.1/ng/Makefile.am netgen/ng/Makefile.am ---- netgen-5.3.1/ng/Makefile.am 2016-02-21 21:40:41.855331653 +0100 -+++ netgen/ng/Makefile.am 2016-02-21 21:39:31.360329711 +0100 -@@ -1,6 +1,6 @@ - include_HEADERS = - --AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) -+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) - - - if NGGUI -@@ -17,21 +17,18 @@ - endif - # -lpardiso500-GNU472-X86-64 -lgfortran - --netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \ -- $(top_builddir)/libsrc/csg/libcsgvis.la \ -- $(top_builddir)/libsrc/csg/libcsg.la \ -- $(top_builddir)/libsrc/interface/libinterface.la \ -- $(top_builddir)/libsrc/meshing/libmesh.la \ -- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) -- -- --# --# $(top_builddir)/libsrc/occ/liboccvis.la --# $(top_builddir)/libsrc/occ/libocc.la --# $(top_builddir)/libsrc/stlgeom/libstlvis.la --# $(top_builddir)/libsrc/stlgeom/libstl.la --# $(top_builddir)/libsrc/geom2d/libgeom2d.la --# $(top_builddir)/libsrc/geom2d/libgeom2dvis.la -+netgen_LDADD = $(top_builddir)/libsrc/visualization/libngvisual.la \ -+ $(top_builddir)/libsrc/csg/libngcsgvis.la \ -+ $(top_builddir)/libsrc/csg/libngcsg.la \ -+ $(top_builddir)/libsrc/interface/libnginterface.la \ -+ $(top_builddir)/libsrc/meshing/libngmesh.la \ -+ $(top_builddir)/libsrc/occ/libngoccvis.la \ -+ $(top_builddir)/libsrc/occ/libngocc.la \ -+ $(top_builddir)/libsrc/stlgeom/libngstlvis.la \ -+ $(top_builddir)/libsrc/stlgeom/libngstl.la \ -+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ -+ $(top_builddir)/libsrc/geom2d/libnggeom2dvis.la \ -+ -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 -ldl -lX11 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) - - - # add for static linkage of ngsolve: -diff -uwrN -x.git netgen-5.3.1/ng/Makefile.in netgen/ng/Makefile.in ---- netgen-5.3.1/ng/Makefile.in 2016-02-21 21:40:41.856331653 +0100 -+++ netgen/ng/Makefile.in 2016-02-21 21:39:31.361329711 +0100 -@@ -302,7 +302,7 @@ - include_HEADERS = - AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include \ - -I$(top_srcdir)/libsrc/interface -DOPENGL \ -- -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) \ -+ $(TCL_INCLUDES) $(MPI_INCLUDES) \ - $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(am__append_1) - netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h - @NGMKL_TRUE@MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def -diff -uwrN -x.git netgen-5.3.1/nglib/Makefile.am netgen/nglib/Makefile.am ---- netgen-5.3.1/nglib/Makefile.am 2016-02-21 21:40:41.856331653 +0100 -+++ netgen/nglib/Makefile.am 2016-02-21 21:39:31.362329711 +0100 -@@ -8,15 +8,15 @@ - libnglib_la_SOURCES = nglib.cpp - - libnglib_la_LIBADD = \ -- $(top_builddir)/libsrc/interface/libinterface.la \ -- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ -- $(top_builddir)/libsrc/csg/libcsg.la \ -- $(top_builddir)/libsrc/stlgeom/libstl.la \ -- $(top_builddir)/libsrc/occ/libocc.la \ -- $(top_builddir)/libsrc/meshing/libmesh.la \ -+ $(top_builddir)/libsrc/interface/libnginterface.la \ -+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ -+ $(top_builddir)/libsrc/csg/libngcsg.la \ -+ $(top_builddir)/libsrc/stlgeom/libngstl.la \ -+ $(top_builddir)/libsrc/occ/libngocc.la \ -+ $(top_builddir)/libsrc/meshing/libngmesh.la \ - $(OCCLIBS) $(MPI_LIBS) - --libnglib_la_LDFLAGS = -avoid-version -+libnglib_la_LDFLAGS = -release $(PACKAGE_VERSION) - # -rdynamic - - -@@ -25,24 +25,24 @@ - - ng_vol_SOURCES = ng_vol.cpp - ng_vol_LDADD = libnglib.la \ -- $(top_builddir)/libsrc/interface/libinterface.la \ -- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ -- $(top_builddir)/libsrc/csg/libcsg.la \ -- $(top_builddir)/libsrc/stlgeom/libstl.la \ -- $(top_builddir)/libsrc/occ/libocc.la \ -- $(top_builddir)/libsrc/meshing/libmesh.la \ -+ $(top_builddir)/libsrc/interface/libnginterface.la \ -+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ -+ $(top_builddir)/libsrc/csg/libngcsg.la \ -+ $(top_builddir)/libsrc/stlgeom/libngstl.la \ -+ $(top_builddir)/libsrc/occ/libngocc.la \ -+ $(top_builddir)/libsrc/meshing/libngmesh.la \ - $(OCCLIBS) $(MPI_LIBS) - - - - ng_stl_SOURCES = ng_stl.cpp - ng_stl_LDADD = libnglib.la \ -- $(top_builddir)/libsrc/interface/libinterface.la \ -- $(top_builddir)/libsrc/geom2d/libgeom2d.la \ -- $(top_builddir)/libsrc/csg/libcsg.la \ -- $(top_builddir)/libsrc/stlgeom/libstl.la \ -- $(top_builddir)/libsrc/occ/libocc.la \ -- $(top_builddir)/libsrc/meshing/libmesh.la \ -+ $(top_builddir)/libsrc/interface/libnginterface.la \ -+ $(top_builddir)/libsrc/geom2d/libnggeom2d.la \ -+ $(top_builddir)/libsrc/csg/libngcsg.la \ -+ $(top_builddir)/libsrc/stlgeom/libngstl.la \ -+ $(top_builddir)/libsrc/occ/libngocc.la \ -+ $(top_builddir)/libsrc/meshing/libngmesh.la \ - $(OCCLIBS) $(MPI_LIBS) - - # ng_occ_SOURCES = ng_occ.cpp diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch deleted file mode 100644 index cf59613e4..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp 2014-08-29 11:54:05.000000000 +0200 -+++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-20 23:07:00.350568182 +0100 -@@ -14,7 +14,7 @@ - - #if METIS_VER_MAJOR >= 5 - #define METIS5 -- typedef idx_t idxtype; -+ typedef metis::idx_t idxtype; - #else - #define METIS4 - typedef idxtype idx_t; -@@ -794,10 +794,10 @@ - eptr.Append (eind.Size()); - Array<idx_t> epart(ne), npart(nn); - -- int nparts = ntasks-1; -- int edgecut; -+ metis::idx_t nparts = ntasks-1; -+ metis::idx_t edgecut; - -- int ncommon = 3; -+ metis::idx_t ncommon = 3; - METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts, - NULL, NULL, - &edgecut, &epart[0], &npart[0]); -@@ -1029,11 +1029,11 @@ - eptr.Append (eind.Size()); - Array<idx_t> epart(ne), npart(nn); - -- int nparts = ntasks-1; -- int edgecut; -+ metis::idx_t nparts = ntasks-1; -+ metis::idx_t edgecut; - - -- int ncommon = 3; -+ metis::idx_t ncommon = 3; - METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts, - NULL, NULL, - &edgecut, &epart[0], &npart[0]); -@@ -1266,7 +1266,7 @@ - - for ( int vert = 0; vert < nn; vert++ ) - { -- FlatArray<int> array ( cnt[vert], &adjacency[ xadj[vert] ] ); -+ FlatArray<metis::idx_t> array ( cnt[vert], &adjacency[ xadj[vert] ] ); - BubbleSort(array); - } - -@@ -1318,7 +1318,7 @@ - idxtype *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL; - - int weightflag = 0; -- // int numflag = 0; -+ int numflag = 0; - int nparts = ntasks - 1; - - int options[5]; -@@ -1377,7 +1377,7 @@ - - for ( int el = 0; el < ne; el++ ) - { -- FlatArray<int> array ( cnt[el], &adjacency[ xadj[el] ] ); -+ FlatArray<metis::idx_t> array ( cnt[el], &adjacency[ xadj[el] ] ); - BubbleSort(array); - } - -@@ -1428,8 +1428,8 @@ - void Mesh :: PartDualHybridMesh2D ( ) - { - #ifdef METIS -- int ne = GetNSE(); -- int nv = GetNV(); -+ metis::idx_t ne = GetNSE(); -+ metis::idx_t nv = GetNV(); - - Array<idxtype> xadj(ne+1); - Array<idxtype> adjacency(ne*4); -@@ -1484,18 +1484,18 @@ - - idxtype *v_weights = NULL, *e_weights = NULL; - -- int weightflag = 0; -- // int numflag = 0; -- int nparts = ntasks - 1; -+ metis::idx_t weightflag = 0; -+ metis::idx_t numflag = 0; -+ metis::idx_t nparts = ntasks - 1; - -- int edgecut; -+ metis::idx_t edgecut; - Array<idxtype> part(ne); - - for ( int el = 0; el < ne; el++ ) - BubbleSort (adjacency.Range (xadj[el], xadj[el+1])); - - #ifdef METIS4 -- int options[5]; -+ metis::idx_t options[5]; - options[0] = 0; - METIS_PartGraphKway ( &ne, &xadj[0], &adjacency[0], v_weights, e_weights, &weightflag, - &numflag, &nparts, options, &edgecut, &part[0] ); diff --git a/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch b/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch deleted file mode 100644 index d9d8f99ef..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/libsrc/occ/Partition_Loop2d.cxx 2012-11-14 21:16:22.876287910 +0100 -+++ b/libsrc/occ/Partition_Loop2d.cxx 2012-11-14 21:22:30.909650554 +0100 -@@ -13,6 +13,7 @@ - - //using namespace std; - #include <climits> -+#include <cmath> - #include "Partition_Loop2d.ixx" - - #include "utilities.h" -@@ -210,7 +211,7 @@ - Cc->D1(uc, PC, CTg1); - if (!isForward) CTg1.Reverse(); - -- Standard_Real anglemin = 3 * PI, tolAng = 1.e-8; -+ Standard_Real anglemin = 3 * M_PI, tolAng = 1.e-8; - - // select an edge whose first derivative is most left of CTg1 - // ie an angle between Tg1 and CTg1 is least -@@ -234,7 +235,7 @@ - // -PI < angle < PI - Standard_Real angle = Tg1.Angle(CTg1); - -- if (PI - Abs(angle) <= tolAng) -+ if (M_PI - Abs(angle) <= tolAng) - { - // an angle is too close to PI; assure that an angle sign really - // reflects an edge position: +PI - an edge is worst, ---- a/configure.ac 2012-11-15 14:55:45.048938870 +0100 -+++ b/configure.ac 2012-11-15 14:55:12.545923777 +0100 -@@ -14,6 +14,7 @@ - AC_DISABLE_STATIC - - AC_LANG([C++]) -+AM_PROG_AR - AC_PROG_CXX - AC_PROG_LIBTOOL - LT_INIT diff --git a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch deleted file mode 100644 index 0452d6b73..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/libsrc/occ/occgeom.cpp 2014-08-29 11:54:03.000000000 +0200 -+++ b/libsrc/occ/occgeom.cpp 2016-02-12 21:14:49.258982206 +0100 -@@ -149,7 +149,7 @@ -
- for (exp0.Init (shape, TopAbs_FACE); exp0.More(); exp0.Next())
- {
-- // Variable to hold the colour (if there exists one) of
-+ // Variable to hold the colour (if there exists one) of
- // the current face being processed
- Quantity_Color face_colour;
-
-@@ -190,7 +190,7 @@ - rebuild->Replace(face, newface, Standard_False);
- }
-
-- // Set the original colour of the face to the newly created
-+ // Set the original colour of the face to the newly created
- // face (after the healing process)
- face = TopoDS::Face (exp0.Current());
- face_colours->SetColor(face,face_colour,XCAFDoc_ColorSurf);
-@@ -815,11 +815,11 @@ - face_maxh.SetSize (fmap.Extent());
- face_maxh = mparam.maxh;
-
-- // Philippose - 15/01/2010
-- face_maxh_modified.DeleteAll();
-- face_maxh_modified.SetSize(fmap.Extent());
-+ // Philippose - 15/01/2010
-+ face_maxh_modified.DeleteAll();
-+ face_maxh_modified.SetSize(fmap.Extent());
- face_maxh_modified = 0;
--
-+
-
- // Philippose - 17/01/2009
- face_sel_status.DeleteAll();
-@@ -845,7 +845,7 @@ - cout << "Trying to sew faces ..." << flush;
-
- BRepOffsetAPI_Sewing sewedObj(1);
--
-+
- for (int i = 1; i <= fmap.Extent(); i++)
- {
- TopoDS_Face face = TopoDS::Face (fmap(i));
-@@ -1038,9 +1038,6 @@ - {
- cout << "writing stl..."; cout.flush();
- StlAPI_Writer writer;
-- writer.RelativeMode() = Standard_False;
--
-- writer.SetDeflection(0.02);
- writer.Write(shape,filename);
-
- cout << "done" << endl;
-@@ -1109,7 +1106,7 @@ - }
-
-
-- // For the IGES Reader, all the shapes can be exported as one compund shape
-+ // For the IGES Reader, all the shapes can be exported as one compund shape
- // using the "OneShape" member
- occgeo->shape = reader.OneShape();
- occgeo->face_colours = iges_colour_contents;
-@@ -1187,7 +1184,7 @@ - }
-
-
-- // For the STEP File Reader in OCC, the 1st Shape contains the entire
-+ // For the STEP File Reader in OCC, the 1st Shape contains the entire
- // compound geometry as one shape
- occgeo->shape = step_shape_contents->GetShape(step_shapes.Value(1));
- occgeo->face_colours = step_colour_contents;
-@@ -1218,7 +1215,7 @@ - }
-
- // Philippose - 23/02/2009
-- // Fixed a bug in the OpenCascade XDE Colour handling when
-+ // Fixed a bug in the OpenCascade XDE Colour handling when
- // opening BREP Files, since BREP Files have no colour data.
- // Hence, the face_colours Handle needs to be created as a NULL handle.
- occgeo->face_colours = Handle_XCAFDoc_ColorTool();
-@@ -1236,9 +1233,9 @@ - void OCCGeometry :: Save (string sfilename) const
- {
- const char * filename = sfilename.c_str();
-- if (strlen(filename) < 4)
-+ if (strlen(filename) < 4)
- throw NgException ("illegal filename");
--
-+
- if (strcmp (&filename[strlen(filename)-3], "igs") == 0)
- {
- IGESControl_Writer writer("millimeters", 1);
diff --git a/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch deleted file mode 100644 index 0170fb8c3..000000000 --- a/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp netgen/libsrc/meshing/parallelmesh.cpp ---- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-22 00:22:28.885598956 +0100 -+++ netgen/libsrc/meshing/parallelmesh.cpp 2016-02-22 00:46:17.030638283 +0100 -@@ -962,10 +962,15 @@ - } - - --#ifdef METIS5 -+#ifdef METIS - void Mesh :: ParallelMetis (Array<int> & volume_weights , Array<int> & surface_weights, Array<int> & segment_weights) - { -+ -+ #ifdef METIS5 - PrintMessage (3, "call metis 5 with weights ..."); -+ #else -+ PrintMessage (3, "call metis 4 with weights ..."); -+ #endif - - // cout << "segment_weights " << segment_weights << endl; - // cout << "surface_weights " << surface_weights << endl; -@@ -1034,9 +1039,15 @@ - - - metis::idx_t ncommon = 3; -+ #ifdef METIS5 - METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &nwgt[0], NULL, &ncommon, &nparts, - NULL, NULL, - &edgecut, &epart[0], &npart[0]); -+ #else -+ int numflag = 0; -+ METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], &numflag, &nparts, -+ &edgecut, &epart[0], &npart[0]); -+ #endif - /* - METIS_PartMeshNodal (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &nparts, - NULL, NULL, diff --git a/sci-mathematics/netgen/files/netgen.desktop b/sci-mathematics/netgen/files/netgen.desktop deleted file mode 100644 index 714ba53c4..000000000 --- a/sci-mathematics/netgen/files/netgen.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Netgen -Comment=3D modeling, Mesh generation. -Exec=/usr/bin/netgen -Icon=netgen -Terminal=false -Type=Application -Categories=Graphics; diff --git a/sci-mathematics/netgen/files/netgen.png b/sci-mathematics/netgen/files/netgen.png Binary files differdeleted file mode 100644 index cb2fd8466..000000000 --- a/sci-mathematics/netgen/files/netgen.png +++ /dev/null diff --git a/sci-mathematics/netgen/metadata.xml b/sci-mathematics/netgen/metadata.xml deleted file mode 100644 index a2cd926a4..000000000 --- a/sci-mathematics/netgen/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <use> - <flag name="opencascade"> Enable OpenCASCADE support</flag> - </use> - <upstream> - <remote-id type="sourceforge">netgen-mesher</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild deleted file mode 100644 index c759afec4..000000000 --- a/sci-mathematics/netgen/netgen-5.3.1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib xdg - -MY_PN=${PN}-mesher -MY_PV=$(ver_cut 1-2) - -DESCRIPTION="Automatic 3d tetrahedral mesh generator" -HOMEPAGE="https://sourceforge.net/projects/netgen/" -SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" - -IUSE="ffmpeg jpeg mpi opencascade openmp" - -DEPEND=" - dev-lang/tcl:0 - dev-lang/tk:0 - dev-tcltk/tix - dev-tcltk/togl:1.7 - virtual/opengl - x11-libs/libX11 - x11-libs/libXmu - opencascade? ( sci-libs/opencascade:* ) - ffmpeg? ( media-video/ffmpeg ) - jpeg? ( virtual/jpeg:0= ) - mpi? ( virtual/mpi sci-libs/parmetis opencascade? ( sci-libs/hdf5[mpi] ) ) -" -RDEPEND="${DEPEND}" -# Note, MPI has not be tested. - -PATCHES=( - # Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824 - "${FILESDIR}"/${PN}-5.x-missing-define.patch - # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch - "${FILESDIR}"/${PN}-5.x-metis-fixes.patch - "${FILESDIR}"/${PN}-5.x-occ-stl-api-change.patch - # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch - "${FILESDIR}"/${PN}-5.x-makefiles-fixes.patch - # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch - "${FILESDIR}"/${PN}-5.x-fedora-fixes.patch - "${FILESDIR}"/${PN}-5.x-includes-fixes.patch - "${FILESDIR}"/${PN}-5.x-parallelmetis4-fix.patch -) - -src_prepare() { - default - if use mpi; then - export CC=mpicc - export CXX=mpic++ - export FC=mpif90 - export F90=mpif90 - export F77=mpif77 - fi - eautoreconf -} - -src_configure() { - # This is not the most clever way to deal with these flags - # but --disable-xxx does not seem to work correcly, so... - local myconf=( --with-togl=/usr/$(get_libdir)/Togl1.7 ) - - myconf+=( $(use_enable openmp) ) - - if use opencascade; then - myconf+=( --enable-occ --with-occ=$CASROOT ) - append-ldflags -L$CASROOT/$(get_libdir) - fi - if use mpi; then - ewarn "*************************************************************************" - ewarn "" - ewarn "MPI has not been tested, you should probably deactivate the mpi use flag" - ewarn "" - ewarn "*************************************************************************" - myconf+=( --enable-parallel ) - append-cppflags -I/usr/include/metis - append-ldflags -L/usr/$(get_libdir)/openmpi/ - fi - use ffmpeg && myconf+=( --enable-ffmpeg ) - use jpeg && myconf+=( --enable-jpeglib ) - append-cppflags -I/usr/include/togl-1.7 - - econf \ - ${myconf[@]} - - # This would be the more elegant way: -# econf \ -# $(use_enable opencascade occ) \ -# $(use_with opencascade "occ=$CASROOT") \ -# $(use_enable mpi parallel) \ -# $(use_enable ffmpeg) \ -# $(use_enable jpeg jpeglib) -} - -src_install() { - local NETGENDIR="/usr/share/netgen" - - echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen - doenvd 99netgen - - default - mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die - - # Install icon and .desktop for menu entry - doicon "${FILESDIR}"/${PN}.png - domenu "${FILESDIR}"/${PN}.desktop - - prune_libtool_files -} - -pkg_postinst() { - xdg_pkg_postinst - elog "Please make sure to update your environment variables:" - elog "env-update && source /etc/profile" - elog "Netgen ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=155424" -} diff --git a/sci-mathematics/netgen/netgen-6.0_beta.ebuild b/sci-mathematics/netgen/netgen-6.0_beta.ebuild deleted file mode 100644 index 3206c4755..000000000 --- a/sci-mathematics/netgen/netgen-6.0_beta.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib xdg - -MY_PN=${PN}-mesher -MY_PV=${PV//_/-} - -DESCRIPTION="Automatic 3d tetrahedral mesh generator" -HOMEPAGE="https://sourceforge.net/projects/netgen/" -SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/$(ver_cut 1-2)/${PN}-${MY_PV}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" - -IUSE="ffmpeg jpeg mpi opencascade openmp" - -DEPEND=" - dev-lang/tcl:0 - dev-lang/tk:0 - dev-tcltk/tix - dev-tcltk/togl:1.7 - virtual/opengl - x11-libs/libX11 - x11-libs/libXmu - opencascade? ( sci-libs/opencascade:* ) - ffmpeg? ( media-video/ffmpeg ) - jpeg? ( virtual/jpeg:0= ) - mpi? ( virtual/mpi sci-libs/parmetis opencascade? ( sci-libs/hdf5[mpi] ) ) -" -RDEPEND="${DEPEND}" -# Note, MPI has not be tested. - -PATCHES=( - # Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824 - - # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch - "${FILESDIR}"/${PN}-5.x-metis-fixes.patch - "${FILESDIR}"/${PN}-5.x-occ-stl-api-change.patch - # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch - # Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch - "${FILESDIR}"/${PN}-5.x-includes-fixes.patch - "${FILESDIR}"/${PN}-5.x-parallelmetis4-fix.patch -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - default - if use mpi; then - export CC=mpicc - export CXX=mpic++ - export FC=mpif90 - export F90=mpif90 - export F77=mpif77 - fi - eautoreconf -} - -src_configure() { - # This is not the most clever way to deal with these flags - # but --disable-xxx does not seem to work correcly, so... - local myconf=( --with-togl=/usr/$(get_libdir)/Togl1.7 ) - - myconf+=( $(use_enable openmp) ) - - if use opencascade; then - myconf+=( --enable-occ --with-occ=$CASROOT ) - append-ldflags -L$CASROOT/$(get_libdir) - fi - if use mpi; then - ewarn "*************************************************************************" - ewarn "" - ewarn "MPI has not been tested, you should probably deactivate the mpi use flag" - ewarn "" - ewarn "*************************************************************************" - myconf+=( --enable-parallel ) - append-cppflags -I/usr/include/metis - append-ldflags -L/usr/$(get_libdir)/openmpi/ - fi - use ffmpeg && myconf+=( --enable-ffmpeg ) - use jpeg && myconf+=( --enable-jpeglib ) - append-cppflags -I/usr/include/togl-1.7 - - econf \ - ${myconf[@]} - - # This would be the more elegant way: -# econf \ -# $(use_enable opencascade occ) \ -# $(use_with opencascade "occ=$CASROOT") \ -# $(use_enable mpi parallel) \ -# $(use_enable ffmpeg) \ -# $(use_enable jpeg jpeglib) -} - -src_install() { - local NETGENDIR="/usr/share/netgen" - - echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen - doenvd 99netgen - - default - mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die - - # Install icon and .desktop for menu entry - doicon "${FILESDIR}"/${PN}.png - domenu "${FILESDIR}"/${PN}.desktop - - prune_libtool_files -} - -pkg_postinst() { - xdg_pkg_postinst - elog "Please make sure to update your environment variables:" - elog "env-update && source /etc/profile" - elog "Netgen ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=155424" -} diff --git a/sci-mathematics/open-axiom/Manifest b/sci-mathematics/open-axiom/Manifest deleted file mode 100644 index 0d21997aa..000000000 --- a/sci-mathematics/open-axiom/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST open-axiom-1.4.2_p20180201.tar.gz 11874816 BLAKE2B dbde86beb5fee7094a7653902f4cabc043b21ef46cc1c30778cb060c167149638b253c07f0bd2dc572b72f8e30cce9192c153f3ef2f2d53be41a9373b89a09ba SHA512 0c7996dfdef9ea468d1b9ea30ecd50d60ef310acf346bf285c846358354fab9d2b31497ee5d1e978e8da5c5129365d80c40bffaaf65770b9b18865e554155967 diff --git a/sci-mathematics/open-axiom/metadata.xml b/sci-mathematics/open-axiom/metadata.xml deleted file mode 100644 index c9b1f5cd4..000000000 --- a/sci-mathematics/open-axiom/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription lang="en"> -OpenAxiom is an open source platform for symbolic, algebraic, and -numerical computations. It offers an interactive environment, an expressive -programming language, a compiler, a large set of mathematical libraries of -interest to researchers and practitioners of computational sciences. -</longdescription> - <upstream> - <remote-id type="sourceforge">open-axiom</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-mathematics/open-axiom/open-axiom-1.4.2_p20180201.ebuild b/sci-mathematics/open-axiom/open-axiom-1.4.2_p20180201.ebuild deleted file mode 100644 index d5c363ba6..000000000 --- a/sci-mathematics/open-axiom/open-axiom-1.4.2_p20180201.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT="d113f3f7ba119fecd9d946bced8d3dfe9456b933" - -DESCRIPTION="Symbolic and algebraic computations system" -HOMEPAGE="https://github.com/GabrielDosReis/open-axiom http://www.open-axiom.org/" -SRC_URI="https://github.com/GabrielDosReis/open-axiom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" - -IUSE="X" - -RDEPEND="X? ( x11-libs/libXpm )" -DEPEND="${RDEPEND} - app-text/noweb - dev-lisp/ecls[cxx] -" - -DOCS="MAINTAINERS TODO STYLES" - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_configure() { - # There is an option to compile with other lisps. However: - # - gcl is getting obsolete and unmaintained and is hard masked - # - could not make it work with sbcl - econf \ - --with-lisp=ecl \ - $(use_with X x) -} diff --git a/sci-mathematics/pulp/Manifest b/sci-mathematics/pulp/Manifest index 8a93a1b47..abe10a827 100644 --- a/sci-mathematics/pulp/Manifest +++ b/sci-mathematics/pulp/Manifest @@ -1 +1 @@ -DIST pulp-2.4.tar.gz 54307777 BLAKE2B 6be924cb8cfbf49cf754791cdc7d6cf3c16559af776b52bcba3697aeca1228a148f8643a899653fbc18cfa3525aa73967ff835fb19c91cd57013cbe001281852 SHA512 e534660ac2b04833a4305fd2e7eb121bbb136d67379b0df662a5e5b47397ca72c43c568a9ae142877ef67a15af14990d455ea1d6c74ad5cdad5912e883fe6fb3 +DIST pulp-2.7.0.gh.tar.gz 28000854 BLAKE2B d2ec0f2e795ffc93051189e236ddefc92c1e0fbfc825f8bd32b6f8569c1e0ec290acaa418e93768587238ff25c3ae9a4d27457c7e5eb0635fc919ebb80b3de3b SHA512 be89eaeaac81cb79f6533b8764283f1f4ba85570f7626db6fa3e760124a26dcc1ee3ff3b293c67de2ed48083fe611ae0ca93db83da801456a34fe7cff816ba61 diff --git a/sci-mathematics/pulp/metadata.xml b/sci-mathematics/pulp/metadata.xml index ce584d233..c86c3b501 100644 --- a/sci-mathematics/pulp/metadata.xml +++ b/sci-mathematics/pulp/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="pypi">PuLP</remote-id> + <remote-id type="github">coin-or/pulp</remote-id> </upstream> </pkgmetadata> diff --git a/sci-mathematics/pulp/pulp-2.4.ebuild b/sci-mathematics/pulp/pulp-2.7.0.ebuild index 1833c45a9..641a91622 100644 --- a/sci-mathematics/pulp/pulp-2.4.ebuild +++ b/sci-mathematics/pulp/pulp-2.7.0.ebuild @@ -1,23 +1,21 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 DESCRIPTION="Create MPS/LP files, call solvers, and present results" HOMEPAGE="https://coin-or.github.io/pulp/" -SRC_URI="https://github.com/coin-or/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/coin-or/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="BSD-2" KEYWORDS="~amd64 ~x86" SLOT="0" -RDEPEND="dev-python/amply[${PYTHON_USEDEP}]" - distutils_enable_tests setup.py # ToDo: package theme #distutils_enable_sphinx doc/source dev-python/sphinx_glpi_theme diff --git a/sci-mathematics/ripser/metadata.xml b/sci-mathematics/ripser/metadata.xml index fbef5ab11..05f38b851 100644 --- a/sci-mathematics/ripser/metadata.xml +++ b/sci-mathematics/ripser/metadata.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <use> - <flag name="progress">print progress of calculations in console</flag> - <flag name="sparsehash">use google sparsehash for storage</flag> - </use> + <maintainer type="person"> + <email>gentoo@aisha.cc</email> + <name>Aisha Tammy</name> + </maintainer> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <use> + <flag name="progress">print progress of calculations in console</flag> + <flag name="sparsehash">use google sparsehash for storage</flag> + </use> + <upstream> + <remote-id type="github">Ripser/ripser</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-mathematics/scilab-bin/Manifest b/sci-mathematics/scilab-bin/Manifest new file mode 100644 index 000000000..6029dc30e --- /dev/null +++ b/sci-mathematics/scilab-bin/Manifest @@ -0,0 +1,2 @@ +DIST scilab-2023.1.0.bin.x86_64-linux-gnu.tar.xz 182801620 BLAKE2B 19847145a8d70550afa77591854aa651ee5fe23f9998eee21c11acdd4112397fb5e2e82c6bc7edbc2f808048f70905dc0df37db00c43b5794bf304e9a0807ca4 SHA512 af0f71d270513f283ac732e2004094854a117ce4550c5ab579eda5c5ec52bde76a8fa5dd7649db84d68d43124524342f2fdc5f1ba269a60a3930c578ef3391f8 +DIST scilab-6.1.1.bin.linux-x86_64.tar.gz 215840619 BLAKE2B dcfb88f2488cf26371c5beee1e905a33e4c6fc343bb490bb43a73334960f0c13df7d372841949a46d7dc5b6c0a404e6648828104717274518a8ff905a0ae15ad SHA512 ed386e01869cfac3d12881ddb4ae0258bb02e1d4a919a82405dbedce77406c04269883b6e1456dbad52551217307a7baebbb355a699168b77810263f5e357895 diff --git a/sci-mathematics/scilab-bin/metadata.xml b/sci-mathematics/scilab-bin/metadata.xml new file mode 100644 index 000000000..dc2f8c0b5 --- /dev/null +++ b/sci-mathematics/scilab-bin/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> + </maintainer> + <longdescription lang="en"> + Scilab is a matrix-based scientific software package. Scilab contains + hundreds of built-in mathematical functions, rich data structures + (including polynomials, rationals,linear systems, lists, etc...) and + comes with a number of specific toolboxes for control, signal + processing, ... + </longdescription> +</pkgmetadata> diff --git a/sci-mathematics/scilab-bin/scilab-bin-2023.1.0.ebuild b/sci-mathematics/scilab-bin/scilab-bin-2023.1.0.ebuild new file mode 100644 index 000000000..83d189b8a --- /dev/null +++ b/sci-mathematics/scilab-bin/scilab-bin-2023.1.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +MY_PN="${PN//-bin}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Scientific software package for numerical computations" +HOMEPAGE="https://www.scilab.org/" +SRC_URI="https://www.scilab.org/download/${PV}/${MY_P}.bin.x86_64-linux-gnu.tar.xz" +S="${WORKDIR}/${P//-bin}" + +LICENSE="GPL-2 Apache-2.0 sun-bcla-jhall jing MPL-1.0 MIT" +SLOT="0" +KEYWORDS="-* ~amd64" + +# Bundled dependencies not packaged in ::gentoo +# sci-libs/hdf5[cxx]:0/9 +# libgluegen.so (in ::sci) +# libjogl_desktop.so (in ::sci) +# libOpenXLSX.so (in ::sci) +# +# Bundled dependencies in ::gentoo +# dev-lang/tcl +# dev-libs/openssl:0/1.1 +# dev-libs/newt +# dev-libs/libpcre +# net-misc/curl +# sci-libs/amd +# sci-libs/arpack +# sci-libs/camd +# sci-libs/ccolamd +# sci-libs/cholmod +# sci-libs/colamd +# sci-libs/fftw:3.0/3 +# sci-libs/lapack +# sci-libs/matio +# sci-libs/openblas +# sci-libs/umfpack + +RDEPEND=" + sys-libs/ncurses-compat + virtual/jre:1.8 +" + +QA_PREBUILT=( "opt/${MY_PN}/*" ) + +src_prepare() { + default + local SCILAB_HOME="/opt/${MY_PN}" + # fix the .pc file to reflect the dirs where we are installing stuff + sed -i -e "/^prefix=/c prefix=${SCILAB_HOME}" lib/pkgconfig/scilab.pc || die + + # move appdata to metainfo + mv share/appdata share/metainfo || die +} + +src_install() { + local SCILAB_HOME="/opt/${MY_PN}" + dodir "${SCILAB_HOME}" + + # make convenience symlinks in PATH + for file in bin/*; do + dosym "../${MY_PN}/${file}" "/opt/${file}" + done + + # copy all the things + cp -r "${S}/"* "${ED}/${SCILAB_HOME}" || die + + # move out dekstop, icons etc + dodir /usr/share + mv "${ED}/${SCILAB_HOME}/share/"{metainfo,applications,icons,locale,mime} "${ED}/usr/share/" || die + dodir /usr/lib64/pkgconfig + mv "${ED}/${SCILAB_HOME}/lib/pkgconfig/scilab.pc" "${ED}/usr/lib64/pkgconfig/" || die +} diff --git a/sci-mathematics/scilab-bin/scilab-bin-6.1.1.ebuild b/sci-mathematics/scilab-bin/scilab-bin-6.1.1.ebuild new file mode 100644 index 000000000..07b7da8ee --- /dev/null +++ b/sci-mathematics/scilab-bin/scilab-bin-6.1.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +MY_PN="${PN//-bin}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Scientific software package for numerical computations" +HOMEPAGE="https://www.scilab.org/" +SRC_URI="https://www.scilab.org/download/${PV}/${MY_P}.bin.linux-x86_64.tar.gz" +S="${WORKDIR}/${P//-bin}" + +LICENSE="GPL-2 Apache-2.0 sun-bcla-jhall jing MPL-1.0 MIT" +SLOT="0" +KEYWORDS="-* ~amd64" + +# Bundled dependencies not packaged in ::gentoo +# sci-libs/hdf5[cxx]:0/9 +# libgluegen.so (in ::sci) +# libjogl_desktop.so (in ::sci) +# libOpenXLSX.so (in ::sci) +# +# Bundled dependencies in ::gentoo +# dev-lang/tcl +# dev-libs/openssl:0/1.1 +# dev-libs/newt +# dev-libs/libpcre +# net-misc/curl +# sci-libs/amd +# sci-libs/arpack +# sci-libs/camd +# sci-libs/ccolamd +# sci-libs/cholmod +# sci-libs/colamd +# sci-libs/fftw:3.0/3 +# sci-libs/lapack +# sci-libs/matio +# sci-libs/openblas +# sci-libs/umfpack + +RDEPEND=" + sys-libs/ncurses-compat + virtual/jre:1.8 +" + +QA_PREBUILT=( "opt/${MY_PN}/*" ) + +src_prepare() { + default + local SCILAB_HOME="/opt/${MY_PN}" + # fix the .pc file to reflect the dirs where we are installing stuff + sed -i -e "/^prefix=/c prefix=${SCILAB_HOME}" lib/pkgconfig/scilab.pc || die + + # move appdata to metainfo + mv share/appdata share/metainfo || die +} + +src_install() { + local SCILAB_HOME="/opt/${MY_PN}" + dodir "${SCILAB_HOME}" + + # make convenience symlinks in PATH + for file in bin/*; do + dosym "../${MY_PN}/${file}" "/opt/${file}" + done + + # copy all the things + cp -r "${S}/"* "${ED}/${SCILAB_HOME}" || die + + # move out dekstop, icons etc + dodir /usr/share + mv "${ED}/${SCILAB_HOME}/share/"{metainfo,applications,icons,locale,mime} "${ED}/usr/share/" || die + dodir /usr/lib64/pkgconfig + mv "${ED}/${SCILAB_HOME}/lib/pkgconfig/scilab.pc" "${ED}/usr/lib64/pkgconfig/" || die +} diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest deleted file mode 100644 index 4ceabfa75..000000000 --- a/sci-mathematics/scilab/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST scilab-5.5.2-bug15107.patch 38242 BLAKE2B fb4b91f4552fbf65f82d667ef6e78c668093e4c994e73ff25efbb265ff77d6260a574a5efa9a244dc720b51713827c1d109236026921096b0dbb49e0b47ffd85 SHA512 afbac90f00ed66eb1884aa86ec997945771d9b3a2959d72b096718d7fa427a5d12423892f77ef51fc8306131939aad642b180590ec9452cadfe01a8b4349492e -DIST scilab-5.5.2-src.tar.gz 69626327 BLAKE2B 6180bb91d878e646838a085894dcf6da7127b60788a234f1900dc19b6a981af789c10e78f08ed1357fbec82b32d0fe0ba4b8ffe3350ac4a9f5ee0843bbb3b177 SHA512 7f00ac837e36b5524a9c9a3106bdaefebb71559eb2932b2a16e4fac53fa1f9e66b87eabf98b3006ede25f8ab1d16d6ef1c7561ed29b67ddb42c98610fa72fe79 -DIST scilab-6.0.2-src.tar.gz 76126980 BLAKE2B 477132ccff5ad6d5615be80e6e63f2fa66ff806b6675373cf85f4204bbe27cfaf0fa7071e24b3d11ea2549860429c18fe8458cfd622c76030a741c101598fc96 SHA512 194fbf02e83436e5be8949fadf67e7b9b739eaa02d876b01505634d59b2d02adbf2c48a50bc2fe61c25956cae6aea4f832f429506dcab26d4e110d1bcd9ddfef -DIST scilab-6.1.0-src.tar.gz 80556033 BLAKE2B ccea329a5d24bf03a95ae4ab02098a3d3fcd592b59d1ca31fb82da41592a19b1a6240151099ec9be1db9b277d852a5310ee7c3be8fd551d5832863bd7f41890c SHA512 d88eadb97abbb95611235d13982e2831e3570766315eef9205cd7a5717765b1f554befee7c9f01938b87f412f14c4f57e79dd78065773d96dfa6f058fd3acb7c diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch deleted file mode 100644 index a7e5c6d5f..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab ---- a/bin/scilab 2014-07-12 15:24:17.105686656 -0400 -+++ b/bin/scilab 2014-07-12 15:25:29.307725409 -0400 -@@ -647,17 +647,6 @@ - GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g) - export GTK_MODULES - --# libEGL may be partially supported by the closed-source NVIDIA driver. --# Until they release an EGL driver, we force the egl_glx driver. --# http://bugzilla.scilab.org/show_bug.cgi?id=12940 --if test -x /usr/bin/glxinfo; then -- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") -- if test ! -z "$NVIDIA_GLX_VENDOR"; then -- EGL_DRIVER=egl_glx -- export EGL_DRIVER -- fi --fi -- - if test $SCIVERBOSE -ne 0; then - echo "SCI : $SCI" - echo "SCIBIN : $SCIBIN" diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch deleted file mode 100644 index ce0cebbf3..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.9.patch +++ /dev/null @@ -1,104 +0,0 @@ -Updates Scilab to build against (and require) Batik >=1.9, this has been -adapted from Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - ---- a/configure -+++ b/configure -@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used - fi - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5 --$as_echo_n "checking minimal version (1.7) of batik... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.9) of batik" >&5 -+$as_echo_n "checking minimal version (1.9) of batik... " >&6; } - saved_ac_java_classpath=$ac_java_classpath - export ac_java_classpath="$BATIK:$ac_java_classpath" - if test "x" == "x"; then -@@ -16614,7 +16614,7 @@ import org.apache.batik.Version; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="1.7"; -+ String minVersion="1.9"; - - System.out.println(Version.getVersion()); - if (compare(minVersion, Version.getVersion()) > 0) { -@@ -16663,7 +16663,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -16673,7 +16673,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected at least 1.9. Found $STDOUT" "$LINENO" 5 - fi - - else -@@ -16686,7 +16686,7 @@ import org.apache.batik.Version; - - public class conftest { - public static void main(String[] argv) { -- String minVersion="1.7"; -+ String minVersion="1.9"; - - System.out.println(Version.getVersion()); - if (compare(minVersion, Version.getVersion()) != 0) { -@@ -16735,7 +16735,7 @@ EOF - STDOUT=`cat conftest.java.output` - fi - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5 - fi - fi - if test -f conftest.java.output; then -@@ -16745,7 +16745,7 @@ EOF - echo "configure: failed program was:" >&5 - cat conftest.java >&5 - echo "configure: CLASSPATH was $CLASSPATH" >&5 -- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5 -+ as_fn_error $? "Wrong version of batik. Expected exact version 1.9. Found $STDOUT" "$LINENO" 5 - fi - - fi ---- a/configure.ac -+++ b/configure.ac -@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version - BATIK=$PACKAGE_JAR_FILE - fi - AC_SUBST(BATIK) -- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()]) -+ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.9],[Version.getVersion()]) - - # Commons I/O library - AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) ---- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -+++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader; - import org.apache.batik.bridge.GVTBuilder; - import org.apache.batik.bridge.UserAgent; - import org.apache.batik.bridge.UserAgentAdapter; --import org.apache.batik.dom.svg.SAXSVGDocumentFactory; -+import org.apache.batik.anim.dom.SAXSVGDocumentFactory; - import org.apache.batik.gvt.GraphicsNode; - import org.apache.batik.util.XMLResourceDescriptor; - import org.scilab.forge.jlatexmath.ParseException; ---- ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java 2021-01-24 16:26:14.686473112 +0100 -+++ ./modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.new 2021-01-24 16:34:25.486426923 +0100 -@@ -100,7 +100,7 @@ - * Dependencies version - */ - private static final List<String> MXGRAPH_VERSIONS = null; -- private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8"); -+ private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8", "1.9"); - - private static final String UNABLE_TO_LOAD_JGRAPHX = Messages.gettext("Unable to load the jgraphx library.\nExpecting version %s ; Getting version %s ."); - private static final String UNABLE_TO_LOAD_BATIK = Messages.gettext("Unable to load the Batik library. \nExpecting version %s ; Getting version %s ."); - diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch b/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch deleted file mode 100644 index 6e58dd540..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-bug15449.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp 2015-03-31 11:31:43.000000000 +0200 -+++ ./modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp.new 2021-01-10 15:47:49.011858918 +0100 -@@ -54,7 +54,7 @@ - { - // FIXME #7266 workaround - // check category emptyness -- if (category == NULL || (lenCategory == 1 && *category == '\0')) -+ if (category == NULL || (lenCategory == 1 && **category == 0)) - { - Palette::loadPal(getScilabJavaVM(), name); - } diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch deleted file mode 100644 index da7b6e485..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp ---- a/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400 -+++ b/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400 -@@ -497,7 +497,7 @@ - /*--------------------------------------------------------------------------*/ - int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal) - { -- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL); -+ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0); - } - /*--------------------------------------------------------------------------*/ - int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch deleted file mode 100644 index a3f60bee7..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/java.m4 2014-02-11 23:43:03.030430258 -0500 -+++ b/m4/java.m4 2014-02-11 23:43:54.008428766 -0500 -@@ -839,7 +839,7 @@ - for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do - - # TODO check the behaviour when spaces -- jars_resolved=`ls $jar 2>/dev/null` -+ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null) - for jar_resolved in $jars_resolved; do # If several jars matches - if test -e "$jar_resolved"; then - export ac_java_classpath="$jar_resolved:$ac_java_classpath" diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch deleted file mode 100644 index 18bdaac1d..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=14009 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure -of a test case, and it's awaiting upstream review. - ---- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -+++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -@@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter { - String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); - - try { -- FopFactory fopFactory = FopFactory.newInstance(); -+ FopFactory fopFactory = -+ FopFactory.newInstance(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - fopFactory.addElementMapping(new JLaTeXMathElementMapping()); - fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler()); -- fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); - - // Step 3: Construct fop with desired output format - OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); ---- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -+++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -@@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter { - * @param format the page format - */ - public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) { -- FopFactory fopFactory = FopFactory.newInstance(); - OutputStream out = null; - - try { -- fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); -+ FopFactory fopFactory = -+ FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - userAgent.setProducer(CREATOR); - userAgent.setTitle(title); diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch deleted file mode 100644 index 31dcf52e7..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fortran-gcc8.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f49b185c678c07526ef59c1531d41575f9266bdc Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@esi-group.com> -Date: Mon, 26 Feb 2018 23:43:14 +0100 -Subject: [PATCH] Fortran: fix errors with gfortran 8 - -Change-Id: Ib890c6ea2dcba2f70d3c22dc86bbe38e4f22b061 ---- a/modules/differential_equations/src/fortran/ddaskr.f -+++ b/modules/differential_equations/src/fortran/ddaskr.f -@@ -1409,6 +1409,7 @@ C - DIMENSION RWORK(LRW),IWORK(LIW) - DIMENSION RTOL(*),ATOL(*) - DIMENSION RPAR(*),IPAR(*) -+ DIMENSION JROOT(NRT) - CHARACTER MSG*80 - EXTERNAL RES, JAC, PSOL, RT, DDASID, DDASIK, DNEDD, DNEDK - C -@@ -2530,7 +2531,8 @@ C Pointers into RWORK: - DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, R0, R1, RX, UROUND, - * RWORK, RPAR - DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*), -- * R0(*), R1(*), RX(*), JROOT(*), RWORK(*), IWORK(*) -+ * R0(*), R1(*), RX(*), JROOT(NRT), RWORK(*), IWORK(*), -+ * RPAR(*), IPAR(*) - INTEGER I, JFLAG - DOUBLE PRECISION H - DOUBLE PRECISION HMINR, T1, TEMP1, TEMP2, X, ZERO ---- a/modules/differential_equations/src/fortran/ddasrt.f -+++ b/modules/differential_equations/src/fortran/ddasrt.f -@@ -870,6 +870,7 @@ C - DIMENSION RWORK(*),IWORK(*) - DIMENSION RTOL(*),ATOL(*) - DIMENSION RPAR(*),IPAR(*) -+ DIMENSION JROOT(NG) - CHARACTER MSG*80 - C - C SET POINTERS INTO IWORK -@@ -1594,7 +1595,8 @@ C - DOUBLE PRECISION TN, TOUT, Y, YP, PHI, PSI, G0, G1, GX, UROUND, - * RWORK, RPAR - DIMENSION Y(*), YP(*), PHI(NEQ,*), PSI(*), -- 1 G0(*), G1(*), GX(*), JROOT(*), RWORK(*), IWORK(*) -+ 1 G0(*), G1(*), GX(*), JROOT(NG), RWORK(*), IWORK(*), RPAR(*), -+ 1 IPAR(*) - INTEGER I, JFLAG - DOUBLE PRECISION H - DOUBLE PRECISION HMING, T1, TEMP1, TEMP2, X ---- a/modules/differential_equations/src/fortran/twodq.f -+++ b/modules/differential_equations/src/fortran/twodq.f -@@ -900,7 +900,7 @@ C - END - - subroutine tridv(node,node1,node2,coef,rank) -- double precision node(10),node1(10),node2(10),coef -+ double precision node(9),node1(9),node2(9),coef - integer rank - double precision s(3),coef1,temp - integer t(3) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch deleted file mode 100644 index 46825cb29..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac ---- a/configure.ac 2016-06-05 12:30:06.582735449 -0400 -+++ b/configure.ac 2016-06-05 12:31:29.706708157 -0400 -@@ -1024,7 +1024,7 @@ - AC_SUBST(FREEHEP_IO) - - # Freehep Util -- AC_JAVA_CHECK_PACKAGE([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util]) -+ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util]) - FREEHEP_UTIL=$PACKAGE_JAR_FILE - AC_SUBST(FREEHEP_UTIL) - fi diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch deleted file mode 100644 index d75c31e9a..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:38:00.928934500 -0400 -+++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400 -@@ -157,7 +157,7 @@ - - static { - try { -- System.loadLibrary("gluegen2-rt"); -+ System.loadLibrary("gluegen-rt"); - } catch (Exception e) { - System.err.println(e); - } diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch b/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch deleted file mode 100644 index 07e497939..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-hdf5-1.8.10.patch +++ /dev/null @@ -1,278 +0,0 @@ ---- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-15 20:08:00.761619371 +0100 -@@ -42,7 +42,11 @@ - for (int i = 0; i < totalSize; i++) - { - void * ref = &(((void **)cdata)[i]); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - H5O_info_t info; - H5Oget_info(obj, &info); - H5Oclose(obj); -@@ -84,7 +88,11 @@ - - file = getFile().getH5Id(); - ref = &(((void **)cdata)[0]); -- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ obj = H5Rdereference(file, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - if (obj < 0) - { - throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position.")); -@@ -126,7 +134,11 @@ - for (int i = 0; i < totalSize; i++) - { - void * ref = &(((void **)cdata)[i]); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - objs[i] = &H5Object::getObject(getParent(), obj); - } - -@@ -181,7 +193,11 @@ - char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize); - void ** ref = &(((void **)cdata)[0]); - hid_t file = getFile().getH5Id(); -- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); -+ hid_t obj = H5Rdereference(file, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); - if (obj < 0) - { - os << "NULL"; ---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-15 20:08:00.758286029 +0100 -@@ -474,7 +474,11 @@ - } - - //Open the referenced object, get its name and type. -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &Ref); - readDouble_v1(obj, _iRows, _iCols, _pdblData); - } - -@@ -501,14 +505,22 @@ - } - - //Open the referenced object, get its name and type. -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readDouble_v1(obj, _iRows, _iCols, _pdblReal); - if (status < 0) - { - return -1; - } - -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readDouble_v1(obj, _iRows, _iCols, _pdblImg); - if (status < 0) - { -@@ -834,7 +846,11 @@ - /* - * Open the referenced object, get its name and type. - */ -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pData[i]); - if (_iComplex) - { - status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); -@@ -1069,7 +1085,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); - if (status < 0) - { -@@ -1077,7 +1097,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); - if (status < 0) - { -@@ -1085,7 +1109,11 @@ - } - - //read sparse data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[2]); - - if (_iComplex) - { -@@ -1131,7 +1159,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); - if (status < 0) - { -@@ -1139,7 +1171,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); - if (status < 0) - { -@@ -1234,7 +1270,11 @@ - { - hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - -- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); -+ *_piItemDataset = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &poRef); - - if (*_piItemDataset == 0) - { ---- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-14 12:40:34.000000000 +0100 -+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-15 20:08:00.758286029 +0100 -@@ -742,7 +742,11 @@ - /* - * Open the referenced object, get its name and type. - */ -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pData[i]); - if (_iComplex) - { - status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); -@@ -976,7 +980,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix(obj, _piNbItemRow); - if (status < 0) - { -@@ -984,7 +992,11 @@ - } - - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix(obj, _piColPos); - if (status < 0) - { -@@ -992,7 +1004,11 @@ - } - - //read sparse data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[2]); - - if (_iComplex) - { -@@ -1043,7 +1059,11 @@ - } - - //read Row data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); -+ obj = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &pRef[0]); - status = readInteger32Matrix(obj, _piNbItemRow); - if (status < 0) - { -@@ -1053,7 +1073,11 @@ - if (_iNbItem != 0) - { - //read cols data -- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); -+ obj = H5Rdereference(_iDatasetId, -+ #if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+ #endif -+ H5R_OBJECT, &pRef[1]); - status = readInteger32Matrix(obj, _piColPos); - if (status < 0) - { -@@ -1154,7 +1178,11 @@ - { - hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - -- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); -+ *_piItemDataset = H5Rdereference(_iDatasetId, -+#if H5_VERSION_GE(1,10,0) -+ H5P_DATASET_ACCESS_DEFAULT, -+#endif -+ H5R_OBJECT, &poRef); - - if (*_piItemDataset == 0) - { diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch deleted file mode 100644 index ca17e52a6..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/jvm_options.xml 2014-02-12 00:05:34.323390688 -0500 -+++ b/etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500 -@@ -22,7 +22,7 @@ - <!-- ENABLE Just In Time java compiler --> - <option value="-Djava.compiler=JIT"/> - <!-- Set Java Heap space to 256mb --> -- <option value="-Xmx256m"/> -+ <option value="-Xmx512m"/> - <!-- Avoid jvm to handle sigint (& other signals) --> - <option value="-Xrs"/> - diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch b/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch deleted file mode 100644 index 1dc4fd079..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-libxml-icu64.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./modules/xml/src/cpp/XMLDocument.hxx 2015-03-31 11:31:45.000000000 +0200 -+++ ./modules/xml/src/cpp/XMLDocument.hxx.new 2021-01-10 15:18:51.172022465 +0100 -@@ -20,13 +20,10 @@ - - #include "dynlib_xml_scilab.h" - --extern "C" --{ - #include "xml.h" - #ifndef XML_XPATH_CHECKNS - #define XML_XPATH_CHECKNS - #endif --} - - #include "XMLObject.hxx" - diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch b/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch deleted file mode 100644 index 25b281820..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN scilab-5.5.1-orig/Makefile.am scilab-5.5.1/Makefile.am ---- a/Makefile.am 2014-10-09 18:22:21.994610695 -0400 -+++ b/Makefile.am 2014-10-09 18:24:28.208333575 -0400 -@@ -74,6 +74,7 @@ - if NEED_JAVA - scilab_bin_LDADD += \ - $(top_builddir)/modules/console/libsciconsole.la \ -+ $(top_builddir)/modules/console/libsciconsole-minimal.la \ - $(top_builddir)/modules/jvm/libscijvm.la \ - $(top_builddir)/modules/commons/libscicommons.la - else diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch b/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch deleted file mode 100644 index dc8941ff0..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-ocaml-4.0.4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./modules/scicos/src/modelica_compiler/optimization.ml.orig 2018-05-16 19:42:49.168681800 +0200 -+++ ./modules/scicos/src/modelica_compiler/optimization.ml 2018-05-16 19:44:53.999181477 +0200 -@@ -163,7 +163,8 @@ - let m, e = frexp f in - let sm = string_of_float m in - let s = String.make 16 '0' in -- String.blit sm 2 s 0 (String.length sm - 2); -+ let sss = Bytes.make 16 '0' in -+ String.blit sm 2 sss 0 (String.length sm - 2); - let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in - Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor - in diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch deleted file mode 100644 index 4d90f30c7..000000000 --- a/sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Bryan Gardiner <bog@khumba.net> -Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724 -Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 - -Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0. This is not -tested, as I'm not sure of a test case, and a similar patch (where the -super.processShape calls are passed cached=true) is already awaiting upstream -review. - ---- a/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -+++ b/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java -@@ -857,7 +857,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -880,10 +880,10 @@ public class Export { - buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - it.next(); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -891,7 +891,7 @@ public class Export { - if (type == PathIterator.SEG_LINETO) { - buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } - buffer.append("] DP"); -@@ -899,7 +899,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - }; - g2d.setGraphicContext(new GraphicContext()); -@@ -1029,7 +1029,7 @@ public class Export { - } - - @Override -- public int processShape(Shape s) throws IOException { -+ public int processShape(Shape s, boolean cached) throws IOException { - if (s instanceof Ellipse2D.Double) { - Ellipse2D.Double ell = (Ellipse2D.Double) s; - if (ell.height == ell.width) { -@@ -1052,10 +1052,10 @@ public class Export { - buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - it.next(); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - for (; !it.isDone(); it.next()) { -@@ -1063,7 +1063,7 @@ public class Export { - if (type == PathIterator.SEG_LINETO) { - buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); - } else { -- return super.processShape(s); -+ return super.processShape(s, cached); - } - } - buffer.append("] DP"); -@@ -1071,7 +1071,7 @@ public class Export { - return PathIterator.WIND_NON_ZERO; - } - -- return super.processShape(s); -+ return super.processShape(s, cached); - } - - }; diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch b/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch deleted file mode 100644 index 940440563..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-accessviolation.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/bin/scilab b/bin/scilab -index 475457d6..d2b98cc0 100755 ---- a/bin/scilab -+++ b/bin/scilab -@@ -720,17 +720,6 @@ fi - GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g) - export GTK_MODULES - --# libEGL may be partially supported by the closed-source NVIDIA driver. --# Until they release an EGL driver, we force the egl_glx driver. --# http://bugzilla.scilab.org/show_bug.cgi?id=12940 --if test $SCILAB_MODE != "nwni" -a -x /usr/bin/glxinfo; then -- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") -- if test ! -z "$NVIDIA_GLX_VENDOR"; then -- EGL_DRIVER=egl_glx -- export EGL_DRIVER -- fi --fi -- - if test $SCIVERBOSE -ne 0; then - echo "SCI : $SCI" - echo "SCIBIN : $SCIBIN" diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch b/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch deleted file mode 100644 index 6f9587780..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-freehep.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f6018580..d783ca96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1076,7 +1076,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version - AC_SUBST(FREEHEP_IO) - - # Freehep Util -- AC_JAVA_CHECK_JAR([freehep-util],[org.freehep.util.StringUtilities],[Freehep Util]) -+ AC_JAVA_CHECK_PACKAGE([freehep-graphicsbase],[org.freehep.graphicsbase.util.UserProperties],[Freehep Util]) - FREEHEP_UTIL=$PACKAGE_JAR_FILE - AC_SUBST(FREEHEP_UTIL) - fi diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch deleted file mode 100644 index 55d2e744a..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- orig/scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp 2020-02-25 10:59:51.000000000 +0100 -+++ scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp 2020-06-13 17:52:19.258491176 +0200 -@@ -22,13 +22,13 @@ - { - #include "loadOnUseClassPath.h" - #include "Scierror.h" -+} - - //XML API - #include <libxml/xpath.h> - #include <libxml/xmlreader.h> - #include "sci_malloc.h" - #include "configvariable_interface.h" --} - - vectGateway loadGatewaysName(const std::wstring& _wstModuleName) - { ---- orig/scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-02-25 10:59:59.000000000 +0100 -+++ scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-06-13 17:38:17.474133786 +0200 -@@ -17,6 +17,8 @@ - #include "context.hxx" - #include "loadlib.hxx" - #include "macrofile.hxx" -+#include <libxml/xpath.h> -+#include <libxml/xmlreader.h> - extern "C" - { - #include "FileExist.h" -@@ -26,8 +28,6 @@ - #include "fullpath.h" - #include "PATH_MAX.h" - #include "pathconvert.h" --#include <libxml/xpath.h> --#include <libxml/xmlreader.h> - } - - #define DEFAULT_ENCODING "UTF-8" ---- orig/scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-02-25 11:00:18.000000000 +0100 -+++ scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-06-13 17:45:02.443795087 +0200 -@@ -23,13 +23,10 @@ - - #include "dynlib_xml_scilab.h" - --extern "C" --{ - #include "xml.h" - #ifndef XML_XPATH_CHECKNS - #define XML_XPATH_CHECKNS - #endif --} - - #include "XMLObject.hxx" - ---- orig/scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-02-25 11:00:08.000000000 +0100 -+++ scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-06-13 18:13:54.985717732 +0200 -@@ -22,10 +22,8 @@ - #include <string> - #include <vector> - --extern "C" { - #include <libxml/xmlwriter.h> - #include <libxml/xmlreader.h> --} - - namespace org_scilab_modules_scicos - { diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch b/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch deleted file mode 100644 index f83fa31d0..000000000 --- a/sci-mathematics/scilab/files/scilab-6.1.0-nogui.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2014-01-09 22:29:06.534469383 -0500 -+++ b/Makefile.in 2014-01-09 22:29:40.368471544 -0500 -@@ -2247,8 +2247,8 @@ - @BUILD_HELP_TRUE@ done; \ - @BUILD_HELP_TRUE@ fi - # Also install scirenderer.jar --@EXTERNAL_SCIRENDERER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER) --@EXTERNAL_SCIRENDERER_FALSE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/ -+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER) -+@EXTERNAL_SCIRENDERER_FALSE@@NEED_JAVA_TRUE@ $(INSTALL_DATA) $(top_builddir)/$(PATHTOSCIRENDERER)/$(SCIRENDERERJAR) $(DESTDIR)$(pkgdatadir)/$(PATHTOSCIRENDERER)/ - - .PHONY: macros localization doc - diff --git a/sci-mathematics/scilab/files/scilab.bash_completion b/sci-mathematics/scilab/files/scilab.bash_completion deleted file mode 100644 index c289e8632..000000000 --- a/sci-mathematics/scilab/files/scilab.bash_completion +++ /dev/null @@ -1,54 +0,0 @@ -# Scilab completion -# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru -# This file must be used under the terms of the CeCILL. -# This source file is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - -_scilab() -{ - local cur prev options - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - - # List all options. Note that - options='-ns -nb -nw -nwni -nogui -debug -debug-kdbg -d -display -profiling -profiling-visu -l -mem -version -e -f -nouserstartup -args -mem -h --help' - - # Loop on the arguments to manage conflicting options - for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do - #exclude some mutually exclusive options - [[ ${COMP_WORDS[i]} == '-nwni' ]] && options=${options/-nw} - [[ ${COMP_WORDS[i]} == '-nw' ]] && options=${options/-nwni} - [[ ${COMP_WORDS[i]} == '-e' ]] && options=${options/-f} - done - - case "$1" in - *scilab-cli*) - # Option -nw is not available - options=${options/-nw} - ;; - esac - - case $prev in - -f) - _filedir '@(sci|sce|SCI|SCE|tst|TST)' - return 0 - ;; - -e|-l|-d|-display|-mem) - cur=${cur#[\"\']} - eqext='=' - ;; - - *) - COMPREPLY=( $( compgen -W "$options" | grep "^$cur" ) ) - ;; - esac - - return 0 -} -complete -F _scilab $filenames scilab scilab-cli scilab-adv-cli - - diff --git a/sci-mathematics/scilab/files/scilab.xml b/sci-mathematics/scilab/files/scilab.xml deleted file mode 100644 index 8594e7bdc..000000000 --- a/sci-mathematics/scilab/files/scilab.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="text/x-sci"> - <comment>Scilab Function</comment> - <sub-class-of type="text/plain"/> - <glob pattern="*.sci"/> - </mime-type> - <mime-type type="text/x-sce"> - <comment>Scilab Script</comment> - <sub-class-of type="text/plain"/> - <glob pattern="*.sce"/> - </mime-type> -</mime-info> diff --git a/sci-mathematics/scilab/metadata.xml b/sci-mathematics/scilab/metadata.xml deleted file mode 100644 index ef72c6a0f..000000000 --- a/sci-mathematics/scilab/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription lang="en"> -Scilab is a matrix-based scientific software package. Scilab contains -hundreds of built-in mathematical functions, rich data structures -(including polynomials, rationals,linear systems, lists, etc...) and -comes with a number of specific toolboxes for control, signal -processing, ... -</longdescription> - <use> - <flag name="gui">Build the Java base graphical interface</flag> - <flag name="umfpack">Adds support for sparse solving -with <pkg>sci-libs/umfpack</pkg></flag> - <flag name="matio">Enable support for MATLAB file through <pkg>sci-libs/matio</pkg></flag> - <flag name="xcos">Enable building hybrid dynamic systems modeler and -simulator Xcos</flag> - <flag name="emf">Add suport for exporting to emf files</flag> - </use> -</pkgmetadata> diff --git a/sci-mathematics/scilab/scilab-5.5.2.ebuild b/sci-mathematics/scilab/scilab-5.5.2.ebuild deleted file mode 100644 index 1226b4d76..000000000 --- a/sci-mathematics/scilab/scilab-5.5.2.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_OPT_USE="gui" -VIRTUALX_REQUIRED="manual" - -inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \ - fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Scientific software package for numerical computations" -HOMEPAGE="https://www.scilab.org/" -SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz - https://raw.githubusercontent.com/gentoo/sci/4c2a07c4629c61395a998633ccfcb34d72569529/sci-mathematics/scilab/files/${P}-bug15107.patch" - -LICENSE="CeCILL-2.1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug doc emf fftw +gui +matio mpi nls openmp - static-libs test tk +umfpack +xcos" -REQUIRED_USE="xcos? ( gui ) doc? ( gui )" - -RESTRICT="test" - -IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs" -L10N_DOC="fr pt ja ru" - -map_lang() { - local lang=${1/_/-} - case $1 in - # Retain the following, which have a specific subtag - de_*|en_*|pt_*|zh_*) ;; - # Consider all other xx_XX as duplicates of the generic xx tag - *_*) lang=${1%%_*} ;; - esac - echo ${lang} -} - -prev_l= -for l in ${IUSE_L10N}; do - l=$(map_lang ${l}) - [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" - prev_l=${l} -done -unset l prev_l - -CDEPEND=" - dev-libs/libpcre - dev-libs/libxml2:2 - sci-libs/hdf5[mpi=] - >=sci-libs/arpack-3 - sci-libs/lapack[deprecated(-)] - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:0= - emf? ( - dev-java/freehep-graphicsio:0 - dev-java/freehep-graphicsio-emf:0 - dev-java/freehep-graphics2d:0 - dev-java/freehep-io:0 - dev-java/freehep-graphicsbase:0 - ) - fftw? ( sci-libs/fftw:3.0 ) - gui? ( - dev-java/avalon-framework:4.2 - >=dev-java/batik-1.9:1.9 - dev-java/commons-io:1 - dev-java/commons-logging:0 - >=dev-java/flexdock-1.2.4:0 - >=dev-java/fop-2.0:0 - ~dev-java/gluegen-2.2.4:2.2 - dev-java/javahelp:0 - dev-java/jeuclid-core:0 - dev-java/jgoodies-looks:2.6 - >=dev-java/jlatexmath-1.0.3:1 - >=dev-java/jlatexmath-fop-1.0.3:1 - ~dev-java/jogl-2.2.4:2.2 - >=dev-java/jrosetta-1.0.4:0 - >dev-java/lucene-2:=[contrib(-)] - <dev-java/lucene-5:=[contrib(-)] - dev-java/skinlf:0 - dev-java/xmlgraphics-commons:2 - virtual/opengl - xcos? ( dev-java/jgraphx:0 ) - ) - matio? ( >=sci-libs/matio-1.5 ) - mpi? ( virtual/mpi[fortran] ) - tk? ( dev-lang/tk:0= ) - umfpack? ( sci-libs/umfpack )" - -RDEPEND="${CDEPEND} - gui? ( >=virtual/jre-1.5 )" - -DEPEND="${CDEPEND} - debug? ( dev-util/lcov ) - gui? ( - >=virtual/jdk-1.6 - doc? ( - app-text/docbook-xsl-stylesheets - dev-java/xml-commons-external:1.4 - dev-java/saxon:9 - ) - xcos? ( - >=dev-lang/ocaml-4.06 - dev-ml/num - ) - ) - test? ( - dev-java/junit:4 - dev-java/ant-junit4:0 - gui? ( ${VIRTUALX_DEPEND} ) )" -BDEPEND="virtual/pkgconfig" - -DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" ) - -PATCHES=( - "${FILESDIR}/${P}-followlinks.patch" - "${FILESDIR}/${P}-gluegen.patch" - "${FILESDIR}/${P}-fix-random-runtime-failure.patch" - "${FILESDIR}/${P}-accessviolation.patch" - "${FILESDIR}/${P}-missinglib.patch" - "${FILESDIR}/${P}-batik-1.9.patch" - "${FILESDIR}/${P}-fop-2.0.patch" - "${FILESDIR}/${P}-xmlgraphics-common-2.0.patch" - "${FILESDIR}/${P}-freehep.patch" - "${FILESDIR}/${P}-fortran-gcc8.patch" # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232958 - "${FILESDIR}/${P}-libxml-icu64.patch" # similar to https://bugzilla.scilab.org/show_bug.cgi?id=16588 - "${FILESDIR}/${P}-hdf5-1.8.10.patch" # adapted from https://github.com/bartoszek/scilab - "${DISTDIR}/${P}-bug15107.patch" # http://bugzilla.scilab.org/show_bug.cgi?id=15107 - "${FILESDIR}/${P}-bug15449.patch" # http://bugzilla.scilab.org/show_bug.cgi?id=15449 - "${FILESDIR}/${P}-ocaml-4.0.4.patch" # https://github.com/bartoszek/scilab -) - -pkg_pretend() { - use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend -} - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using a gcc without OpenMP capabilities" - die "Need an OpenMP capable compiler" - fi - FORTRAN_NEED_OPENMP=1 - fi - FORTRAN_STANDARD="77 90" - fortran-2_pkg_setup - #bug 8053 - unset F77 - java-pkg-opt-2_pkg_setup - - # fails to compile in src/fortran/optml2.f:172:50 without this - test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch - - ALL_L10N="en_US" - ALL_L10N_DOC="en_US" - for l in ${IUSE_L10N}; do - use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}" - done - for l in ${L10N_DOC}; do - use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}" - done - export ALL_L10N ALL_L10N_DOC -} - -src_prepare() { - default - - # increases java heap to 512M when building docs (sync with cheqreqs above) - use doc && eapply "${FILESDIR}/${P}-java-heap.patch" - - # use the L10N variable that we set - sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die - - # make sure the DOCBOOK_ROOT variable is set - sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die - - # fix QA for metainfo data installation path - sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die - - # remove self closing <br /> (error our with javadoc8) - # already upstream commit 2103082c - find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die - - #add specific gentoo java directories - if use gui; then - sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \ - -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die - sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \ - -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \ - -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \ - configure.ac || die - - sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \ - etc/librarypath.xml || die - fi - - mkdir jar || die - pushd jar >/dev/null - if use gui; then - java-pkg_jar-from jlatexmath-1,flexdock,skinlf - java-pkg_jar-from jgoodies-looks-2.6,jrosetta - java-pkg_jar-from avalon-framework-4.2,jeuclid-core - java-pkg_jar-from xmlgraphics-commons-2,commons-io-1 - java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar - java-pkg_jar-from gluegen-2.2 gluegen-rt.jar gluegen2-rt.jar - java-pkg_jar-from fop fop.jar - java-pkg_jar-from javahelp jhall.jar - java-pkg_jar-from jlatexmath-fop-1 - use xcos && java-pkg_jar-from jgraphx - if use doc; then - java-pkg_jar-from --build-only batik-1.9 batik-all.jar - java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar - java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar - fi - fi - if use emf; then - java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d - java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-graphicsbase - fi - if use test; then - java-pkg_jar-from junit-4 junit.jar junit4.jar - java-pkg_jar-from ant-junit - fi - popd - - java-pkg-opt-2_src_prepare - eautoconf -} - -src_configure() { - if use gui; then - export JAVA_HOME="$(java-config -O)" - else - unset JAVAC - fi - - export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)" - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - export F77_LDFLAGS="${LDFLAGS}" - - econf \ - --enable-relocatable \ - --disable-rpath \ - --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \ - --disable-static-system-lib \ - $(use_enable debug) \ - $(use_enable debug code-coverage) \ - $(use_enable debug debug-C) \ - $(use_enable debug debug-CXX) \ - $(use_enable debug debug-fortran) \ - $(use_enable debug debug-java) \ - $(use_enable debug debug-linker) \ - $(use_enable doc build-help) \ - $(use_enable nls) \ - $(use_enable nls build-localization) \ - $(use_enable static-libs static) \ - $(use_enable test compilation-tests) \ - $(use_with emf) \ - $(use_with fftw) \ - $(use_with gui) \ - $(use_with gui javasci) \ - $(use_with matio) \ - $(use_with openmp) \ - $(use_with tk) \ - $(use_with umfpack) \ - $(use_with xcos) \ - $(use_with xcos modelica) \ - $(use_with mpi) -} - -src_compile() { - addpredict /proc/mtrr - default - pax-mark m .libs/scilab-bin - use doc && emake doc -} - -src_test() { - if use gui; then - Xemake check - else - emake check - fi -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die - newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}" - bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli - echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \ - > 50-"${PN}" - insinto /etc/revdep-rebuild && doins "50-${PN}" -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update - einfo "If you are using the NVIDIA binary drivers, and run into graphics" - einfo "crashes, you may try to run scilab as follows:" - einfo "EGL_DRIVER=egl_glx scilab" - einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940" -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/scilab/scilab-6.0.2.ebuild b/sci-mathematics/scilab/scilab-6.0.2.ebuild deleted file mode 100644 index ed77b97bc..000000000 --- a/sci-mathematics/scilab/scilab-6.0.2.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_OPT_USE="gui" -VIRTUALX_REQUIRED="manual" - -inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \ - fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Scientific software package for numerical computations" -HOMEPAGE="https://www.scilab.org/" -SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -IUSE="debug doc emf fftw +gui +matio mpi nls openmp - static-libs test tk +umfpack +xcos" -REQUIRED_USE="xcos? ( gui ) doc? ( gui )" - -RESTRICT="test" - -IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs" -L10N_DOC="fr pt ja ru" - -map_lang() { - local lang=${1/_/-} - case $1 in - # Retain the following, which have a specific subtag - de_*|en_*|pt_*|zh_*) ;; - # Consider all other xx_XX as duplicates of the generic xx tag - *_*) lang=${1%%_*} ;; - esac - echo ${lang} -} - -prev_l= -for l in ${IUSE_L10N}; do - l=$(map_lang ${l}) - [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" - prev_l=${l} -done -unset l prev_l - -CDEPEND=" - dev-libs/libpcre - dev-libs/libxml2:2 - sci-libs/hdf5[mpi=] - >=sci-libs/arpack-3 - sci-libs/lapack[deprecated(-)] - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-process/time - emf? ( - dev-java/freehep-graphicsio:0 - dev-java/freehep-graphicsio-emf:0 - dev-java/freehep-graphics2d:0 - dev-java/freehep-io:0 - dev-java/freehep-graphicsbase:0 - ) - fftw? ( sci-libs/fftw:3.0 ) - gui? ( - dev-java/avalon-framework:4.2 - >=dev-java/batik-1.9:1.9 - dev-java/commons-io:1 - dev-java/commons-logging:0 - >=dev-java/flexdock-1.2.4:0 - >=dev-java/fop-2.0:0 - ~dev-java/gluegen-2.2.4:2.2 - dev-java/javahelp:0 - dev-java/jeuclid-core:0 - dev-java/jgoodies-looks:2.6 - >=dev-java/jlatexmath-1.0.3:1 - >=dev-java/jlatexmath-fop-1.0.3:1 - ~dev-java/jogl-2.2.4:2.2 - >=dev-java/jrosetta-1.0.4:0 - >dev-java/lucene-5:=[modules(-)] - <dev-java/lucene-7:=[modules(-)] - dev-java/skinlf:0 - dev-java/xmlgraphics-commons:2 - virtual/opengl - xcos? ( dev-java/jgraphx:0 ) - ) - matio? ( >=sci-libs/matio-1.5 ) - mpi? ( virtual/mpi[fortran] ) - tk? ( dev-lang/tk:0= ) - umfpack? ( sci-libs/umfpack )" - -RDEPEND="${CDEPEND} - gui? ( >=virtual/jre-1.8 )" - -DEPEND="${CDEPEND} - debug? ( dev-util/lcov ) - gui? ( - >=virtual/jdk-1.6 - doc? ( - app-text/docbook-xsl-stylesheets - dev-java/xml-commons-external:1.4 - dev-java/saxon:9 - ) - xcos? ( - >=dev-lang/ocaml-4.06 - dev-ml/num - ) - ) - test? ( - dev-java/junit:4 - dev-java/ant-junit4:0 - gui? ( ${VIRTUALX_DEPEND} ) )" -BDEPEND="virtual/pkgconfig" - -DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" ) - -PATCHES=( - "${FILESDIR}/${PN}-5.5.2-followlinks.patch" - "${FILESDIR}/${PN}-5.5.2-gluegen.patch" - "${FILESDIR}/${PN}-5.5.2-ocaml-4.0.4.patch" - "${FILESDIR}/${PN}-6.1.0-accessviolation.patch" - "${FILESDIR}/${PN}-5.5.2-missinglib.patch" - "${FILESDIR}/${PN}-6.1.0-freehep.patch" - "${FILESDIR}/${PN}-6.1.0-libxml.patch" -) - -pkg_pretend() { - use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend -} - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using a gcc without OpenMP capabilities" - die "Need an OpenMP capable compiler" - fi - FORTRAN_NEED_OPENMP=1 - fi - FORTRAN_STANDARD="77 90" - fortran-2_pkg_setup - #bug 8053 - unset F77 - java-pkg-opt-2_pkg_setup - - # fails to compile in src/fortran/optml2.f:172:50 without this - test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch - # failure in src/cpp/GetSparseVariable.cpp:106:22 - append-cxxflags -fpermissive - - ALL_L10N="en_US" - ALL_L10N_DOC="en_US" - for l in ${IUSE_L10N}; do - use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}" - done - for l in ${L10N_DOC}; do - use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}" - done - export ALL_L10N ALL_L10N_DOC -} - -src_prepare() { - default - - # increases java heap to 512M when building docs (sync with cheqreqs above) - use doc && eapply "${FILESDIR}/${P}-java-heap.patch" - - # use the L10N variable that we set - sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die - - # make sure the DOCBOOK_ROOT variable is set - sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die - - # fix QA for metainfo data installation path - sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die - - # remove self closing <br /> (error our with javadoc8) - # already upstream commit 2103082c - find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die - - #add specific gentoo java directories - if use gui; then - sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \ - -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die - sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \ - -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \ - -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \ - configure.ac || die - - sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \ - etc/librarypath.xml || die - fi - - mkdir jar || die - pushd jar >/dev/null - if use gui; then - java-pkg_jar-from jlatexmath-1,flexdock,skinlf - java-pkg_jar-from jgoodies-looks-2.6,jrosetta - java-pkg_jar-from avalon-framework-4.2,jeuclid-core - java-pkg_jar-from xmlgraphics-commons-2,commons-io-1 - java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar - java-pkg_jar-from gluegen-2.2 gluegen-rt.jar gluegen2-rt.jar - java-pkg_jar-from fop fop.jar - java-pkg_jar-from javahelp jhall.jar - java-pkg_jar-from jlatexmath-fop-1 - use xcos && java-pkg_jar-from jgraphx - if use doc; then - java-pkg_jar-from --build-only batik-1.9 batik-all.jar - java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar - java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar - fi - fi - if use emf; then - java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d - java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-graphicsbase - fi - if use test; then - java-pkg_jar-from junit-4 junit.jar junit4.jar - java-pkg_jar-from ant-junit - fi - popd - - java-pkg-opt-2_src_prepare - eautoconf -} - -src_configure() { - if use gui; then - export JAVA_HOME="$(java-config -O)" - else - unset JAVAC - fi - - export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)" - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - export F77_LDFLAGS="${LDFLAGS}" - - econf \ - --enable-relocatable \ - --disable-rpath \ - --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \ - --disable-static-system-lib \ - $(use_enable debug) \ - $(use_enable debug code-coverage) \ - $(use_enable debug debug-C) \ - $(use_enable debug debug-CXX) \ - $(use_enable debug debug-fortran) \ - $(use_enable debug debug-java) \ - $(use_enable debug debug-linker) \ - $(use_enable doc build-help) \ - $(use_enable nls) \ - $(use_enable nls build-localization) \ - $(use_enable static-libs static) \ - $(use_enable test compilation-tests) \ - $(use_with emf) \ - $(use_with fftw) \ - $(use_with gui) \ - $(use_with gui javasci) \ - $(use_with matio) \ - $(use_with openmp) \ - $(use_with tk) \ - $(use_with umfpack) \ - $(use_with xcos) \ - $(use_with xcos modelica) \ - $(use_with mpi) -} - -src_compile() { - addpredict /proc/mtrr - default - pax-mark m .libs/scilab-bin - use doc && emake doc -} - -src_test() { - if use gui; then - Xemake check - else - emake check - fi -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die - newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}" - bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli - echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \ - > 50-"${PN}" - insinto /etc/revdep-rebuild && doins "50-${PN}" -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update - einfo "If you are using the NVIDIA binary drivers, and run into graphics" - einfo "crashes, you may try to run scilab as follows:" - einfo "EGL_DRIVER=egl_glx scilab" - einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940" -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild b/sci-mathematics/scilab/scilab-6.1.0.ebuild deleted file mode 100644 index 542930bdb..000000000 --- a/sci-mathematics/scilab/scilab-6.1.0.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_OPT_USE="gui" -VIRTUALX_REQUIRED="manual" - -inherit autotools bash-completion-r1 check-reqs eutils flag-o-matic \ - fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Scientific software package for numerical computations" -HOMEPAGE="https://www.scilab.org/" -SRC_URI="https://www.scilab.org/download/${PV}/${P}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -IUSE="debug doc emf fftw +gui +matio mpi nls openmp - static-libs test tk +umfpack +xcos" -REQUIRED_USE="xcos? ( gui ) doc? ( gui )" - -RESTRICT="test" - -IUSE_L10N="fr zh zh ru ca de es pt ja it uk pl cs" -L10N_DOC="fr pt ja ru" - -map_lang() { - local lang=${1/_/-} - case $1 in - # Retain the following, which have a specific subtag - de_*|en_*|pt_*|zh_*) ;; - # Consider all other xx_XX as duplicates of the generic xx tag - *_*) lang=${1%%_*} ;; - esac - echo ${lang} -} - -prev_l= -for l in ${IUSE_L10N}; do - l=$(map_lang ${l}) - [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" - prev_l=${l} -done -unset l prev_l - -CDEPEND=" - dev-libs/libpcre - dev-libs/libxml2:2 - sci-libs/hdf5[mpi=] - >=sci-libs/arpack-3 - sci-libs/lapack[deprecated(-)] - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-process/time - emf? ( - dev-java/freehep-graphicsio:0 - dev-java/freehep-graphicsio-emf:0 - dev-java/freehep-graphics2d:0 - dev-java/freehep-io:0 - dev-java/freehep-graphicsbase:0 - ) - fftw? ( sci-libs/fftw:3.0 ) - gui? ( - dev-java/avalon-framework:4.2 - >=dev-java/batik-1.9:1.9 - dev-java/commons-io:1 - dev-java/commons-logging:0 - >=dev-java/flexdock-1.2.4:0 - >=dev-java/fop-2.0:0 - ~dev-java/gluegen-2.2.4:2.2 - dev-java/javahelp:0 - dev-java/jeuclid-core:0 - dev-java/jgoodies-looks:2.6 - >=dev-java/jlatexmath-1.0.3:1 - >=dev-java/jlatexmath-fop-1.0.3:1 - ~dev-java/jogl-2.2.4:2.2 - >=dev-java/jrosetta-1.0.4:0 - >dev-java/lucene-7:=[modules(-)] - dev-java/skinlf:0 - dev-java/xmlgraphics-commons:2 - virtual/opengl - xcos? ( dev-java/jgraphx:0 ) - ) - matio? ( >=sci-libs/matio-1.5 ) - mpi? ( virtual/mpi[fortran] ) - tk? ( dev-lang/tk:0= ) - umfpack? ( sci-libs/umfpack )" - -RDEPEND="${CDEPEND} - gui? ( >=virtual/jre-1.8 )" - -DEPEND="${CDEPEND} - debug? ( dev-util/lcov ) - gui? ( - >=virtual/jdk-1.6 - doc? ( - app-text/docbook-xsl-stylesheets - dev-java/xml-commons-external:1.4 - dev-java/saxon:9 - ) - xcos? ( - >=dev-lang/ocaml-4.06 - dev-ml/num - ) - ) - test? ( - dev-java/junit:4 - dev-java/ant-junit4:0 - gui? ( ${VIRTUALX_DEPEND} ) )" -BDEPEND="virtual/pkgconfig" - -DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" ) - -PATCHES=( - "${FILESDIR}/${PN}-5.5.2-followlinks.patch" - "${FILESDIR}/${PN}-5.5.2-gluegen.patch" - "${FILESDIR}/${PN}-5.5.2-ocaml-4.0.4.patch" - "${FILESDIR}/${P}-accessviolation.patch" - "${FILESDIR}/${PN}-5.5.2-missinglib.patch" - "${FILESDIR}/${P}-freehep.patch" - "${FILESDIR}/${P}-libxml.patch" -) - -pkg_pretend() { - use doc && CHECKREQS_MEMORY="512M" check-reqs_pkg_pretend -} - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using a gcc without OpenMP capabilities" - die "Need an OpenMP capable compiler" - fi - FORTRAN_NEED_OPENMP=1 - fi - FORTRAN_STANDARD="77 90" - fortran-2_pkg_setup - #bug 8053 - unset F77 - java-pkg-opt-2_pkg_setup - - # fails to compile in src/fortran/optml2.f:172:50 without this - test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch - # failure in src/cpp/GetSparseVariable.cpp:106:22 - append-cxxflags -fpermissive - - ALL_L10N="en_US" - ALL_L10N_DOC="en_US" - for l in ${IUSE_L10N}; do - use l10n_${l} && ALL_L10N="${ALL_L10N} ${l}" - done - for l in ${L10N_DOC}; do - use l10n_${l} && ALL_L10N_DOC="${ALL_L10N_DOC} ${l}" - done - export ALL_L10N ALL_L10N_DOC -} - -src_prepare() { - default - - # increases java heap to 512M when building docs (sync with cheqreqs above) - use doc && eapply "${FILESDIR}/${P}-java-heap.patch" - - # use the L10N variable that we set - sed -i -e "/^ALL_LINGUAS=/d" -e "/^ALL_LINGUAS_DOC=/d" -i configure.ac ||die - - # make sure the DOCBOOK_ROOT variable is set - sed -i -e "s/xsl-stylesheets-\*/xsl-stylesheets/g" bin/scilab* || die - - # fix QA for metainfo data installation path - sed -i.bkp -e "s:/appdata:/metainfo:" desktop/Makefile.in || die - - # remove self closing <br /> (error our with javadoc8) - # already upstream commit 2103082c - find . -name '*.java' -exec sed -i "s|<br />|<BR>|" {} \; ||die - - #add specific gentoo java directories - if use gui; then - sed -i -e "s|/usr/lib/jogl2|/usr/lib/jogl-2.2|" \ - -e "s|/usr/lib64/jogl2|/usr/lib64/jogl-2.2|" configure.ac || die - sed -i -e "s|/usr/lib/gluegen2|/usr/lib/gluegen-2.2|" \ - -e "s|/usr/lib64/gluegen2|/usr/lib64/gluegen-2.2|" \ - -e "s|AC_CHECK_LIB(\[gluegen2-rt|AC_CHECK_LIB([gluegen-rt|" \ - configure.ac || die - - sed -i -e "s/jogl2/jogl-2.2/" -e "s/gluegen2/gluegen-2.2/" \ - etc/librarypath.xml || die - fi - - mkdir jar || die - pushd jar >/dev/null - if use gui; then - java-pkg_jar-from jlatexmath-1,flexdock,skinlf - java-pkg_jar-from jgoodies-looks-2.6,jrosetta - java-pkg_jar-from avalon-framework-4.2,jeuclid-core - java-pkg_jar-from xmlgraphics-commons-2,commons-io-1 - java-pkg_jar-from jogl-2.2 jogl-all.jar jogl2.jar - java-pkg_jar-from gluegen-2.2 gluegen-rt.jar gluegen2-rt.jar - java-pkg_jar-from fop fop.jar - java-pkg_jar-from javahelp jhall.jar - java-pkg_jar-from jlatexmath-fop-1 - use xcos && java-pkg_jar-from jgraphx - if use doc; then - java-pkg_jar-from --build-only batik-1.9 batik-all.jar - java-pkg_jar-from --build-only saxon-9 saxon.jar saxon9he.jar - java-pkg_jar-from --build-only xml-commons-external-1.4 xml-apis-ext.jar - fi - fi - if use emf; then - java-pkg_jar-from freehep-graphicsio-emf,freehep-graphics2d - java-pkg_jar-from freehep-graphicsio,freehep-io,freehep-graphicsbase - fi - if use test; then - java-pkg_jar-from junit-4 junit.jar junit4.jar - java-pkg_jar-from ant-junit - fi - popd - - java-pkg-opt-2_src_prepare - eautoconf -} - -src_configure() { - if use gui; then - export JAVA_HOME="$(java-config -O)" - else - unset JAVAC - fi - - export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)" - export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" - export F77_LDFLAGS="${LDFLAGS}" - - econf \ - --enable-relocatable \ - --disable-rpath \ - --with-docbook="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets" \ - --disable-static-system-lib \ - $(use_enable debug) \ - $(use_enable debug code-coverage) \ - $(use_enable debug debug-C) \ - $(use_enable debug debug-CXX) \ - $(use_enable debug debug-fortran) \ - $(use_enable debug debug-java) \ - $(use_enable debug debug-linker) \ - $(use_enable doc build-help) \ - $(use_enable nls) \ - $(use_enable nls build-localization) \ - $(use_enable static-libs static) \ - $(use_enable test compilation-tests) \ - $(use_with emf) \ - $(use_with fftw) \ - $(use_with gui) \ - $(use_with gui javasci) \ - $(use_with matio) \ - $(use_with openmp) \ - $(use_with tk) \ - $(use_with umfpack) \ - $(use_with xcos) \ - $(use_with xcos modelica) \ - $(use_with mpi) -} - -src_compile() { - addpredict /proc/mtrr - default - pax-mark m .libs/scilab-bin - use doc && emake doc -} - -src_test() { - if use gui; then - Xemake check - else - emake check - fi -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - rm -rf "${D}"/usr/share/scilab/modules/*/tests ||die - newbashcomp "${FILESDIR}"/"${PN}".bash_completion "${PN}" - bashcomp_alias ${PN} ${PN}-cli ${PN}-adv-cli - echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/$(get_libdir)/scilab" \ - > 50-"${PN}" - insinto /etc/revdep-rebuild && doins "50-${PN}" -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update - einfo "If you are using the NVIDIA binary drivers, and run into graphics" - einfo "crashes, you may try to run scilab as follows:" - einfo "EGL_DRIVER=egl_glx scilab" - einfo "See upstream http://bugzilla.scilab.org/show_bug.cgi?id=12940" -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/why3/Manifest b/sci-mathematics/why3/Manifest deleted file mode 100644 index 20a390e40..000000000 --- a/sci-mathematics/why3/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST why3-1.3.3.tar.gz 5807572 BLAKE2B b1a04e78010f841e217b9a81c096cadfa0cddabadbe81ef55c310a104668feb1e46cd50576a965a58c74658903d6d08f9fd348bd2064a79ac3b176548927bcbe SHA512 a2dc95691cea29bbd20843a05add3985f777085086b654b53566ecdb752ba892366da703e232c85d5e0237d0e59564527aed55f6ccae9118d49e5f2cf93a53ce diff --git a/sci-mathematics/why3/metadata.xml b/sci-mathematics/why3/metadata.xml deleted file mode 100644 index 5f92771c1..000000000 --- a/sci-mathematics/why3/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> -Why3 is a platform for deductive program verification. It provides -a rich language for specification and programming, called WhyML, -and relies on external theorem provers, both automated and interactive, -to discharge verification conditions. Why3 comes with a standard -library of logical theories (integer and real arithmetic, Boolean -operations, sets and maps, etc.) and basic programming data structures -(arrays, queues, hash tables, etc.). A user can write WhyML programs -directly and get correct-by-construction OCaml programs through an -automated extraction mechanism. WhyML is also used as an intermediate -language for the verification of C, Java, or Ada programs. -</longdescription> - <use> - <flag name="float">Add <pkg>sci-mathematics/flocq</pkg> support</flag> - <flag name="frama-c">Enable Frama-C plugin</flag> - </use> -</pkgmetadata> diff --git a/sci-mathematics/why3/why3-1.3.3.ebuild b/sci-mathematics/why3/why3-1.3.3.ebuild deleted file mode 100644 index 62706c32f..000000000 --- a/sci-mathematics/why3/why3-1.3.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DOCS_BUILDER="sphinx" -DOCS_DIR="doc" -DOCS_DEPEND=" - dev-python/sphinxcontrib-bibtex - dev-python/graphviz -" - -inherit python-any-r1 docs - -DESCRIPTION="Why3 is a platform for deductive program verification" -HOMEPAGE="http://why3.lri.fr/" -SRC_URI="https://gforge.inria.fr/frs/download.php/file/38367/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="float frama-c examples" - -DEPEND=" - >=dev-lang/ocaml-3.12.1 - dev-ml/zarith - dev-ml/menhir - dev-ml/num - sci-mathematics/coq - frama-c? ( >=sci-mathematics/frama-c-22 ) - float? ( sci-mathematics/flocq ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - mv doc/why.1 doc/why3.1 || die - sed -i configure.in -e "s/\"pvs\"/\"sri-pvs\"/g" || die - sed -i configure -e "s/\"pvs\"/\"sri-pvs\"/g" || die - # fix dev-ml/num path - sed -i configure.in -e "s/nums.cma/num.cma/g" -e "s/num.cmi/core\/num.cmi/g" || die - sed -i configure -e "s/nums.cma/num.cma/g" -e "s/num.cmi/core\/num.cmi/g" || die - sed -i Makefile.in -e "s:DESTDIR =::g" \ - -e "s:\$(RUBBER) --warn all --pdf manual.tex:makeindex manual.tex; \$(RUBBER) --warn all --pdf manual.tex; cd ..:g" || die - # add autodoc to sphinx - sed -i -e "/^extensions = \[/a \ \ \ \ \'sphinx.ext.autodoc\'," doc/conf.py || die -} - -src_configure() { - econf $(use_enable frama-c) -} - -src_compile() { - docs_compile - default -} - -src_install(){ - default - use examples && dodoc -r examples -} |
