summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/gfan/Manifest1
-rw-r--r--sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch12
-rw-r--r--sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch55
-rw-r--r--sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch68
-rw-r--r--sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch70
-rw-r--r--sci-mathematics/gfan/gfan-0.5-r1.ebuild37
6 files changed, 0 insertions, 243 deletions
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index b0e6c30ed01..23cbc2f6027 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -1,2 +1 @@
-DIST gfan0.5.tar.gz 1134987 BLAKE2B 73ea793f5dbceb76a9f143a258ee3e38e1466e4e15ed96dbabb58f33d3a091a885479dd00f8179d3bf2c85cf275605823f63aa33272f1f9984e0fc5841ab35e9 SHA512 11a9657adcd5b39f73244450c09b132d8cd19474d0f9151c0127682bc16847537e4096d39e8a0a63b5c6aef6720e54a72bfd361a5271808d5a5595fd2df494fa
DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
diff --git a/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch b/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch
deleted file mode 100644
index 23954088401..00000000000
--- a/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN gfan0.5/app_minkowski.cpp gfan0.5-new/app_minkowski.cpp
---- gfan0.5/app_minkowski.cpp 2011-01-23 12:21:47.000000000 -0500
-+++ gfan0.5-new/app_minkowski.cpp 2012-06-29 15:23:48.604280985 -0400
-@@ -160,7 +160,7 @@
- //log0 fprintf(Stderr,"4");
- f.insert(c);
- //log0 fprintf(Stderr,"5\n");
-- static int i;
-+ // static int i;
- //log0 fprintf(Stderr,"inserted:%i\n",++i);
- }
- log1 fprintf(Stderr,"Resolving symmetries.\n");
diff --git a/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch b/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch
deleted file mode 100644
index 3bf96ed088c..00000000000
--- a/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,5 @@
- ALL: default
-
--# GPROFFLAG = -pg
-- GPROFFLAG = -g
-
- PREFIX?=/usr/local
-
-@@ -77,16 +75,13 @@
-
- SHELL = /bin/sh
- #ARCH = LINUX
--CC = gcc
- CLINKER = $(CC)
--CXX = g++
- CCLINKER = $(CXX)
--#OPTFLAGS = -O2 -DGMPRATIONAL -DNDEBUG
--OPTFLAGS = -O2 -DGMPRATIONAL -Wuninitialized
-
--CFLAGS = $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) #-pedantic
--CCFLAGS = $(CFLAGS)
--FFLAGS = $(OPTFLAGS)
-+
-+CFLAGS += $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) -Wuninitialized
-+CXXFLAGS += $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) -Wuninitialized
-+CPPFLAGS += -DGMPRATIONAL -DNDEBUG
-
- CATSOBJECTS = $(GCATSPATH)lp_cdd.o \
- $(SOPLEX_OBJECTS) \
-@@ -317,7 +312,7 @@
- default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
-
- $(MAIN): $(OBJECTS)
-- $(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
-+ $(CCLINKER) $(LDFLAGS) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
-
- release:
- rm -f -r $(RELEASEDIR)/*
-@@ -430,14 +425,6 @@
- cp gfanlib.h gfanlib/
- cp gfanlib_* gfanlib/
- tar zcf - gfanlib > gfanlib.tar.gz
--.c.o:
-- $(CC) $(CFLAGS) -c $<
--.cc.o:
-- $(CXX) -c $<
--.cpp.o:
-- $(CXX) $(CFLAGS) -c $<
--.C.o:
-- $(CXX) -c $<
- # wget http://ftp.sunet.se/pub/gnu/gmp/gmp-4.2.2.tar.gz
- # tar -xzvf gmp-4.2.2.tar.gz
- # cd gmp-4.2.2
diff --git a/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch b/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch
deleted file mode 100644
index 930baf9edcf..00000000000
--- a/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.gentoo.org/686484
-
-polyhedralfan.h: At global scope:
-polyhedralfan.h:77:24: error: friend declaration of ‘PolyhedralFan refinement(const PolyhedralFan&, const PolyhedralFan&, int, bool)’ specifies default arguments and isn’t a definition [-fpermissive]
- 77 | friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
- | ^~~~~~~~~~
-
---- a/gfanlib_polyhedralfan.h
-+++ b/gfanlib_polyhedralfan.h
-@@ -24,6 +24,8 @@
- typedef std::map<int,IntVectorList> IncidenceList;
-
-
-+class PolyhedralFan;
-+PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
-
- /** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
- * It contains no combinatorial information in the sense of a polyhedral complex.
-@@ -52,7 +54,7 @@
- int getAmbientDimension()const;
- int getMaxDimension()const;
- int getMinDimension()const;
-- friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
-+ friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
- ZMatrix getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
- ZMatrix getRelativeInteriorPoints();
- void insert(ZCone const &c);
---- a/halfopencone.h
-+++ b/halfopencone.h
-@@ -6,6 +6,9 @@
-
- #include "polyhedralfan.h"
-
-+class HalfOpenCone;
-+HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
-+
- class HalfOpenCone{
- static void appendList(IntegerVectorList &to, IntegerVectorList const &from, int appendValue);
- int liftedDimension;//ambient
-@@ -18,7 +21,7 @@
- HalfOpenCone(int dimension_, IntegerVectorList const &equations, IntegerVectorList const &nonstrict, IntegerVectorList const &strict, bool findFacets=false, bool canonicalize=false);
- HalfOpenCone(int ambientDimension);//full space
- bool isEmpty();
-- friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
-+ friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets);
- friend bool haveEmptyIntersection(const HalfOpenCone &a, const HalfOpenCone &b);
- PolyhedralCone closure();
- void splitIntoRelativelyOpenCones(list<HalfOpenCone> &l);
---- a/polyhedralfan.h
-+++ b/polyhedralfan.h
-@@ -30,6 +30,8 @@
- FPF_default=2+4+8
- };
-
-+class PolyhedralFan;
-+PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
-
- /** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
- * It contains no combinatorial information in the sense of a polyhedral complex.
-@@ -74,7 +76,7 @@
- int getAmbientDimension()const;
- int getMaxDimension()const;
- int getMinDimension()const;
-- friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
-+ friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
- friend PolyhedralFan product(const PolyhedralFan &a, const PolyhedralFan &b);
- IntegerVectorList getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
- IntegerVectorList getRelativeInteriorPoints();
diff --git a/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch b/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch
deleted file mode 100644
index 8479557b61b..00000000000
--- a/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/app_fiberpolytope.cpp
-+++ b/app_fiberpolytope.cpp
-@@ -63,7 +63,7 @@
-
- /* If the vector configuration B does not have full rank then
- change coordinates. */
-- if(rank(B)!=B.getHeight())
-+ if(rank_(B)!=B.getHeight())
- {
- FieldMatrix M=integerMatrixToFieldMatrix(B,Q);
- M.reduce(false,true);//force integer operations - preserving volume
-@@ -83,7 +83,7 @@
- log1 debug<<"Done computing restricting cone\n";
-
- debug<<B.getRows();
-- debug<<int(rank(B));
-+ debug<<int(rank_(B));
-
- Triangulation2 t(B);
- log1 debug<<"Computing initial triangulation\n";
-@@ -143,7 +143,7 @@
- */
- /* If the vector configuration A does not have full rank then
- change coordinates. */
--/* if(rank(A)!=A.getHeight())
-+/* if(rank_(A)!=A.getHeight())
- {
- FieldMatrix M=integerMatrixToFieldMatrix(A,Q);
- M.reduce(false,true);//force integer operations - preserving volume
---- a/app_secondaryfan.cpp
-+++ b/app_secondaryfan.cpp
-@@ -307,7 +307,7 @@
-
- if(scaleOption.getValue())
- {
-- if(rank(A)!=A.getHeight())
-+ if(rank_(A)!=A.getHeight())
- {
- cerr << "The vector configuration must have full rank in order to use the scale option.\n";
- assert(0);
-@@ -342,7 +342,7 @@
-
- /* If the vector configuration A does not have full rank then
- change coordinates. */
-- if(rank(A)!=A.getHeight())
-+ if(rank_(A)!=A.getHeight())
- {
- FieldMatrix M=integerMatrixToFieldMatrix(A,Q);
- M.reduce(false,true);//force integer operations - preserving volume
---- a/matrix.cpp
-+++ b/matrix.cpp
-@@ -61,7 +61,7 @@
-
- #include "linalg.h"
-
--int rank(IntegerMatrix const &m)
-+int rank_(IntegerMatrix const &m)
- {
- return integerMatrixToFieldMatrix(m,Q).rank();
- }
---- a/matrix.h
-+++ b/matrix.h
-@@ -147,6 +147,6 @@
-
- FloatMatrix integerToFloatMatrix(IntegerMatrix const &m);
- IntegerVector flattenMatrix(IntegerMatrix const &m);
--int rank(IntegerMatrix const &m);
-+int rank_(IntegerMatrix const &m);
-
- #endif
diff --git a/sci-mathematics/gfan/gfan-0.5-r1.ebuild b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
deleted file mode 100644
index 1cd8c95fbec..00000000000
--- a/sci-mathematics/gfan/gfan-0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varities"
-HOMEPAGE="http://www.math.tu-berlin.de/~jensen/software/gfan/gfan.html"
-SRC_URI="http://www.math.tu-berlin.de/~jensen/software/gfan/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- dev-libs/gmp:0=[cxx]
- sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}/"
-
-PATCHES=(
- "${FILESDIR}"/${P}-double-declare-fix.patch
- "${FILESDIR}"/${P}-gcc6.1-compat.patch
- "${FILESDIR}"/${P}-fix-build-system.patch
- "${FILESDIR}"/${P}-fix-gcc9.patch
-)
-
-src_configure() {
- tc-export CXX
-}
-
-src_install() {
- emake PREFIX="${ED}/usr" install
- einstalldocs
-}