[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2024-03-21 Thread Sam James 
commit: 46b9cf346a38c8ac7e937bb7f83680498292dfeb
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu Mar 21 23:57:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 22 05:31:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b9cf34

sci-mathematics/gfan: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/863044
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r4.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index e4c81181dbaf..29b330866f46 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -48,6 +48,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/863044
+   # Only contact method is email. I have sent one detailing the issue.
+   filter-lto
+
# The upstream Makefile says that GCC produces bad code with -O3.
replace-flags "-O3" "-O2"
default

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2022-01-27 Thread Michael Orlitzky 
commit: e347c86f458b202e25985944ec097f72e94f3f23
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jan 27 13:29:07 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jan 27 13:29:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e347c86f

sci-mathematics/gfan: remove old "unused" ebuilds.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r2.ebuild | 67 ---
 sci-mathematics/gfan/gfan-0.6.2-r3.ebuild | 67 ---
 2 files changed, 134 deletions(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
deleted file mode 100644
index 24132c367b9e..
--- a/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varieties"
-HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html;
-SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx(+)]
-   sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
-   "${FILESDIR}/${PN}-0.6.2-testsuite.patch"
-   "${FILESDIR}/${PN}-0.6.2-Makefile.patch"
-   )
-
-pkg_setup() {
-   tc-export CC CXX
-
-   # This should really go in cppflags, but that doesn't work with
-   # gfan's hand-written Makefile.
-   append-cxxflags -DNOCDDPREFIX
-}
-
-src_prepare() {
-   default
-
-   # This test hangs on x86, bug 717112.
-   rm -r testsuite/0602ResultantFanProjection || \
-   die "unable to disable test 0602ResultantFanProjection"
-}
-
-src_configure() {
-   # The upstream Makefile says that GCC produces bad code with -O3.
-   replace-flags "-O3" "-O2"
-   default
-}
-
-src_compile() {
-   default
-   if use doc; then
-   pushd doc > /dev/null || die
-   # The LaTeX build commands need to be repeated until the
-   # document "stops changing," which is not as easy as it
-   # sounds to detect. Running it twice seems to work here.
-   pdflatex manual.tex && bibtex manual && pdflatex manual.tex || 
die
-   popd > /dev/null || die
-   fi
-}
-
-src_install() {
-   emake PREFIX="${ED}/usr" install
-   use doc && dodoc doc/manual.pdf
-}

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
deleted file mode 100644
index 00132defd82f..
--- a/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varieties"
-HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html;
-SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx(+)]
-   sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
-   "${FILESDIR}/${PN}-0.6.2-testsuite.patch"
-   "${FILESDIR}/${PN}-0.6.2-Makefile.patch"
-   )
-
-pkg_setup() {
-   tc-export CC CXX
-
-   # This should really go in cppflags, but that doesn't work with
-   # gfan's hand-written Makefile.
-   append-cxxflags -DNOCDDPREFIX -I"${EPREFIX}"/usr/include/cddlib
-}
-
-src_prepare() {
-   default
-
-   # This test hangs on x86, bug 717112.
-   rm -r testsuite/0602ResultantFanProjection || \
-   die "unable to disable test 0602ResultantFanProjection"
-}
-
-src_configure() {
-   # The upstream Makefile says that GCC produces bad code with -O3.
-   replace-flags "-O3" "-O2"
-   default
-}
-
-src_compile() {
-   default
-   if use doc; then
-   pushd doc > /dev/null || die
-   # The LaTeX build commands need to be repeated until the
-   # document "stops changing," which is not as easy as it
-   # sounds to detect. Running it twice seems to work here.
-   pdflatex manual.tex && bibtex manual && pdflatex manual.tex || 
die
-   popd > /dev/null || die
-   fi
-}
-
-src_install() {
-   emake PREFIX="${ED}/usr" install
-   use doc && dodoc doc/manual.pdf
-}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2022-01-26 Thread Jakov Smolić 
commit: 3033c4f2544e301ab09e304524c9d8ec24bce9af
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jan 26 20:24:26 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jan 26 20:24:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3033c4f2

sci-mathematics/gfan: Stabilize 0.6.2-r4 amd64, #832044

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 035c8c110229..1ec0a87690e9 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2022-01-26 Thread Jakov Smolić 
commit: b2b5d9fb6cab1ee5cdf1ac7b99fb4d661e885d96
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jan 26 20:16:30 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jan 26 20:17:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b5d9fb

sci-mathematics/gfan: Stabilize 0.6.2-r4 x86, #832044

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 13b77d43b8ad..035c8c110229 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2022-01-25 Thread Michael Orlitzky 
commit: 1c38dbf8389e230596629b3ce1a1bb9d2ffc2e84
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jan 25 13:01:14 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jan 25 13:32:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c38dbf8

sci-mathematics/gfan: disable test that fails on x86.

Closes: https://bugs.gentoo.org/818397
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r4.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 6ef0572a0ec3..13b77d43b8ad 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -41,6 +41,10 @@ src_prepare() {
# This test hangs on x86, bug 717112.
rm -r testsuite/0602ResultantFanProjection || \
die "unable to disable test 0602ResultantFanProjection"
+
+   # And this one fails (harmlessly) on x86, bug 818397.
+   rm -r testsuite/0009RenderStairCase || \
+   die "unable to disable test 0009RenderStairCase"
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2022-01-25 Thread Michael Orlitzky 
commit: 033921e6456dcaeef51ded6440621d734088dd5a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jan 25 11:43:16 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jan 25 11:46:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033921e6

sci-mathematics/gfan: new revision to fix the doc build.

Something changed with LaTeX and now we need a different set of
commands to build the manual.

Closes: https://bugs.gentoo.org/830091
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r4.ebuild | 71 +++
 1 file changed, 71 insertions(+)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
new file mode 100644
index ..6ef0572a0ec3
--- /dev/null
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Compute Groebner fans and tropical varieties"
+HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html;
+SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="doc? ( virtual/latex-base )"
+DEPEND="dev-libs/gmp:0=[cxx(+)]
+   sci-libs/cddlib:0="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
+   "${FILESDIR}/${PN}-0.6.2-testsuite.patch"
+   "${FILESDIR}/${PN}-0.6.2-Makefile.patch"
+   )
+
+pkg_setup() {
+   tc-export CC CXX
+
+   # This should really go in cppflags, but that doesn't work with
+   # gfan's hand-written Makefile.
+   append-cxxflags -DNOCDDPREFIX -I"${EPREFIX}"/usr/include/cddlib
+}
+
+src_prepare() {
+   default
+
+   # This test hangs on x86, bug 717112.
+   rm -r testsuite/0602ResultantFanProjection || \
+   die "unable to disable test 0602ResultantFanProjection"
+}
+
+src_configure() {
+   # The upstream Makefile says that GCC produces bad code with -O3.
+   replace-flags "-O3" "-O2"
+   default
+}
+
+src_compile() {
+   default
+   if use doc; then
+   pushd doc > /dev/null || die
+   # The LaTeX build commands need to be repeated until the
+   # document "stops changing," which is not as easy as it
+   # sounds to detect. Running it twice seems to work here.
+   for iteration in 1 2; do
+   latex manual.tex && \
+   bibtex manual && \
+   dvipdf manual.dvi manual.pdf || die
+   done
+   popd > /dev/null || die
+   fi
+}
+
+src_install() {
+   emake PREFIX="${ED}/usr" install
+   use doc && dodoc doc/manual.pdf
+}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2021-06-18 Thread David Seifert 
commit: 679d6d8c8e2f7a665ec20330852f6a1b4cf2dd56
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jun 18 13:15:33 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 18 13:15:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679d6d8c

sci-mathematics/gfan: Depend on dev-libs/gmp[cxx(+)]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/gfan/{gfan-0.6.2.ebuild => gfan-0.6.2-r2.ebuild}| 4 ++--
 sci-mathematics/gfan/{gfan-0.6.2-r1.ebuild => gfan-0.6.2-r3.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
similarity index 95%
rename from sci-mathematics/gfan/gfan-0.6.2.ebuild
rename to sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
index 44e05155003..24132c367b9 100644
--- a/sci-mathematics/gfan/gfan-0.6.2.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx]
+DEPEND="dev-libs/gmp:0=[cxx(+)]
sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"
 

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
similarity index 98%
rename from sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
rename to sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
index 185e558ce12..00132defd82 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx]
+DEPEND="dev-libs/gmp:0=[cxx(+)]
sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2021-05-29 Thread Sam James 
commit: 2fa043b4ebb8e590ce254ce84f5108c20b8e0698
Author: Sam James  gentoo  org>
AuthorDate: Sat May 29 15:19:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 29 15:19:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa043b4

sci-mathematics/gfan: Stabilize 0.6.2-r1 amd64, #762817

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
index 01434747eed..185e558ce12 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2021-03-02 Thread Michael Orlitzky 
commit: 9a29bad46e9208e1ad584d66e27ae2bfafe2f7f2
Author: François Bissey  gmail  com>
AuthorDate: Fri Feb 26 01:13:26 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Mar  3 02:46:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a29bad4

sci-mathematics/gfan: adapt to newer cddlib

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/19661
Bug: https://bugs.gentoo.org/show_bug.cgi?id=762817
Signed-off-by: François René Pierre Bissey  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2-r1.ebuild | 67 +++
 1 file changed, 67 insertions(+)

diff --git a/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
new file mode 100644
index 000..01434747eed
--- /dev/null
+++ b/sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Compute Groebner fans and tropical varieties"
+HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html;
+SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="doc? ( virtual/latex-base )"
+DEPEND="dev-libs/gmp:0=[cxx]
+   sci-libs/cddlib:0="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
+   "${FILESDIR}/${PN}-0.6.2-testsuite.patch"
+   "${FILESDIR}/${PN}-0.6.2-Makefile.patch"
+   )
+
+pkg_setup() {
+   tc-export CC CXX
+
+   # This should really go in cppflags, but that doesn't work with
+   # gfan's hand-written Makefile.
+   append-cxxflags -DNOCDDPREFIX -I"${EPREFIX}"/usr/include/cddlib
+}
+
+src_prepare() {
+   default
+
+   # This test hangs on x86, bug 717112.
+   rm -r testsuite/0602ResultantFanProjection || \
+   die "unable to disable test 0602ResultantFanProjection"
+}
+
+src_configure() {
+   # The upstream Makefile says that GCC produces bad code with -O3.
+   replace-flags "-O3" "-O2"
+   default
+}
+
+src_compile() {
+   default
+   if use doc; then
+   pushd doc > /dev/null || die
+   # The LaTeX build commands need to be repeated until the
+   # document "stops changing," which is not as easy as it
+   # sounds to detect. Running it twice seems to work here.
+   pdflatex manual.tex && bibtex manual && pdflatex manual.tex || 
die
+   popd > /dev/null || die
+   fi
+}
+
+src_install() {
+   emake PREFIX="${ED}/usr" install
+   use doc && dodoc doc/manual.pdf
+}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2020-04-15 Thread Michael Orlitzky 
commit: ee4164ea823436d8d4ba9f9f3ee0ca517de4141e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Apr 15 13:34:01 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Apr 15 13:49:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4164ea

sci-mathematics/gfan: disable test that hangs on x86.

The "0602ResultantFanProjection" test hangs on x86, leading to a build
failure. Disabling this test looks as simple as deleting it from the
source tree, which the ebuild now does in src_prepare().

Bug: https://bugs.gentoo.org/717112
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2.ebuild | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/sci-mathematics/gfan/gfan-0.6.2.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2.ebuild
index eac7123f262..44e05155003 100644
--- a/sci-mathematics/gfan/gfan-0.6.2.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2.ebuild
@@ -29,9 +29,20 @@ PATCHES=(
 
 pkg_setup() {
tc-export CC CXX
+
+   # This should really go in cppflags, but that doesn't work with
+   # gfan's hand-written Makefile.
append-cxxflags -DNOCDDPREFIX
 }
 
+src_prepare() {
+   default
+
+   # This test hangs on x86, bug 717112.
+   rm -r testsuite/0602ResultantFanProjection || \
+   die "unable to disable test 0602ResultantFanProjection"
+}
+
 src_configure() {
# The upstream Makefile says that GCC produces bad code with -O3.
replace-flags "-O3" "-O2"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/files/, sci-mathematics/gfan/

2020-04-13 Thread Michael Orlitzky 
commit: 9731921b0333b19ae47d7b35fe95f453a164e9e0
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr 13 17:54:22 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr 13 17:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9731921b

sci-mathematics/gfan: remove old "unused" version and patches.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/Manifest  |  1 -
 .../gfan/files/gfan-0.5-double-declare-fix.patch   | 12 
 .../gfan/files/gfan-0.5-fix-build-system.patch | 55 -
 sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch | 68 -
 .../gfan/files/gfan-0.5-gcc6.1-compat.patch| 70 --
 sci-mathematics/gfan/gfan-0.5-r1.ebuild| 37 
 6 files changed, 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..000
--- 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.0 -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..000
--- 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..000
--- 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 , const 
PolyhedralFan , int cutOffDimension=-1, bool

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2020-04-13 Thread Agostino Sarubbo 
commit: c85d8e6935e40e6a332289eb0dd6b5e9afb5c759
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 10:20:15 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 10:20:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85d8e69

sci-mathematics/gfan: x86 stable wrt bug #716362

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2.ebuild
index a75c9f76f0f..eac7123f262 100644
--- a/sci-mathematics/gfan/gfan-0.6.2.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2020-04-07 Thread Agostino Sarubbo 
commit: 4f3190c04f1858baab309e67ba76bf0ea00beedf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Apr  7 10:32:06 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Apr  7 10:32:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3190c0

sci-mathematics/gfan: amd64 stable wrt bug #716362

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/gfan/gfan-0.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.6.2.ebuild 
b/sci-mathematics/gfan/gfan-0.6.2.ebuild
index 07d32ab4907..a75c9f76f0f 100644
--- a/sci-mathematics/gfan/gfan-0.6.2.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2020-03-06 Thread Michael Orlitzky 
commit: f2f461b73ee564076c4c71d16754364677de0e55
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Mar  6 16:56:00 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Mar  6 16:56:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f461b7

sci-mathematics/gfan: improve the long description in metadata.xml.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/metadata.xml | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/metadata.xml 
b/sci-mathematics/gfan/metadata.xml
index abc08ece608..c9e1ddd54b3 100644
--- a/sci-mathematics/gfan/metadata.xml
+++ b/sci-mathematics/gfan/metadata.xml
@@ -6,6 +6,21 @@
   Gentoo Mathematics Project
  
 
-  gfan is a computer algebra tool to compute Groebner fans and tropical 
varieties.
+  Gfan is a software package for computing Gröbner fans and tropical
+  varieties. These are polyhedral fans associated to polynomial
+  ideals. The maximal cones of a Gröbner fan are in bijection with the
+  marked reduced Gröbner bases of its defining ideal. The software
+  computes all marked reduced Gröbner bases of an ideal. Their union
+  is a universal Gröbner basis. The tropical variety of a polynomial
+  ideal is a certain subcomplex of the Gröbner fan. Gfan contains
+  algorithms for computing this complex for general ideals and
+  specialized algorithms for tropical curves, tropical hypersurfaces
+  and tropical varieties of prime ideals. In addition to the above
+  core functions the package contains many tools which are useful in
+  the study of Gröbner bases, initial ideals and tropical
+  geometry. The full list of commands can be found in Appendix B of
+  the manual. For ordinary Gröbner basis computations Gfan is not
+  competitive in speed compared to programs such as CoCoA, Singular
+  and Macaulay2.

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/, sci-mathematics/gfan/files/

2020-03-06 Thread Michael Orlitzky 
commit: 72f1a1873ac70ee1a9ecd27afa8c3c5fb10b58f7
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Mar  6 16:52:59 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Mar  6 16:53:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f1a187

sci-mathematics/gfan: new version 0.6.2.

Update our version of gfan to the latest upstream v0.6.2, from
September 28th 2017. The new ebuild is based off of the version that
François Bissey maintains in the sage-on-gentoo overlay, with a few
additional changes:

  * Merged the EAPI=7 and slot dependency updates from ::gentoo.

  * Change the LICENSE to "GPL-2+", to match the upstream LICENSE file.

  * Stripped some more CFLAGS mangling out of the upstream Makefile.
Corresponding to this we now replace "-O3" by "-O2" in the ebuild.

  * Added USE="doc", to build and install the LaTeX manual.

Closes: https://bugs.gentoo.org/711492
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/gfan/Manifest  |   1 +
 .../gfan/files/gfan-0.6.2-Makefile.patch   | 155 ++
 .../gfan/files/gfan-0.6.2-testsuite.patch  | 222 +
 .../gfan/files/gfan-0.6.2-xcode9.3_compat.patch|  13 ++
 sci-mathematics/gfan/gfan-0.6.2.ebuild |  56 ++
 5 files changed, 447 insertions(+)

diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 09b70904371..b0e6c30ed01 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -1 +1,2 @@
 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.6.2-Makefile.patch 
b/sci-mathematics/gfan/files/gfan-0.6.2-Makefile.patch
new file mode 100644
index 000..8e8db53bc91
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-Makefile.patch
@@ -0,0 +1,155 @@
+diff --git a/Makefile b/Makefile
+index 2c9f949..a49a590 100644
+--- a/Makefile
 b/Makefile
+@@ -2,8 +2,8 @@ ALL: default
+ 
+ # When -g is used, it seems that stackdump does not work.
+ # GPROFFLAG = -pg
+-GPROFFLAG = -g
+-#GPROFFLAG = 
++#GPROFFLAG = -g
++GPROFFLAG =
+ 
+ PREFIX?=/usr/local
+ 
+@@ -22,20 +22,8 @@ STACTDUMP_OPTIONS = -DSTACKDUMP_ENABLED 
-D__assert_fail=__assert_fail2
+ endif
+ 
+ 
+-ifeq ($(sagepath),)
+-SAGE_LINKOPTIONS = 
+-SAGE_INCLUDEOPTIONS =
+-else
+-SAGE_LINKOPTIONS = -L$(sagepath)/ -lpython2.6 -lcsage -lsingular
+-SAGE_INCLUDEOPTIONS = -I $(sagepath)/
+-SAGE_OBJECTS = sage.o sage_link.so
+-
+-sage_link.so: sage_link.pyx setup.py
+-  python setup.py build_ext --inplace 
--pyrex-include-dirs=$(SAGE_ROOT)/devel/sage/
+-endif
+-
+ ifeq ($(gmppath),)
+-GMP_LINKOPTIONS = -lgmp
++GMP_LINKOPTIONS = -lgmp -lm
+ GMP_INCLUDEOPTIONS =
+ else
+ GMP_LINKOPTIONS = $(gmppath)/lib/libgmp.a
+@@ -49,7 +37,7 @@ CDDDEFINE_PREFIX = -DNOCDDPREFIX
+ endif
+ 
+ ifeq ($(cddpath),)
+-CDD_LINKOPTIONS = -L/usr/local -lcddgmp
++CDD_LINKOPTIONS = -lcddgmp
+ CDD_INCLUDEOPTIONS =
+ else
+ CDD_LINKOPTIONS = $(cddpath)/lib/libcddgmp.a
+@@ -71,37 +59,8 @@ SOPLEX_OBJECTS = lp_soplexcdd.o
+ endif
+ 
+ 
+-# rememember to adjust USEFACTORY in field_rationalfunctions2
+-ifeq ($(singular),)
+-ifeq ($(factory),)
+-SINGULAR_PATH =
+-SINGULAR_LINKOPTIONS =
+-SINGULAR_INCLUDEOPTIONS =
+-SINGULAR_OBJECTS = src/polynomialgcd.o 
+-else
+-SINGULAR_PATH =
+-SINGULAR_LINKOPTIONS = -lcf -lcfmem
+-SINGULAR_INCLUDEOPTIONS = -I /usr/local/include/factory/
+-SINGULAR_OBJECTS = src/polynomialgcd.o src/ftmpl_inst.o
+-endif
+-else
+-#SINGULAR_PATH = $(HOME)/math/software/Singular-3-1-0
+-#SINGULAR_LINKOPTIONS =  -L$(SINGULAR_PATH)/Singular -lsingular -lncurses 
-lreadline
+-#SINGULAR_INCLUDEOPTIONS = -I $(SINGULAR_PATH)/kernel -I 
$(SINGULAR_PATH)/omalloc
+-#SINGULAR_OBJECTS = src/singular.o src/singularconversion.o
+-SINGULAR_PATH = $(HOME)/math/software/Singular-svn/trunk/x86_64-Linux
+-SINGULAR_LINKOPTIONS =  -L$(SINGULAR_PATH)/lib -lsingular -lncurses 
-lreadline  -lcf -lcfmem
+-SINGULAR_INCLUDEOPTIONS = -I $(SINGULAR_PATH)/include -I 
$(SINGULAR_PATH)/include/omalloc
+-SINGULAR_OBJECTS = src/ftmpl_inst.o src/singular.o src/singularconversion.o
+-#Run the following line before running gfan
+-#export 
LD_LIBRARY_PATH="/home/anders/math/software/Singular-svn/trunk/x86_64-Linux/lib/:${LD_LIBRARY_PATH}"
+-endif
+-
+-# To produce factory templates:
+-#g++ -c

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/files/, sci-mathematics/gfan/

2019-06-22 Thread David Seifert 
commit: 6236187e8b9672b0006a0ba02520281821368036
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 22 21:06:54 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 22 21:06:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6236187e

sci-mathematics/gfan: Port to EAPI 7

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert  gentoo.org>

 .../gfan/files/gfan-0.5-fix-build-system.patch | 55 ++
 sci-mathematics/gfan/gfan-0.5-r1.ebuild| 32 ++---
 2 files changed, 70 insertions(+), 17 deletions(-)

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
new file mode 100644
index 000..3bf96ed088c
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch
@@ -0,0 +1,55 @@
+--- 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/gfan-0.5-r1.ebuild 
b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
index ec591ee1957..5d1d84e462a 100644
--- a/sci-mathematics/gfan/gfan-0.5-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="computes Groebner fans and tropical varities"
+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"
-IUSE=""
 
-DEPEND="dev-libs/gmp[cxx]
-   sci-libs/cddlib"
+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"
-   )
-
-src_prepare () {
-   default
-   sed -i -e "s/-O2/${CXXFLAGS}/" \
-   -e "/GPROFFLAG =/d" \
-   -e "s/g++/$(tc-getCXX)/" \
-   -e "s/\$(CCLINKER)/& \$(LDFLAGS)/" Makefile || die
+   "${FILESDIR}"/${P}-double-declare-fix.patch
+   "${FILESDIR}"/${P}-gcc6.1-compat.patch
+   "${FILESDIR}"/${P}-fix-build-system.patch
+)
+
+src_configure() {
+   tc-export CXX
 }
 
 src_install() {
emake PREFIX="${ED}/usr" install
+   einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/files/, sci-mathematics/gfan/

2019-06-22 Thread David Seifert 
commit: 07e2fbfa818eaa409bc74f90e7c09ced0736b5ec
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 22 21:06:57 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 22 21:06:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e2fbfa

sci-mathematics/gfan: Fix building against GCC 9

Closes: https://bugs.gentoo.org/686484
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch | 68 ++
 sci-mathematics/gfan/gfan-0.5-r1.ebuild|  1 +
 2 files changed, 69 insertions(+)

diff --git a/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch 
b/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch
new file mode 100644
index 000..930baf9edcf
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch
@@ -0,0 +1,68 @@
+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 , const 
PolyhedralFan , int cutOffDimension=-1, bool 
allowASingleConeOfCutOffDimension=false);
+  |^~
+
+--- a/gfanlib_polyhedralfan.h
 b/gfanlib_polyhedralfan.h
+@@ -24,6 +24,8 @@
+ typedef std::map IncidenceList;
+ 
+ 
++class PolyhedralFan;
++PolyhedralFan refinement(const PolyhedralFan , const PolyhedralFan , 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 , const PolyhedralFan 
, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++  friend PolyhedralFan refinement(const PolyhedralFan , const PolyhedralFan 
, 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 );
+--- a/halfopencone.h
 b/halfopencone.h
+@@ -6,6 +6,9 @@
+ 
+ #include "polyhedralfan.h"
+ 
++class HalfOpenCone;
++HalfOpenCone intersection(const HalfOpenCone , const HalfOpenCone , bool 
findFacets=false);
++
+ class HalfOpenCone{
+   static void appendList(IntegerVectorList , IntegerVectorList const 
, int appendValue);
+   int liftedDimension;//ambient
+@@ -18,7 +21,7 @@
+   HalfOpenCone(int dimension_, IntegerVectorList const , 
IntegerVectorList const , IntegerVectorList const , bool 
findFacets=false, bool canonicalize=false);
+   HalfOpenCone(int ambientDimension);//full space
+   bool isEmpty();
+-  friend HalfOpenCone intersection(const HalfOpenCone , const HalfOpenCone 
, bool findFacets=false);
++  friend HalfOpenCone intersection(const HalfOpenCone , const HalfOpenCone 
, bool findFacets);
+   friend bool haveEmptyIntersection(const HalfOpenCone , const HalfOpenCone 
);
+   PolyhedralCone closure();
+   void splitIntoRelativelyOpenCones(list );
+--- a/polyhedralfan.h
 b/polyhedralfan.h
+@@ -30,6 +30,8 @@
+   FPF_default=2+4+8
+ };
+ 
++class PolyhedralFan;
++PolyhedralFan refinement(const PolyhedralFan , const PolyhedralFan , 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 , const PolyhedralFan 
, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++  friend PolyhedralFan refinement(const PolyhedralFan , const PolyhedralFan 
, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
+   friend PolyhedralFan product(const PolyhedralFan , const PolyhedralFan 
);
+   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/gfan-0.5-r1.ebuild 
b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
index 5d1d84e462a..1cd8c95fbec 100644
--- a/sci-mathematics/gfan/gfan-0.5-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
"${FILESDIR}"/${P}-double-declare-fix.patch
"${FILESDIR}"/${P}-gcc6.1-compat.patch
"${FILESDIR}"/${P}-fix-build-system.patch
+

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2017-02-19 Thread David Seifert 
commit: 1ca8e75dcebdd834afafeed056becd09a49b4ef2
Author: Gerhard Bräunlich  gmx  net>
AuthorDate: Sun Feb 19 10:55:31 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Feb 19 18:35:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca8e75d

sci-mathematics/gfan: Remove EAPI 3 ebuild

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/4031

 sci-mathematics/gfan/gfan-0.5.ebuild | 34 --
 1 file changed, 34 deletions(-)

diff --git a/sci-mathematics/gfan/gfan-0.5.ebuild 
b/sci-mathematics/gfan/gfan-0.5.ebuild
deleted file mode 100644
index 09a3bb6898..00
--- a/sci-mathematics/gfan/gfan-0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="computes 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"
-IUSE=""
-
-DEPEND="dev-libs/gmp[cxx]
-   sci-libs/cddlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}/"
-
-src_prepare () {
-   epatch "${FILESDIR}/${P}-double-declare-fix.patch"
-   sed -i -e "s/-O2/${CXXFLAGS}/" \
-   -e "/GPROFFLAG =/d" \
-   -e "s/g++/$(tc-getCXX)/" \
-   -e "s/\$(CCLINKER)/& \$(LDFLAGS)/" Makefile || die
-}
-
-src_install() {
-   emake PREFIX="${ED}/usr" install || die "emake install failed"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/, sci-mathematics/gfan/files/

2016-06-09 Thread Thomas Kahle 
commit: 68b401536df91ee42b4e58cd38b74f96ca0a0560
Author: Thomas Kahle  gentoo  org>
AuthorDate: Thu Jun  9 20:16:05 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Thu Jun  9 20:16:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b40153

sci-mathematics/gfan: gcc-6.1 compat and EAPI=6

Package-Manager: portage-2.3.0_rc1

 .../gfan/files/gfan-0.5-gcc6.1-compat.patch| 70 ++
 sci-mathematics/gfan/gfan-0.5-r1.ebuild| 39 
 2 files changed, 109 insertions(+)

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
new file mode 100644
index 000..8479557
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch
@@ -0,0 +1,70 @@
+--- 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<

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gfan/

2016-03-02 Thread Markus Meier 
commit: 3d3f00e1e7338bfc45474e1bb7465855be966453
Author: Markus Meier  gentoo  org>
AuthorDate: Wed Mar  2 19:31:19 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed Mar  2 19:31:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3f00e1

sci-mathematics/gfan: add ~arm, bug #573324

Package-Manager: portage-2.2.27
RepoMan-Options: --include-arches="arm"

 sci-mathematics/gfan/gfan-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/gfan/gfan-0.5.ebuild 
b/sci-mathematics/gfan/gfan-0.5.ebuild
index e08db31..09a3bb6 100644
--- a/sci-mathematics/gfan/gfan-0.5.ebuild
+++ b/sci-mathematics/gfan/gfan-0.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="http://www.math.tu-berlin.de/~jensen/software/gfan/${PN}${PV}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-libs/gmp[cxx]