* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/
@ 2016-09-25 18:27 Thomas Kahle
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Kahle @ 2016-09-25 18:27 UTC (permalink / raw
To: gentoo-commits
commit: cb201c1311c8d9135d0ba09b3b32600df448878c
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 18:27:14 2016 +0000
Commit: Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 18:27:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb201c13
sci-mathematics/topcom: bump to 0.17.7.
Also fixes bug 594818
Package-Manager: portage-2.3.0
sci-mathematics/topcom/Manifest | 1 +
.../topcom/files/topcom-0.17.7-buildsystem.patch | 327 +++++++++++++++++++++
sci-mathematics/topcom/topcom-0.17.7.ebuild | 54 ++++
3 files changed, 382 insertions(+)
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index 5c9320b..426626e 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,2 +1,3 @@
DIST TOPCOM-0.17.4.tar.gz 8666508 SHA256 42f3ff4e04613009966a3e3cd942f1fb6aa7bc7439f54f20a0b81d1989f9fef1 SHA512 29cee145ee8ec1a63c0b1ec5d9e5f34a11084767405435eed515f864ba1094ca4566c92bbf7cf56914e3e455dd8bdf9746c0f7192a9455fe7852a65704a6009c WHIRLPOOL 4b5f18b8eee251470281a352a354a683b7f42c852cb47552e4227699d9570aee09cda9f9e84f9e7abc5b9e1997818437618776ed90a8667cb186143da6deab4b
+DIST TOPCOM-0.17.7.tar.gz 8661519 SHA256 a22be891225589790fb42d618c1c9657d221914612d4567eaeaaf5d6145667c4 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1 WHIRLPOOL 1857c43d534aa04c15b02a4d5b378402a7e6c0a456f7be1a3c27f37dbd3938e1ca7aa3b645e56b1b57da8bedc58067a13127b5782e1025bb502be1b864b9295c
DIST TOPCOM-manual.html 19251 SHA256 b1c3b326044fdb512264fa2bde6fa10962fd276d43fcab71cb0dc8778378608e SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67 WHIRLPOOL cf8da6b8fb7834730d755ba626903547e02864ea7da98be2e08fb9dafb10ef4503340eac3999915d562768ce2aaa07d38088b8b14c6be810681f6ed229f9d7c3
diff --git a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch
new file mode 100644
index 00000000..154ccd0
--- /dev/null
+++ b/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch
@@ -0,0 +1,327 @@
+diff -U 3 -dHrN topcom-0.17.7.orig/src/Makefile.in topcom-0.17.7/src/Makefile.in
+--- topcom-0.17.7.orig/src/Makefile.in 2016-07-08 12:46:13.000000000 +0200
++++ topcom-0.17.7/src/Makefile.in 2016-09-25 20:22:51.729578197 +0200
+@@ -119,249 +119,206 @@
+ am_B_A_OBJECTS = B_A.$(OBJEXT)
+ B_A_OBJECTS = $(am_B_A_OBJECTS)
+ B_A_LDADD = $(LDADD)
+-B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \
+- ../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
++B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a
+ am_B_A_center_OBJECTS = B_A_center.$(OBJEXT)
+ B_A_center_OBJECTS = $(am_B_A_center_OBJECTS)
+ B_A_center_LDADD = $(LDADD)
+ B_A_center_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_B_D_OBJECTS = B_D.$(OBJEXT)
+ B_D_OBJECTS = $(am_B_D_OBJECTS)
+ B_D_LDADD = $(LDADD)
+-B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \
+- ../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
++B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a
+ am_chiro2allfinetriangs_OBJECTS = chiro2allfinetriangs.$(OBJEXT)
+ chiro2allfinetriangs_OBJECTS = $(am_chiro2allfinetriangs_OBJECTS)
+ chiro2allfinetriangs_LDADD = $(LDADD)
+ chiro2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2alltriangs_OBJECTS = chiro2alltriangs.$(OBJEXT)
+ chiro2alltriangs_OBJECTS = $(am_chiro2alltriangs_OBJECTS)
+ chiro2alltriangs_LDADD = $(LDADD)
+ chiro2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2circuits_OBJECTS = chiro2circuits.$(OBJEXT)
+ chiro2circuits_OBJECTS = $(am_chiro2circuits_OBJECTS)
+ chiro2circuits_LDADD = $(LDADD)
+ chiro2circuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2cocircuits_OBJECTS = chiro2cocircuits.$(OBJEXT)
+ chiro2cocircuits_OBJECTS = $(am_chiro2cocircuits_OBJECTS)
+ chiro2cocircuits_LDADD = $(LDADD)
+ chiro2cocircuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2dual_OBJECTS = chiro2dual.$(OBJEXT)
+ chiro2dual_OBJECTS = $(am_chiro2dual_OBJECTS)
+ chiro2dual_LDADD = $(LDADD)
+ chiro2dual_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2finetriang_OBJECTS = chiro2finetriang.$(OBJEXT)
+ chiro2finetriang_OBJECTS = $(am_chiro2finetriang_OBJECTS)
+ chiro2finetriang_LDADD = $(LDADD)
+ chiro2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2finetriangs_OBJECTS = chiro2finetriangs.$(OBJEXT)
+ chiro2finetriangs_OBJECTS = $(am_chiro2finetriangs_OBJECTS)
+ chiro2finetriangs_LDADD = $(LDADD)
+ chiro2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2mintriang_OBJECTS = chiro2mintriang.$(OBJEXT)
+ chiro2mintriang_OBJECTS = $(am_chiro2mintriang_OBJECTS)
+ chiro2mintriang_LDADD = $(LDADD)
+ chiro2mintriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2nallfinetriangs_OBJECTS = chiro2nallfinetriangs.$(OBJEXT)
+ chiro2nallfinetriangs_OBJECTS = $(am_chiro2nallfinetriangs_OBJECTS)
+ chiro2nallfinetriangs_LDADD = $(LDADD)
+ chiro2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2nalltriangs_OBJECTS = chiro2nalltriangs.$(OBJEXT)
+ chiro2nalltriangs_OBJECTS = $(am_chiro2nalltriangs_OBJECTS)
+ chiro2nalltriangs_LDADD = $(LDADD)
+ chiro2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2nfinetriangs_OBJECTS = chiro2nfinetriangs.$(OBJEXT)
+ chiro2nfinetriangs_OBJECTS = $(am_chiro2nfinetriangs_OBJECTS)
+ chiro2nfinetriangs_LDADD = $(LDADD)
+ chiro2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2ntriangs_OBJECTS = chiro2ntriangs.$(OBJEXT)
+ chiro2ntriangs_OBJECTS = $(am_chiro2ntriangs_OBJECTS)
+ chiro2ntriangs_LDADD = $(LDADD)
+ chiro2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2placingtriang_OBJECTS = chiro2placingtriang.$(OBJEXT)
+ chiro2placingtriang_OBJECTS = $(am_chiro2placingtriang_OBJECTS)
+ chiro2placingtriang_LDADD = $(LDADD)
+ chiro2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_chiro2triangs_OBJECTS = chiro2triangs.$(OBJEXT)
+ chiro2triangs_OBJECTS = $(am_chiro2triangs_OBJECTS)
+ chiro2triangs_LDADD = $(LDADD)
+ chiro2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_cocircuits2facets_OBJECTS = cocircuits2facets.$(OBJEXT)
+ cocircuits2facets_OBJECTS = $(am_cocircuits2facets_OBJECTS)
+ cocircuits2facets_LDADD = $(LDADD)
+ cocircuits2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_cross_OBJECTS = cross.$(OBJEXT)
+ cross_OBJECTS = $(am_cross_OBJECTS)
+ cross_LDADD = $(LDADD)
+ cross_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_cube_OBJECTS = cube.$(OBJEXT)
+ cube_OBJECTS = $(am_cube_OBJECTS)
+ cube_LDADD = $(LDADD)
+ cube_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_cyclic_OBJECTS = cyclic.$(OBJEXT)
+ cyclic_OBJECTS = $(am_cyclic_OBJECTS)
+ cyclic_LDADD = $(LDADD)
+ cyclic_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_hypersimplex_OBJECTS = hypersimplex.$(OBJEXT)
+ hypersimplex_OBJECTS = $(am_hypersimplex_OBJECTS)
+ hypersimplex_LDADD = $(LDADD)
+ hypersimplex_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_lattice_OBJECTS = lattice.$(OBJEXT)
+ lattice_OBJECTS = $(am_lattice_OBJECTS)
+ lattice_LDADD = $(LDADD)
+ lattice_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2allfinetriangs_OBJECTS = points2allfinetriangs.$(OBJEXT)
+ points2allfinetriangs_OBJECTS = $(am_points2allfinetriangs_OBJECTS)
+ points2allfinetriangs_LDADD = $(LDADD)
+ points2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2alltriangs_OBJECTS = points2alltriangs.$(OBJEXT)
+ points2alltriangs_OBJECTS = $(am_points2alltriangs_OBJECTS)
+ points2alltriangs_LDADD = $(LDADD)
+ points2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2chiro_OBJECTS = points2chiro.$(OBJEXT)
+ points2chiro_OBJECTS = $(am_points2chiro_OBJECTS)
+ points2chiro_LDADD = $(LDADD)
+ points2chiro_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2facets_OBJECTS = points2facets.$(OBJEXT)
+ points2facets_OBJECTS = $(am_points2facets_OBJECTS)
+ points2facets_LDADD = $(LDADD)
+ points2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2finetriang_OBJECTS = points2finetriang.$(OBJEXT)
+ points2finetriang_OBJECTS = $(am_points2finetriang_OBJECTS)
+ points2finetriang_LDADD = $(LDADD)
+ points2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2finetriangs_OBJECTS = points2finetriangs.$(OBJEXT)
+ points2finetriangs_OBJECTS = $(am_points2finetriangs_OBJECTS)
+ points2finetriangs_LDADD = $(LDADD)
+ points2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2flips_OBJECTS = points2flips.$(OBJEXT)
+ points2flips_OBJECTS = $(am_points2flips_OBJECTS)
+ points2flips_LDADD = $(LDADD)
+ points2flips_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2nallfinetriangs_OBJECTS = points2nallfinetriangs.$(OBJEXT)
+ points2nallfinetriangs_OBJECTS = $(am_points2nallfinetriangs_OBJECTS)
+ points2nallfinetriangs_LDADD = $(LDADD)
+ points2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2nalltriangs_OBJECTS = points2nalltriangs.$(OBJEXT)
+ points2nalltriangs_OBJECTS = $(am_points2nalltriangs_OBJECTS)
+ points2nalltriangs_LDADD = $(LDADD)
+ points2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2nfinetriangs_OBJECTS = points2nfinetriangs.$(OBJEXT)
+ points2nfinetriangs_OBJECTS = $(am_points2nfinetriangs_OBJECTS)
+ points2nfinetriangs_LDADD = $(LDADD)
+ points2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2nflips_OBJECTS = points2nflips.$(OBJEXT)
+ points2nflips_OBJECTS = $(am_points2nflips_OBJECTS)
+ points2nflips_LDADD = $(LDADD)
+ points2nflips_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2ntriangs_OBJECTS = points2ntriangs.$(OBJEXT)
+ points2ntriangs_OBJECTS = $(am_points2ntriangs_OBJECTS)
+ points2ntriangs_LDADD = $(LDADD)
+ points2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2placingtriang_OBJECTS = points2placingtriang.$(OBJEXT)
+ points2placingtriang_OBJECTS = $(am_points2placingtriang_OBJECTS)
+ points2placingtriang_LDADD = $(LDADD)
+ points2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2triangs_OBJECTS = points2triangs.$(OBJEXT)
+ points2triangs_OBJECTS = $(am_points2triangs_OBJECTS)
+ points2triangs_LDADD = $(LDADD)
+ points2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_points2volume_OBJECTS = points2volume.$(OBJEXT)
+ points2volume_OBJECTS = $(am_points2volume_OBJECTS)
+ points2volume_LDADD = $(LDADD)
+ points2volume_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_santos_22_triang_OBJECTS = santos_22_triang.$(OBJEXT)
+ santos_22_triang_OBJECTS = $(am_santos_22_triang_OBJECTS)
+ santos_22_triang_LDADD = $(LDADD)
+ santos_22_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_santos_dim4_triang_OBJECTS = santos_dim4_triang.$(OBJEXT)
+ santos_dim4_triang_OBJECTS = $(am_santos_dim4_triang_OBJECTS)
+ santos_dim4_triang_LDADD = $(LDADD)
+ santos_dim4_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ am_santos_triang_OBJECTS = santos_triang.$(OBJEXT)
+ santos_triang_OBJECTS = $(am_santos_triang_OBJECTS)
+ santos_triang_LDADD = $(LDADD)
+ santos_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src-reg/libCHECKREG.a
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -591,9 +548,6 @@
+ santos_22_triang_SOURCES = santos_22_triang.cc
+ LDADD = ../lib-src/libTOPCOM.a \
+ ../lib-src-reg/libCHECKREG.a \
+- ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
+
+ AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \
+ -I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \
+diff -U 3 -dHrN topcom-0.17.7.orig/src-reg/Makefile.in topcom-0.17.7/src-reg/Makefile.in
+--- topcom-0.17.7.orig/src-reg/Makefile.in 2016-07-08 12:46:13.000000000 +0200
++++ topcom-0.17.7/src-reg/Makefile.in 2016-09-25 20:19:04.062645737 +0200
+@@ -102,8 +102,7 @@
+ checkregularity_OBJECTS = $(am_checkregularity_OBJECTS)
+ checkregularity_LDADD = $(LDADD)
+ checkregularity_DEPENDENCIES = ../lib-src-reg/libCHECKREG.a \
+- ../lib-src/libTOPCOM.a ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
++ ../lib-src/libTOPCOM.a
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -257,9 +256,6 @@
+ checkregularity_SOURCES = checkregularity.cc
+ LDADD = ../lib-src-reg/libCHECKREG.a \
+ ../lib-src/libTOPCOM.a \
+- ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
+
+ AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \
+ -I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \
diff --git a/sci-mathematics/topcom/topcom-0.17.7.ebuild b/sci-mathematics/topcom/topcom-0.17.7.ebuild
new file mode 100644
index 00000000..7e89b67
--- /dev/null
+++ b/sci-mathematics/topcom/topcom-0.17.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
+HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
+SRC_URI="
+ http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
+ doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="doc examples static-libs"
+
+DEPEND="
+ dev-libs/gmp:0
+ >=sci-libs/cddlib-094f"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-buildsystem.patch
+)
+
+src_prepare () {
+ # ... and link in tree versions:
+ append-libs -lgmp -lgmpxx -lcddgmp
+
+ find external -delete || die
+
+ default
+}
+
+src_install () {
+ default
+
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
+
+ use examples && dodoc -r "${S}"/examples
+
+ docinto /usr/share/doc/${PF}/html
+ use doc && dodoc "${DISTDIR}"/TOPCOM-manual.html
+
+ mv "${ED}"/usr/bin/cube "${ED}"/usr/bin/topcom_cube || die
+}
+
+pkg_postinst() {
+ elog "Due to a file collision with media-libs/lib3ds the helper"
+ elog "'cube' has been installed as topcom_cube (see bug #547030)."
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/
@ 2016-09-25 18:36 Thomas Kahle
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Kahle @ 2016-09-25 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 8ff5095a9c6644e43fab5f7e9f40d6fc38007b0a
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 18:35:59 2016 +0000
Commit: Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 18:36:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff5095a
sci-mathematics/topcom: remove old
Package-Manager: portage-2.3.0
sci-mathematics/topcom/Manifest | 1 -
.../topcom/files/topcom-0.17.4-buildsystem.patch | 105 ---------------------
.../files/topcom-0.17.4-no-internal-libs.patch | 77 ---------------
sci-mathematics/topcom/topcom-0.17.4-r1.ebuild | 60 ------------
4 files changed, 243 deletions(-)
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index 426626e..30d3ca9 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,3 +1,2 @@
-DIST TOPCOM-0.17.4.tar.gz 8666508 SHA256 42f3ff4e04613009966a3e3cd942f1fb6aa7bc7439f54f20a0b81d1989f9fef1 SHA512 29cee145ee8ec1a63c0b1ec5d9e5f34a11084767405435eed515f864ba1094ca4566c92bbf7cf56914e3e455dd8bdf9746c0f7192a9455fe7852a65704a6009c WHIRLPOOL 4b5f18b8eee251470281a352a354a683b7f42c852cb47552e4227699d9570aee09cda9f9e84f9e7abc5b9e1997818437618776ed90a8667cb186143da6deab4b
DIST TOPCOM-0.17.7.tar.gz 8661519 SHA256 a22be891225589790fb42d618c1c9657d221914612d4567eaeaaf5d6145667c4 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1 WHIRLPOOL 1857c43d534aa04c15b02a4d5b378402a7e6c0a456f7be1a3c27f37dbd3938e1ca7aa3b645e56b1b57da8bedc58067a13127b5782e1025bb502be1b864b9295c
DIST TOPCOM-manual.html 19251 SHA256 b1c3b326044fdb512264fa2bde6fa10962fd276d43fcab71cb0dc8778378608e SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67 WHIRLPOOL cf8da6b8fb7834730d755ba626903547e02864ea7da98be2e08fb9dafb10ef4503340eac3999915d562768ce2aaa07d38088b8b14c6be810681f6ed229f9d7c3
diff --git a/sci-mathematics/topcom/files/topcom-0.17.4-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.4-buildsystem.patch
deleted file mode 100644
index e8546aa..00000000
--- a/sci-mathematics/topcom/files/topcom-0.17.4-buildsystem.patch
+++ /dev/null
@@ -1,105 +0,0 @@
- lib-src-reg/Makefile.am | 8 +++-----
- lib-src/Makefile.am | 8 +++-----
- src-reg/Makefile.am | 12 +++++-------
- src/Makefile.am | 12 +++++-------
- wrap-gmp-gmpxx/Makefile.am | 2 +-
- 5 files changed, 17 insertions(+), 25 deletions(-)
-
-diff --git a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
-index 67c1dc9..202d6fa 100644
---- a/lib-src-reg/Makefile.am
-+++ b/lib-src-reg/Makefile.am
-@@ -10,11 +10,9 @@ SPXinterface.hh \
- RegularityCheck.hh \
- LPinterface.hh
-
--INCLUDES = -I../lib-src
--INCLUDES += -I../wrap-gmp-gmpxx
--INCLUDES += -I../external/include
-+INCLUDES = -I$(top_srcdir)/lib-src
-+INCLUDES += -I$(top_srcdir)/wrap-gmp-gmpxx
-+INCLUDES += -I$(top_srcdir)/external/include
- INCLUDES += -I$(includedir)
-
- AM_CPPFLAGS = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS = -O2
-diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
-index defed87..c94109c 100644
---- a/lib-src/Makefile.am
-+++ b/lib-src/Makefile.am
-@@ -88,11 +88,9 @@ VertexFacetTable.hh \
- VertexFacetTableArray.hh \
- VirtualChiro.hh
-
--INCLUDES = -I../lib-src-reg
--INCLUDES += -I../wrap-gmp-gmpxx
--INCLUDES += -I../external/include
-+INCLUDES = -I$(top_srcdir)/lib-src-reg
-+INCLUDES += -I$(top_srcdir)/wrap-gmp-gmpxx
-+INCLUDES += -I$(top_srcdir)/external/include
- INCLUDES += -I$(includedir)
-
- AM_CPPFLAGS = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-35
--
--AM_CXXFLAGS = -O2 -g
-diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
-index b0219a5..e9b00bc 100644
---- a/src-reg/Makefile.am
-+++ b/src-reg/Makefile.am
-@@ -2,15 +2,13 @@ bin_PROGRAMS = checkregularity
-
- checkregularity_SOURCES = checkregularity.cc
-
--LDADD = ../lib-src-reg/libCHECKREG.a \
-- ../lib-src/libTOPCOM.a
-+LDADD = $(top_builddir)/lib-src-reg/libCHECKREG.a \
-+ $(top_builddir)/lib-src/libTOPCOM.a
-
--INCLUDES = -I../lib-src
--INCLUDES += -I../lib-src-reg
--INCLUDES += -I../wrap-gmp-gmpxx
-+INCLUDES = -I$(top_srcdir)/lib-src
-+INCLUDES += -I$(top_srcdir)/lib-src-reg
-+INCLUDES += -I$(top_srcdir)/wrap-gmp-gmpxx
- INCLUDES += -I$(includedir)
-
-
- AM_CPPFLAGS = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS = -O2
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5ba9b22..4c59202 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,14 +85,12 @@ santos_triang_SOURCES = santos_triang.cc
- santos_dim4_triang_SOURCES = santos_dim4_triang.cc
- santos_22_triang_SOURCES = santos_22_triang.cc
-
--LDADD = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a
-+LDADD = $(top_builddir)/lib-src/libTOPCOM.a \
-+ $(top_builddir)/lib-src-reg/libCHECKREG.a
-
--INCLUDES = -I../lib-src
--INCLUDES += -I../lib-src-reg
--INCLUDES += -I../wrap-gmp-gmpxx
-+INCLUDES = -I$(top_srcdir)/lib-src
-+INCLUDES += -I$(top_srcdir)/lib-src-reg
-+INCLUDES += -I$(top_srcdir)/wrap-gmp-gmpxx
- INCLUDES += -I$(includedir)
-
- AM_CPPFLAGS = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS = -O2
-diff --git a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
-index 383e003..d93a637 100644
---- a/wrap-gmp-gmpxx/Makefile.am
-+++ b/wrap-gmp-gmpxx/Makefile.am
-@@ -2,5 +2,5 @@ include_HEADERS = \
- Integer.h \
- Rational.h
-
--INCLUDES = -I../external/include
-+INCLUDES = -I$(top_srcdir)/external/include
- INCLUDES += -I$(includedir)
diff --git a/sci-mathematics/topcom/files/topcom-0.17.4-no-internal-libs.patch b/sci-mathematics/topcom/files/topcom-0.17.4-no-internal-libs.patch
deleted file mode 100644
index e9cffee..00000000
--- a/sci-mathematics/topcom/files/topcom-0.17.4-no-internal-libs.patch
+++ /dev/null
@@ -1,77 +0,0 @@
- Makefile.am | 4 ----
- configure.ac | 6 +-----
- src-reg/Makefile.am | 6 +-----
- src/Makefile.am | 6 +-----
- 4 files changed, 3 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 640652f..00ba26a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,2 @@
- SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
- EXTRA_DIST = external/Makefile
--EXTRA_DIST += external/gmp-5.0.5.tar.bz2
--EXTRA_DIST += external/cddlib-0.94f-TOPCOM.tar.gz
--EXTRA_DIST += external/gmpxx-patch
--
-diff --git a/configure.ac b/configure.ac
-index b737f27..ecd38ce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,12 +17,8 @@ dnl Replace `main' with a function in -lstdc:
- dnl AC_CHECK_LIB(stdc, main)
- dnl Replace `main' with a function in -lstdc++:
- dnl AC_CHECK_LIB(stdc++, main)
--dnl Make libgmp:
--make -C external gmp
--dnl Make libcddgmp:
--make -C external cdd
- dnl Check for soplex:
--AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
-+AC_CHECK_LIB(soplex, main, , sh -c 'echo soplex not found: --soplex will not work.')
-
- dnl Checks for header files.
- AC_HEADER_STDC
-diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
-index c976e34..b0219a5 100644
---- a/src-reg/Makefile.am
-+++ b/src-reg/Makefile.am
-@@ -3,15 +3,11 @@ bin_PROGRAMS = checkregularity
- checkregularity_SOURCES = checkregularity.cc
-
- LDADD = ../lib-src-reg/libCHECKREG.a \
-- ../lib-src/libTOPCOM.a \
-- ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a \
-- ../external/lib/libgmp.a
-+ ../lib-src/libTOPCOM.a
-
- INCLUDES = -I../lib-src
- INCLUDES += -I../lib-src-reg
- INCLUDES += -I../wrap-gmp-gmpxx
--INCLUDES += -I../external/include
- INCLUDES += -I$(includedir)
-
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 4c35135..5ba9b22 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,15 +86,11 @@ santos_dim4_triang_SOURCES = santos_dim4_triang.cc
- santos_22_triang_SOURCES = santos_22_triang.cc
-
- LDADD = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a \
-- ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a \
-- ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
-
- INCLUDES = -I../lib-src
- INCLUDES += -I../lib-src-reg
- INCLUDES += -I../wrap-gmp-gmpxx
--INCLUDES += -I../external/include
- INCLUDES += -I$(includedir)
-
- AM_CPPFLAGS = -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
diff --git a/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild
deleted file mode 100644
index 3745a13..00000000
--- a/sci-mathematics/topcom/topcom-0.17.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
-HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
-SRC_URI="
- http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/Software/TOPCOM-${PV}.tar.gz
- doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc examples static-libs"
-
-DEPEND="
- >=dev-libs/gmp-5.0.5
- >=sci-libs/cddlib-094f"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/TOPCOM-${PV}
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-internal-libs.patch
- "${FILESDIR}"/${P}-buildsystem.patch
- )
-
-src_prepare () {
- # ... and link in tree versions:
- append-libs -lgmp -lgmpxx -lcddgmp
-
- find external -delete || die
-
- mv configure.{in,ac} || die
-
- autotools-utils_src_prepare
-}
-
-src_install () {
- autotools-utils_src_install
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
-
- use doc && dohtml "${DISTDIR}"/TOPCOM-manual.html
-
- use examples && dodoc -r "${S}"/examples
-
- mv "${ED}"/usr/bin/cube "${ED}"/usr/bin/topcom_cube || die
-}
-
-pkg_postinst() {
- elog "Due to a file collision with media-libs/lib3ds the helper"
- elog "'cube' has been installed as topcom_cube (see bug #547030)."
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/
@ 2021-03-07 22:18 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2021-03-07 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 61a5d7a6945dd82e7be4846f8735160273eafcf6
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Feb 15 13:42:23 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 22:17:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a5d7a6
sci-mathematics/topcom: new version
* EAPI 7
* build dynamic libraries instead of static
* fix cddlib include dir
Closes: https://bugs.gentoo.org/761085
Closes: https://github.com/gentoo/gentoo/pull/14668
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/topcom/Manifest | 1 +
.../topcom/files/topcom-0.17.8-buildsystem.patch | 151 +++++++++++++++++++++
sci-mathematics/topcom/topcom-0.17.8.ebuild | 59 ++++++++
3 files changed, 211 insertions(+)
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index 9bd72bc87f4..be0aad7f999 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,2 +1,3 @@
DIST TOPCOM-0.17.7.tar.gz 8661519 BLAKE2B f42d273b39b15ccaf0d24ad360dc91cecd2ab83c97eb5a2fffe95575d7c8063d9afa842d7bfae03faee32ced1f98ccc55a750a59c1f544acded462a478aac636 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1
+DIST TOPCOM-0.17.8.tar.gz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
diff --git a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
new file mode 100644
index 00000000000..deb1ad3ebba
--- /dev/null
+++ b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
@@ -0,0 +1,151 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2020-02-15 12:44:55.065569980 +0100
++++ b/configure.ac 2020-02-15 14:08:21.905767776 +0100
+@@ -9,7 +9,9 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_CXX
+-AC_PROG_RANLIB
++LT_INIT
++AC_ENABLE_SHARED
++AC_DISABLE_STATIC
+
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lg:
+@@ -18,10 +20,6 @@
+ dnl AC_CHECK_LIB(stdc, main)
+ dnl Replace `main' with a function in -lstdc++:
+ dnl AC_CHECK_LIB(stdc++, main)
+-dnl Make libgmp:
+-make -C external gmp
+-dnl Make libcddgmp:
+-make -C external cdd
+ dnl Check for soplex:
+ AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
+
+diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
+--- a/lib-src/Makefile.am 2020-02-15 12:44:55.145570436 +0100
++++ b/lib-src/Makefile.am 2020-02-15 14:08:44.741903592 +0100
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libTOPCOM.a
++lib_LTLIBRARIES = libTOPCOM.la
+
+-libTOPCOM_a_SOURCES = \
++libTOPCOM_la_SOURCES = \
+ Admissibles.cc \
+ CheckTriang.cc \
+ Circuits.cc \
+@@ -90,9 +90,9 @@
+
+ AM_CPPFLAGS = -I../lib-src-reg
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
++AM_CPPFLAGS += $(CPPFLAGS)
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-35
+
+-AM_CXXFLAGS = -O2 -g
++AM_CXXFLAGS = $(CXXFLAGS)
+diff -ur a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
+--- a/lib-src-reg/Makefile.am 2020-02-15 12:44:55.165570550 +0100
++++ b/lib-src-reg/Makefile.am 2020-02-15 14:08:22.921773817 +0100
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libCHECKREG.a
++lib_LTLIBRARIES = libCHECKREG.la
+
+-libCHECKREG_a_SOURCES = \
++libCHECKREG_la_SOURCES = \
+ SPXinterface.cc \
+ LPinterface.cc \
+ RegularityCheck.cc
+@@ -12,9 +12,9 @@
+
+ AM_CPPFLAGS = -I../lib-src
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
++AM_CPPFLAGS += $(CPPFLAGS)
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+
+-AM_CXXFLAGS = -O2
++AM_CXXFLAGS = $(CXXFLAGS)
+diff -ur a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2020-02-15 12:44:55.065569980 +0100
++++ b/Makefile.am 2020-02-15 14:08:22.929773865 +0100
+@@ -1,6 +1 @@
+ SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
+-EXTRA_DIST = external/Makefile
+-EXTRA_DIST += external/gmp-6.1.1.tar.bz2
+-EXTRA_DIST += external/cddlib-0.94f-TOPCOM.tar.gz
+-EXTRA_DIST += external/gmpxx-patch
+-
+diff -ur a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am 2020-02-15 12:44:55.165570550 +0100
++++ b/src/Makefile.am 2020-02-15 14:08:22.933773888 +0100
+@@ -83,18 +83,14 @@
+ santos_dim4_triang_SOURCES = santos_dim4_triang.cc
+ santos_22_triang_SOURCES = santos_22_triang.cc
+
+-LDADD = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a \
+- ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
+-
+ AM_CPPFLAGS = -I../lib-src
+ AM_CPPFLAGS += -I../lib-src-reg
++AM_CPPFLAGS += -L../lib-src-reg
++AM_CPPFLAGS += -L../lib-src
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
++AM_CPPFLAGS += $(CPPFLAGS)
+ AM_CPPFLAGS += -I$(includedir)
+
+-AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
++AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
+
+-AM_CXXFLAGS = -O2
++AM_CXXFLAGS = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
+diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am
+--- a/src-reg/Makefile.am 2020-02-15 12:44:55.165570550 +0100
++++ b/src-reg/Makefile.am 2020-02-15 14:08:22.933773888 +0100
+@@ -2,20 +2,15 @@
+
+ checkregularity_SOURCES = checkregularity.cc
+
+-LDADD = ../lib-src-reg/libCHECKREG.a \
+- ../lib-src/libTOPCOM.a \
+- ../external/lib/libcddgmp.a \
+- ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
+-
+ AM_CPPFLAGS = -I../lib-src
+ AM_CPPFLAGS += -I../lib-src-reg
++AM_CPPFLAGS += -L../lib-src-reg
++AM_CPPFLAGS += -L../lib-src
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
++AM_CPPFLAGS += $(CPPFLAGS)
+ AM_CPPFLAGS += -I$(includedir)
+
+
+-AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+-
+-AM_CXXFLAGS = -O2
++AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
+
++AM_CXXFLAGS = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
+diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
+--- a/wrap-gmp-gmpxx/Makefile.am 2020-02-15 12:44:55.165570550 +0100
++++ b/wrap-gmp-gmpxx/Makefile.am 2020-02-15 14:08:23.105774912 +0100
+@@ -3,6 +3,6 @@
+ Rational.h
+
+ AM_CPPFLAGS = -I../external/include
+-AM_CPPFLAGS += -I$(includedir)
++AM_CPPFLAGS += -I$(includedir) $(CPPFLAGS)
+
+-AM_CXXFLAGS = -O2
++AM_CXXFLAGS = $(CXXFLAGS)
diff --git a/sci-mathematics/topcom/topcom-0.17.8.ebuild b/sci-mathematics/topcom/topcom-0.17.8.ebuild
new file mode 100644
index 00000000000..e6627c5cd43
--- /dev/null
+++ b/sci-mathematics/topcom/topcom-0.17.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
+HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
+SRC_URI="
+ http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
+ doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="doc examples"
+
+DEPEND="
+ dev-libs/gmp:0
+ >=sci-libs/cddlib-094f
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-shells/tcsh"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+HTML_DOCS=( "${DISTDIR}/TOPCOM-manual.html" )
+
+src_prepare () {
+ default
+
+ # ... and link in tree versions:
+ append-libs -lgmp -lgmpxx -lcddgmp
+ append-cxxflags -I/usr/include/cddlib
+
+ eautoreconf
+
+ find external -delete || die
+}
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install () {
+ default
+
+ use examples && docompress -x "/usr/share/doc/${PF}/examples"
+ use doc && einstalldocs
+
+ mv "${ED}/usr/bin/cube" "${ED}/usr/bin/topcom_cube" || die
+
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ elog "Due to a file collision with media-libs/lib3ds the helper"
+ elog "'cube' has been installed as topcom_cube (see bug #547030)."
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/
@ 2022-05-07 22:31 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2022-05-07 22:31 UTC (permalink / raw
To: gentoo-commits
commit: ab830994be4a1eaa1fc2b8bbda90a3d9b8e39f83
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 20:44:50 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat May 7 22:29:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab830994
sci-mathematics/topcom: new revision with miscellaneous fixes.
* Update to EAPI=8.
* Update the buildsystem patch to eliminate a call to "csh",
fixing bug 732022 without requiring csh at build-time.
* Drop tcsh from BDEPEND.
* HOMEPAGE and SRC_URI needed updates.
Closes: https://bugs.gentoo.org/732022
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/topcom/Manifest | 2 +-
.../topcom/files/topcom-0.17.8-buildsystem.patch | 238 +++++++++++++++------
...om-0.17.8-r1.ebuild => topcom-0.17.8-r2.ebuild} | 14 +-
3 files changed, 181 insertions(+), 73 deletions(-)
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index be0aad7f9994..b791cf49116e 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,3 +1,3 @@
DIST TOPCOM-0.17.7.tar.gz 8661519 BLAKE2B f42d273b39b15ccaf0d24ad360dc91cecd2ab83c97eb5a2fffe95575d7c8063d9afa842d7bfae03faee32ced1f98ccc55a750a59c1f544acded462a478aac636 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1
-DIST TOPCOM-0.17.8.tar.gz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
+DIST TOPCOM-0_17_8.tgz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
diff --git a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
index deb1ad3ebbad..2b517b441ed3 100644
--- a/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
+++ b/sci-mathematics/topcom/files/topcom-0.17.8-buildsystem.patch
@@ -1,7 +1,34 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2020-02-15 12:44:55.065569980 +0100
-+++ b/configure.ac 2020-02-15 14:08:21.905767776 +0100
-@@ -9,7 +9,9 @@
+From 27284e6a9cb95dcd274abbe184b21eed8a899904 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 May 2022 16:00:45 -0400
+Subject: [PATCH 1/3] Gentoo's existing build system patch
+
+---
+ Makefile.am | 5 -----
+ configure.ac | 8 +++-----
+ lib-src-reg/Makefile.am | 8 ++++----
+ lib-src/Makefile.am | 8 ++++----
+ src-reg/Makefile.am | 15 +++++----------
+ src/Makefile.am | 14 +++++---------
+ wrap-gmp-gmpxx/Makefile.am | 4 ++--
+ 7 files changed, 23 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5dd0de0..4586f79 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1 @@
+ SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
+-EXTRA_DIST = external/Makefile
+-EXTRA_DIST += external/gmp-6.1.1.tar.bz2
+-EXTRA_DIST += external/cddlib-0.94f-TOPCOM.tar.gz
+-EXTRA_DIST += external/gmpxx-patch
+-
+diff --git a/configure.ac b/configure.ac
+index 6635345..a10fb97 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,9 @@ dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_CXX
@@ -12,7 +39,7 @@ diff -ur a/configure.ac b/configure.ac
dnl Checks for libraries.
dnl Replace `main' with a function in -lg:
-@@ -18,10 +20,6 @@
+@@ -18,10 +20,6 @@ dnl Replace `main' with a function in -lstdc:
dnl AC_CHECK_LIB(stdc, main)
dnl Replace `main' with a function in -lstdc++:
dnl AC_CHECK_LIB(stdc++, main)
@@ -23,9 +50,35 @@ diff -ur a/configure.ac b/configure.ac
dnl Check for soplex:
AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
-diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
---- a/lib-src/Makefile.am 2020-02-15 12:44:55.145570436 +0100
-+++ b/lib-src/Makefile.am 2020-02-15 14:08:44.741903592 +0100
+diff --git a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
+index fc8b005..d07b8f8 100644
+--- a/lib-src-reg/Makefile.am
++++ b/lib-src-reg/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libCHECKREG.a
++lib_LTLIBRARIES = libCHECKREG.la
+
+-libCHECKREG_a_SOURCES = \
++libCHECKREG_la_SOURCES = \
+ SPXinterface.cc \
+ LPinterface.cc \
+ RegularityCheck.cc
+@@ -12,9 +12,9 @@ LPinterface.hh
+
+ AM_CPPFLAGS = -I../lib-src
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
++AM_CPPFLAGS += $(CPPFLAGS)
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+
+-AM_CXXFLAGS = -O2
++AM_CXXFLAGS = $(CXXFLAGS)
+diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
+index b2358cc..90b735a 100644
+--- a/lib-src/Makefile.am
++++ b/lib-src/Makefile.am
@@ -1,6 +1,6 @@
-lib_LIBRARIES = libTOPCOM.a
+lib_LTLIBRARIES = libTOPCOM.la
@@ -35,7 +88,7 @@ diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
Admissibles.cc \
CheckTriang.cc \
Circuits.cc \
-@@ -90,9 +90,9 @@
+@@ -90,9 +90,9 @@ VirtualChiro.hh
AM_CPPFLAGS = -I../lib-src-reg
AM_CPPFLAGS += -I../wrap-gmp-gmpxx
@@ -47,49 +100,16 @@ diff -ur a/lib-src/Makefile.am b/lib-src/Makefile.am
-AM_CXXFLAGS = -O2 -g
+AM_CXXFLAGS = $(CXXFLAGS)
-diff -ur a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
---- a/lib-src-reg/Makefile.am 2020-02-15 12:44:55.165570550 +0100
-+++ b/lib-src-reg/Makefile.am 2020-02-15 14:08:22.921773817 +0100
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libCHECKREG.a
-+lib_LTLIBRARIES = libCHECKREG.la
+diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
+index a351951..38f8f9f 100644
+--- a/src-reg/Makefile.am
++++ b/src-reg/Makefile.am
+@@ -2,20 +2,15 @@ bin_PROGRAMS = checkregularity
--libCHECKREG_a_SOURCES = \
-+libCHECKREG_la_SOURCES = \
- SPXinterface.cc \
- LPinterface.cc \
- RegularityCheck.cc
-@@ -12,9 +12,9 @@
-
- AM_CPPFLAGS = -I../lib-src
- AM_CPPFLAGS += -I../wrap-gmp-gmpxx
--AM_CPPFLAGS += -I../external/include
-+AM_CPPFLAGS += $(CPPFLAGS)
- AM_CPPFLAGS += -I$(includedir)
-
- AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
-
--AM_CXXFLAGS = -O2
-+AM_CXXFLAGS = $(CXXFLAGS)
-diff -ur a/Makefile.am b/Makefile.am
---- a/Makefile.am 2020-02-15 12:44:55.065569980 +0100
-+++ b/Makefile.am 2020-02-15 14:08:22.929773865 +0100
-@@ -1,6 +1 @@
- SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples
--EXTRA_DIST = external/Makefile
--EXTRA_DIST += external/gmp-6.1.1.tar.bz2
--EXTRA_DIST += external/cddlib-0.94f-TOPCOM.tar.gz
--EXTRA_DIST += external/gmpxx-patch
--
-diff -ur a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am 2020-02-15 12:44:55.165570550 +0100
-+++ b/src/Makefile.am 2020-02-15 14:08:22.933773888 +0100
-@@ -83,18 +83,14 @@
- santos_dim4_triang_SOURCES = santos_dim4_triang.cc
- santos_22_triang_SOURCES = santos_22_triang.cc
+ checkregularity_SOURCES = checkregularity.cc
--LDADD = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a \
+-LDADD = ../lib-src-reg/libCHECKREG.a \
+- ../lib-src/libTOPCOM.a \
- ../external/lib/libcddgmp.a \
- ../external/lib/libgmpxx.a \
- ../external/lib/libgmp.a
@@ -103,20 +123,23 @@ diff -ur a/src/Makefile.am b/src/Makefile.am
+AM_CPPFLAGS += $(CPPFLAGS)
AM_CPPFLAGS += -I$(includedir)
+
-AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
+-
+-AM_CXXFLAGS = -O2
+AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
--AM_CXXFLAGS = -O2
+AM_CXXFLAGS = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
-diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am
---- a/src-reg/Makefile.am 2020-02-15 12:44:55.165570550 +0100
-+++ b/src-reg/Makefile.am 2020-02-15 14:08:22.933773888 +0100
-@@ -2,20 +2,15 @@
-
- checkregularity_SOURCES = checkregularity.cc
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ff7e574..63a76fc 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -83,18 +83,14 @@ santos_triang_SOURCES = santos_triang.cc
+ santos_dim4_triang_SOURCES = santos_dim4_triang.cc
+ santos_22_triang_SOURCES = santos_22_triang.cc
--LDADD = ../lib-src-reg/libCHECKREG.a \
-- ../lib-src/libTOPCOM.a \
+-LDADD = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a \
- ../external/lib/libcddgmp.a \
- ../external/lib/libgmpxx.a \
- ../external/lib/libgmp.a
@@ -130,17 +153,16 @@ diff -ur a/src-reg/Makefile.am b/src-reg/Makefile.am
+AM_CPPFLAGS += $(CPPFLAGS)
AM_CPPFLAGS += -I$(includedir)
-
-AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30
--
--AM_CXXFLAGS = -O2
+AM_CPPFLAGS += -DVERBOSE -DGMPRATIONAL -ftemplate-depth-30 -lTOPCOM -lCHECKREG
+-AM_CXXFLAGS = -O2
+AM_CXXFLAGS = $(CXXFLAGS) -L../lib-src-reg -L../lib-src -lTOPCOM -lCHECKREG
-diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
---- a/wrap-gmp-gmpxx/Makefile.am 2020-02-15 12:44:55.165570550 +0100
-+++ b/wrap-gmp-gmpxx/Makefile.am 2020-02-15 14:08:23.105774912 +0100
-@@ -3,6 +3,6 @@
+diff --git a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
+index b9ef8db..4c3f675 100644
+--- a/wrap-gmp-gmpxx/Makefile.am
++++ b/wrap-gmp-gmpxx/Makefile.am
+@@ -3,6 +3,6 @@ Integer.h \
Rational.h
AM_CPPFLAGS = -I../external/include
@@ -149,3 +171,87 @@ diff -ur a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
-AM_CXXFLAGS = -O2
+AM_CXXFLAGS = $(CXXFLAGS)
+--
+2.35.1
+
+From 1980a3cba20ac549f488d7e00a01d3eee61485be Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 May 2022 16:14:57 -0400
+Subject: [PATCH 2/3] configure.ac: don't try to invoke csh to print an
+ informational message.
+
+On systems that don't have csh, running "csh -c 'echo...'" will result
+in an error; for example,
+
+ ./configure: line 4102: csh: command not found
+
+Autoconf already provides macros to print the status and results of
+various checks, so here we switch this particular invocation to make
+use of AC_MSG_CHECKING and AC_MSG_RESULT.
+
+While we're at it, the old-fashioned AC_CHECK_LIB was updated to use
+the newer AC_SEARCH_LIBS.
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a10fb97..0b2c0aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,11 @@ dnl AC_CHECK_LIB(stdc, main)
+ dnl Replace `main' with a function in -lstdc++:
+ dnl AC_CHECK_LIB(stdc++, main)
+ dnl Check for soplex:
+-AC_CHECK_LIB(soplex, main, , csh -c 'echo soplex not found: --soplex will not work.')
++AC_MSG_CHECKING([for soplex])
++AC_SEARCH_LIBS([main],
++ [soplex],
++ [AC_MSG_RESULT([success])],
++ [AC_MSG_RESULT([failed, --soplex will not work])])
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--
+2.35.1
+
+From 041f20f5712262ab99bfdfe29e20355d5e4fbf5d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 May 2022 16:19:50 -0400
+Subject: [PATCH 3/3] configure.ac: run autoupdate.
+
+Autoconf-2.7x emits a few warnings while processing configure.ac. This
+commit is the result of running "autoupdate" to fix them.
+---
+ configure.ac | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b2c0aa..cddaef6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(TOPCOM, 0.17.8)
++AC_INIT([TOPCOM],[0.17.8])
+ AC_CONFIG_SRCDIR(.)
+
+ dnl Init automake.
+@@ -27,12 +27,9 @@ AC_SEARCH_LIBS([main],
+ [AC_MSG_RESULT([success])],
+ [AC_MSG_RESULT([failed, --soplex will not work])])
+
+-dnl Checks for header files.
+-AC_HEADER_STDC
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+
+-dnl Checks for library functions.
+-
+-AC_OUTPUT(wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile Makefile)
++AC_CONFIG_FILES([wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile Makefile])
++AC_OUTPUT
+--
+2.35.1
+
diff --git a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.8-r2.ebuild
similarity index 74%
rename from sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
rename to sci-mathematics/topcom/topcom-0.17.8-r2.ebuild
index d0558905f947..1e0b4b30d0bd 100644
--- a/sci-mathematics/topcom/topcom-0.17.8-r1.ebuild
+++ b/sci-mathematics/topcom/topcom-0.17.8-r2.ebuild
@@ -1,15 +1,18 @@
-# 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
+MY_PV=$(ver_rs 0-2 _)
+MY_P="${PN^^}-${MY_PV}"
+
DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
-HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
+HOMEPAGE="https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM/index.html"
SRC_URI="
- http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
- http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html
+ https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Downloads/${MY_P}.tgz
+ https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Manual/index.html -> TOPCOM-manual.html
"
KEYWORDS="~amd64 ~riscv ~x86"
SLOT="0"
@@ -21,7 +24,6 @@ DEPEND="
>=sci-libs/cddlib-094f
"
RDEPEND="${DEPEND}"
-BDEPEND="app-shells/tcsh"
PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/
@ 2022-05-07 22:31 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2022-05-07 22:31 UTC (permalink / raw
To: gentoo-commits
commit: b6f66306dc45d39fce52f9d8b2509ca588ec93f7
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 20:46:12 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat May 7 22:29:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f66306
sci-mathematics/topcom: remove old topcom-0.17.7-r1.ebuild.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/topcom/Manifest | 1 -
.../topcom/files/topcom-0.17.7-buildsystem.patch | 327 ---------------------
sci-mathematics/topcom/topcom-0.17.7-r1.ebuild | 53 ----
3 files changed, 381 deletions(-)
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index b791cf49116e..7838ec1e93cf 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,3 +1,2 @@
-DIST TOPCOM-0.17.7.tar.gz 8661519 BLAKE2B f42d273b39b15ccaf0d24ad360dc91cecd2ab83c97eb5a2fffe95575d7c8063d9afa842d7bfae03faee32ced1f98ccc55a750a59c1f544acded462a478aac636 SHA512 528e566e488641e078a8c9150f88a1544f607e6859da1d95a98dc5890c5a52882f8c8790097c3a77277066bd5d4c10a1e0a9c131fbc521f56f6139eeab7e21d1
DIST TOPCOM-0_17_8.tgz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
diff --git a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch b/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch
deleted file mode 100644
index 154ccd0382b8..000000000000
--- a/sci-mathematics/topcom/files/topcom-0.17.7-buildsystem.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -U 3 -dHrN topcom-0.17.7.orig/src/Makefile.in topcom-0.17.7/src/Makefile.in
---- topcom-0.17.7.orig/src/Makefile.in 2016-07-08 12:46:13.000000000 +0200
-+++ topcom-0.17.7/src/Makefile.in 2016-09-25 20:22:51.729578197 +0200
-@@ -119,249 +119,206 @@
- am_B_A_OBJECTS = B_A.$(OBJEXT)
- B_A_OBJECTS = $(am_B_A_OBJECTS)
- B_A_LDADD = $(LDADD)
--B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \
-- ../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \
-- ../external/lib/libgmp.a
-+B_A_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a
- am_B_A_center_OBJECTS = B_A_center.$(OBJEXT)
- B_A_center_OBJECTS = $(am_B_A_center_OBJECTS)
- B_A_center_LDADD = $(LDADD)
- B_A_center_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_B_D_OBJECTS = B_D.$(OBJEXT)
- B_D_OBJECTS = $(am_B_D_OBJECTS)
- B_D_LDADD = $(LDADD)
--B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a \
-- ../external/lib/libcddgmp.a ../external/lib/libgmpxx.a \
-- ../external/lib/libgmp.a
-+B_D_DEPENDENCIES = ../lib-src/libTOPCOM.a ../lib-src-reg/libCHECKREG.a
- am_chiro2allfinetriangs_OBJECTS = chiro2allfinetriangs.$(OBJEXT)
- chiro2allfinetriangs_OBJECTS = $(am_chiro2allfinetriangs_OBJECTS)
- chiro2allfinetriangs_LDADD = $(LDADD)
- chiro2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2alltriangs_OBJECTS = chiro2alltriangs.$(OBJEXT)
- chiro2alltriangs_OBJECTS = $(am_chiro2alltriangs_OBJECTS)
- chiro2alltriangs_LDADD = $(LDADD)
- chiro2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2circuits_OBJECTS = chiro2circuits.$(OBJEXT)
- chiro2circuits_OBJECTS = $(am_chiro2circuits_OBJECTS)
- chiro2circuits_LDADD = $(LDADD)
- chiro2circuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2cocircuits_OBJECTS = chiro2cocircuits.$(OBJEXT)
- chiro2cocircuits_OBJECTS = $(am_chiro2cocircuits_OBJECTS)
- chiro2cocircuits_LDADD = $(LDADD)
- chiro2cocircuits_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2dual_OBJECTS = chiro2dual.$(OBJEXT)
- chiro2dual_OBJECTS = $(am_chiro2dual_OBJECTS)
- chiro2dual_LDADD = $(LDADD)
- chiro2dual_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2finetriang_OBJECTS = chiro2finetriang.$(OBJEXT)
- chiro2finetriang_OBJECTS = $(am_chiro2finetriang_OBJECTS)
- chiro2finetriang_LDADD = $(LDADD)
- chiro2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2finetriangs_OBJECTS = chiro2finetriangs.$(OBJEXT)
- chiro2finetriangs_OBJECTS = $(am_chiro2finetriangs_OBJECTS)
- chiro2finetriangs_LDADD = $(LDADD)
- chiro2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2mintriang_OBJECTS = chiro2mintriang.$(OBJEXT)
- chiro2mintriang_OBJECTS = $(am_chiro2mintriang_OBJECTS)
- chiro2mintriang_LDADD = $(LDADD)
- chiro2mintriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2nallfinetriangs_OBJECTS = chiro2nallfinetriangs.$(OBJEXT)
- chiro2nallfinetriangs_OBJECTS = $(am_chiro2nallfinetriangs_OBJECTS)
- chiro2nallfinetriangs_LDADD = $(LDADD)
- chiro2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2nalltriangs_OBJECTS = chiro2nalltriangs.$(OBJEXT)
- chiro2nalltriangs_OBJECTS = $(am_chiro2nalltriangs_OBJECTS)
- chiro2nalltriangs_LDADD = $(LDADD)
- chiro2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2nfinetriangs_OBJECTS = chiro2nfinetriangs.$(OBJEXT)
- chiro2nfinetriangs_OBJECTS = $(am_chiro2nfinetriangs_OBJECTS)
- chiro2nfinetriangs_LDADD = $(LDADD)
- chiro2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2ntriangs_OBJECTS = chiro2ntriangs.$(OBJEXT)
- chiro2ntriangs_OBJECTS = $(am_chiro2ntriangs_OBJECTS)
- chiro2ntriangs_LDADD = $(LDADD)
- chiro2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2placingtriang_OBJECTS = chiro2placingtriang.$(OBJEXT)
- chiro2placingtriang_OBJECTS = $(am_chiro2placingtriang_OBJECTS)
- chiro2placingtriang_LDADD = $(LDADD)
- chiro2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_chiro2triangs_OBJECTS = chiro2triangs.$(OBJEXT)
- chiro2triangs_OBJECTS = $(am_chiro2triangs_OBJECTS)
- chiro2triangs_LDADD = $(LDADD)
- chiro2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_cocircuits2facets_OBJECTS = cocircuits2facets.$(OBJEXT)
- cocircuits2facets_OBJECTS = $(am_cocircuits2facets_OBJECTS)
- cocircuits2facets_LDADD = $(LDADD)
- cocircuits2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_cross_OBJECTS = cross.$(OBJEXT)
- cross_OBJECTS = $(am_cross_OBJECTS)
- cross_LDADD = $(LDADD)
- cross_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_cube_OBJECTS = cube.$(OBJEXT)
- cube_OBJECTS = $(am_cube_OBJECTS)
- cube_LDADD = $(LDADD)
- cube_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_cyclic_OBJECTS = cyclic.$(OBJEXT)
- cyclic_OBJECTS = $(am_cyclic_OBJECTS)
- cyclic_LDADD = $(LDADD)
- cyclic_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_hypersimplex_OBJECTS = hypersimplex.$(OBJEXT)
- hypersimplex_OBJECTS = $(am_hypersimplex_OBJECTS)
- hypersimplex_LDADD = $(LDADD)
- hypersimplex_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_lattice_OBJECTS = lattice.$(OBJEXT)
- lattice_OBJECTS = $(am_lattice_OBJECTS)
- lattice_LDADD = $(LDADD)
- lattice_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2allfinetriangs_OBJECTS = points2allfinetriangs.$(OBJEXT)
- points2allfinetriangs_OBJECTS = $(am_points2allfinetriangs_OBJECTS)
- points2allfinetriangs_LDADD = $(LDADD)
- points2allfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2alltriangs_OBJECTS = points2alltriangs.$(OBJEXT)
- points2alltriangs_OBJECTS = $(am_points2alltriangs_OBJECTS)
- points2alltriangs_LDADD = $(LDADD)
- points2alltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2chiro_OBJECTS = points2chiro.$(OBJEXT)
- points2chiro_OBJECTS = $(am_points2chiro_OBJECTS)
- points2chiro_LDADD = $(LDADD)
- points2chiro_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2facets_OBJECTS = points2facets.$(OBJEXT)
- points2facets_OBJECTS = $(am_points2facets_OBJECTS)
- points2facets_LDADD = $(LDADD)
- points2facets_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2finetriang_OBJECTS = points2finetriang.$(OBJEXT)
- points2finetriang_OBJECTS = $(am_points2finetriang_OBJECTS)
- points2finetriang_LDADD = $(LDADD)
- points2finetriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2finetriangs_OBJECTS = points2finetriangs.$(OBJEXT)
- points2finetriangs_OBJECTS = $(am_points2finetriangs_OBJECTS)
- points2finetriangs_LDADD = $(LDADD)
- points2finetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2flips_OBJECTS = points2flips.$(OBJEXT)
- points2flips_OBJECTS = $(am_points2flips_OBJECTS)
- points2flips_LDADD = $(LDADD)
- points2flips_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2nallfinetriangs_OBJECTS = points2nallfinetriangs.$(OBJEXT)
- points2nallfinetriangs_OBJECTS = $(am_points2nallfinetriangs_OBJECTS)
- points2nallfinetriangs_LDADD = $(LDADD)
- points2nallfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2nalltriangs_OBJECTS = points2nalltriangs.$(OBJEXT)
- points2nalltriangs_OBJECTS = $(am_points2nalltriangs_OBJECTS)
- points2nalltriangs_LDADD = $(LDADD)
- points2nalltriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2nfinetriangs_OBJECTS = points2nfinetriangs.$(OBJEXT)
- points2nfinetriangs_OBJECTS = $(am_points2nfinetriangs_OBJECTS)
- points2nfinetriangs_LDADD = $(LDADD)
- points2nfinetriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2nflips_OBJECTS = points2nflips.$(OBJEXT)
- points2nflips_OBJECTS = $(am_points2nflips_OBJECTS)
- points2nflips_LDADD = $(LDADD)
- points2nflips_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2ntriangs_OBJECTS = points2ntriangs.$(OBJEXT)
- points2ntriangs_OBJECTS = $(am_points2ntriangs_OBJECTS)
- points2ntriangs_LDADD = $(LDADD)
- points2ntriangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2placingtriang_OBJECTS = points2placingtriang.$(OBJEXT)
- points2placingtriang_OBJECTS = $(am_points2placingtriang_OBJECTS)
- points2placingtriang_LDADD = $(LDADD)
- points2placingtriang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2triangs_OBJECTS = points2triangs.$(OBJEXT)
- points2triangs_OBJECTS = $(am_points2triangs_OBJECTS)
- points2triangs_LDADD = $(LDADD)
- points2triangs_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_points2volume_OBJECTS = points2volume.$(OBJEXT)
- points2volume_OBJECTS = $(am_points2volume_OBJECTS)
- points2volume_LDADD = $(LDADD)
- points2volume_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_santos_22_triang_OBJECTS = santos_22_triang.$(OBJEXT)
- santos_22_triang_OBJECTS = $(am_santos_22_triang_OBJECTS)
- santos_22_triang_LDADD = $(LDADD)
- santos_22_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_santos_dim4_triang_OBJECTS = santos_dim4_triang.$(OBJEXT)
- santos_dim4_triang_OBJECTS = $(am_santos_dim4_triang_OBJECTS)
- santos_dim4_triang_LDADD = $(LDADD)
- santos_dim4_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- am_santos_triang_OBJECTS = santos_triang.$(OBJEXT)
- santos_triang_OBJECTS = $(am_santos_triang_OBJECTS)
- santos_triang_LDADD = $(LDADD)
- santos_triang_DEPENDENCIES = ../lib-src/libTOPCOM.a \
-- ../lib-src-reg/libCHECKREG.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src-reg/libCHECKREG.a
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -591,9 +548,6 @@
- santos_22_triang_SOURCES = santos_22_triang.cc
- LDADD = ../lib-src/libTOPCOM.a \
- ../lib-src-reg/libCHECKREG.a \
-- ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a \
-- ../external/lib/libgmp.a
-
- AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \
- -I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \
-diff -U 3 -dHrN topcom-0.17.7.orig/src-reg/Makefile.in topcom-0.17.7/src-reg/Makefile.in
---- topcom-0.17.7.orig/src-reg/Makefile.in 2016-07-08 12:46:13.000000000 +0200
-+++ topcom-0.17.7/src-reg/Makefile.in 2016-09-25 20:19:04.062645737 +0200
-@@ -102,8 +102,7 @@
- checkregularity_OBJECTS = $(am_checkregularity_OBJECTS)
- checkregularity_LDADD = $(LDADD)
- checkregularity_DEPENDENCIES = ../lib-src-reg/libCHECKREG.a \
-- ../lib-src/libTOPCOM.a ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a ../external/lib/libgmp.a
-+ ../lib-src/libTOPCOM.a
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -257,9 +256,6 @@
- checkregularity_SOURCES = checkregularity.cc
- LDADD = ../lib-src-reg/libCHECKREG.a \
- ../lib-src/libTOPCOM.a \
-- ../external/lib/libcddgmp.a \
-- ../external/lib/libgmpxx.a \
-- ../external/lib/libgmp.a
-
- AM_CPPFLAGS = -I../lib-src -I../lib-src-reg -I../wrap-gmp-gmpxx \
- -I../external/include -I$(includedir) -DVERBOSE -DGMPRATIONAL \
diff --git a/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild b/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild
deleted file mode 100644
index 0e7e8c06ff27..000000000000
--- a/sci-mathematics/topcom/topcom-0.17.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
-HOMEPAGE="http://www.rambau.wm.uni-bayreuth.de/TOPCOM/"
-SRC_URI="
- http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-${PV}.tar.gz
- doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc examples static-libs"
-
-DEPEND="
- dev-libs/gmp:0
- >=sci-libs/cddlib-094f"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-buildsystem.patch
-)
-
-src_prepare() {
- # ... and link in tree versions:
- append-libs -lgmp -lgmpxx -lcddgmp
-
- find external -delete || die
-
- default
-}
-
-src_install() {
- default
-
- use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
-
- use examples && dodoc -r "${S}"/examples
-
- docinto html
- use doc && dodoc "${DISTDIR}"/TOPCOM-manual.html
-
- mv "${ED}"/usr/bin/cube "${ED}"/usr/bin/topcom_cube || die
-}
-
-pkg_postinst() {
- elog "Due to a file collision with media-libs/lib3ds the helper"
- elog "'cube' has been installed as topcom_cube (see bug #547030)."
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/
@ 2024-05-15 22:51 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2024-05-15 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 0c9c98de9bb757a4a2cd0857df6d0e98eb7a6837
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 21:40:18 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed May 15 21:42:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9c98de
sci-mathematics/topcom: add 1.1.2
Closes: https://bugs.gentoo.org/928063
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/topcom/Manifest | 2 +
.../topcom/files/topcom-1.1.2-buildsystem.patch | 295 +++++++++++++++++++++
sci-mathematics/topcom/topcom-1.1.2.ebuild | 54 ++++
3 files changed, 351 insertions(+)
diff --git a/sci-mathematics/topcom/Manifest b/sci-mathematics/topcom/Manifest
index 7838ec1e93cf..328160036c78 100644
--- a/sci-mathematics/topcom/Manifest
+++ b/sci-mathematics/topcom/Manifest
@@ -1,2 +1,4 @@
DIST TOPCOM-0_17_8.tgz 8994044 BLAKE2B 27426b9fd9da8bc51e3632483cdd1c3f878a03d22dcad637c1c26368d58dbc9a9ef4c6918e314484336b1355cdf703287bf50d248e257773729a4d9fd012c0ca SHA512 2ddab2f30bf3adf93f0bb76c50bc70a5927fe2a9561a59df0ac7bec193b9a9b231eecb58c69840247536b73fda5298955518e798c3b5f8d2961ca09dfdc81cce
+DIST TOPCOM-1_1_2.tgz 7924000 BLAKE2B 4e489c2ee1682ca4612eaef785134711d9cd1b61a225b811015fcf8b3db057d83169fb251f61f4b8f983bfd450515619f01664789f7f5dbe2a076d2af0ab6a28 SHA512 acdfcd11d4d6d6b3d21f90313d413a0d6a753a982d1090de5ed2cdd011dec98e04058f79679772bb911c5c2f23834477c5fff9511ca0cd67a392c6b24347ef7d
DIST TOPCOM-manual.html 19251 BLAKE2B 8e361fd81bed45b552766a86a856ed1411154b5c523e14463750651d1c8d7b0f1f25a7c29bfdc34910fad3d19a1df94ded47b63a973f22baf3d60a7c5f0e1578 SHA512 5d0303f141bce12e0354c2fb65420102aa198e2271c0e901621f850b47f9cf9642659b0cf8e9bcc7a6da3b39914c20e47c67e72aa9cf999892f80855daa25c67
+DIST TOPCOM-manual.pdf 173775 BLAKE2B 6bc7a68c17b514d0ceb1d7ee69fd9c943078ceb88c6b98a12cb88447cf5720d47aa9db70b0c584ccd6900d186822176cd949b55f4d6badb8ffa997ed1fcba799 SHA512 820f26075d3416264ebece7b218f4c5cdfea0f465fe71724d799e4f0375c44e16f80e49f1f184d48d9699fb42379a27924f4c01385d85216d099e3e1c557389f
diff --git a/sci-mathematics/topcom/files/topcom-1.1.2-buildsystem.patch b/sci-mathematics/topcom/files/topcom-1.1.2-buildsystem.patch
new file mode 100644
index 000000000000..77982286acf2
--- /dev/null
+++ b/sci-mathematics/topcom/files/topcom-1.1.2-buildsystem.patch
@@ -0,0 +1,295 @@
+From 4e0185faf3f97f0d027cf74df54d4b08adf1d355 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 15 May 2024 09:51:06 -0400
+Subject: [PATCH 1/1] */*: patch build system for Gentoo
+
+ - No "external" anything
+ - Use libtool for libraries
+ - Unbundle gmp and cddlib
+ - Use modern cddlib include path
+ - Detect deps with pkg-config
+ - Build lib-reg after lib
+ - Don't hide all symbols with -fvisibility=hidden???
+---
+ Makefile.am | 8 +---
+ configure.ac | 92 +++++++-------------------------------
+ lib-src-reg/LPinterface.hh | 4 +-
+ lib-src-reg/Makefile.am | 7 +--
+ lib-src/Makefile.am | 5 +--
+ src-reg/Makefile.am | 19 +-------
+ src/Makefile.am | 19 +-------
+ wrap-gmp-gmpxx/Makefile.am | 1 -
+ 8 files changed, 29 insertions(+), 126 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 17f6960..02f80f3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1 @@
+-SUBDIRS = wrap-gmp-gmpxx lib-src-reg lib-src src-reg src examples share
+-EXTRA_DIST = external/Makefile
+-EXTRA_DIST += external/gmp-6.2.1.tar.bz2
+-EXTRA_DIST += external/cddlib-0.94j-TOPCOMb.tar.gz
+-EXTRA_DIST += external/qsopt_ex-2.5.10.3.tar.gz
+-EXTRA_DIST += external/gmpxx-patch
+-
++SUBDIRS = wrap-gmp-gmpxx lib-src lib-src-reg src src-reg examples share
+diff --git a/configure.ac b/configure.ac
+index 2372711..0e6efd7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,96 +10,36 @@ AC_SUBST([TOPCOMROOT], [`pwd`])
+
+ dnl set some compilation switches consistently:
+ AC_SUBST([AM_CPPFLAGS], ["-DSTL_SYMMETRIES -DSTL_CONTAINERS -DSTL_FLIPS -DSTL_CHIROTOPE -DGMPRATIONAL -DPERMLIB_DOMAIN_INT -DUSE_LEXORDER]")
+-AC_SUBST([AM_CXXFLAGS], [" -fvisibility=hidden -fvisibility-inlines-hidden -pthread -std=c++17"])
+-AC_SUBST([AM_LDFLAGS], ["-L../external/lib]")
+-
+-dnl backup the user variable LDFLAGS:
+-dnl AC_SUBST([LDFLAGS_backup], [${LDFLAGS}])
+-
+-dnl add local libraries to LDFLAGS so that AC_CHECK_LIB will find them:
+-dnl AC_SUBST([LDFLAGS], ["-L${TOPCOMROOT}/external/lib"])
++AC_SUBST([AM_CXXFLAGS], ["-std=c++17"])
+
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_CXX
+-AC_PROG_RANLIB
++LT_INIT
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+
+
+ dnl Check for libraries:
+-dnl Make libgmp if requested:
+-AC_LANG_PUSH(C++)
+-AC_CHECK_HEADERS([gmpxx.h])
+-AC_LANG_POP
+-AM_CONDITIONAL(USE_LOCAL_GMP, [test "x$ac_cv_header_gmpxx_h" = "xno"])
+-if test "x$ac_cv_header_gmpxx_h" = "xyes"; then
+- AC_MSG_NOTICE([system libgmp is used])
+-else
+- AC_MSG_NOTICE([gmpxx.h not found on system - building gmp locally ...])
+- make -C external gmp
+- AC_MSG_NOTICE([... done])
+-fi
+-
+-dnl Make libcddgmp:
+-make -C external cdd
+-
+-dnl Check for requests for third-party packages:
+-dnl Check for qsopt_ex:
+-AC_MSG_CHECKING(whether QSOpt_ex support was enabled)
+-AC_ARG_ENABLE([qsoptex],
+- AS_HELP_STRING([--enable-qsoptex],
+- [use QSOpt_ex as an LP solver for regularity checks (requires QSOpt_ex includes in ${TOPCOM}/external/include and libqsopt_ex.a in ${TOPCOM}/external/lib (built automatically during configure)])
++PKG_CHECK_MODULES(
++ [GMPXX],
++ [gmpxx],[
++ LIBS="${LIBS} ${GMPXX_LIBS}"
++ CPPFLAGS="${CPPFLAGS} ${GMPXX_CFLAGS}"
++ ],
++ [AC_MSG_ERROR([gmpxx not found])]
+ )
+-AM_CONDITIONAL(USE_QSOPTEX, [test "x$enable_qsoptex" = "xyes"])
+-if test "x$enable_qsoptex" = "xyes"; then
+- AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_LIBQSOPTEX)
+-
+- dnl Check for compression libraries (qsopt_ex uses them if they are present):
+- AC_CHECK_LIB([z], [gzopen], [], AC_MSG_NOTICE([compiling without libz]))
+- AC_CHECK_LIB([bz2], [BZ2_bzopen], [], AC_MSG_NOTICE([compiling without libbz2]))
+-
+- dnl Make libqsopt_ex:
+- make -C external qso
+-else
+- AC_MSG_RESULT(no)
+-fi
+-
+-dnl Check for soplex:
+-AC_MSG_CHECKING(whether soplex support was enabled)
+-AC_ARG_ENABLE([soplex],
+- AS_HELP_STRING([--enable-soplex],
+- [use soplex as an LP solver for regularity checks (requires soplex includes and boost in ${TOPCOM}/external/include and libsoplex.a in ${TOPCOM}/external/lib)])
++PKG_CHECK_MODULES(
++ [CDDLIB],
++ [cddlib],[
++ LIBS="${LIBS} ${CDDLIB_LIBS}"
++ CPPFLAGS="${CPPFLAGS} ${CDDLIB_CFLAGS}"
++ ],
++ [AC_MSG_ERROR([cddlib not found])]
+ )
+-if test "x$enable_soplex" = "xyes"; then
+- AC_MSG_RESULT(yes)
+-
+- dnl Check for compression library (soplex needs it):
+- AC_CHECK_LIB([z], [gzopen], [LIBS="-lsoplex $LIBS"; AC_DEFINE(HAVE_LIBSOPLEX)], AC_MSG_NOTICE([libz missing => soplex not enabled]))
+-else
+- AC_MSG_RESULT(no)
+-fi
+-AM_CONDITIONAL(USE_SOPLEX, [test "x$ac_cv_lib_z_gzopen" = "xyes" -a "x$enable_soplex" = "xyes"])
+-
+-dnl Check for Permlib:
+-dnl AC_MSG_CHECKING(whether permlib support was enabled)
+-dnl AC_ARG_ENABLE([permlib],
+-dnl AS_HELP_STRING([--enable-permlib],
+-dnl [support permlib for symmetry checks (requires permlib-includes and boost in ${TOPCOM}/external/include)])
+-dnl )
+-dnl AM_CONDITIONAL(USE_PERMLIB, [test "x$enable_permlib" = "xyes"])
+-dnl if test "x$enable_permlib" = "xyes"; then
+-dnl AC_DEFINE(HAVE_LIBPERMLIB)
+-dnl AC_MSG_RESULT(yes)
+-dnl else
+-dnl AC_MSG_RESULT(no)
+-dnl fi
+
+-dnl restore the user variable LDLFAGS:
+-dnl AC_SUBST([LDFLAGS], [${LDFLAGS_backup}])
+
+ AC_CONFIG_FILES([wrap-gmp-gmpxx/Makefile lib-src/Makefile lib-src-reg/Makefile src/Makefile src-reg/Makefile examples/Makefile share/Makefile Makefile])
+ AC_OUTPUT
+diff --git a/lib-src-reg/LPinterface.hh b/lib-src-reg/LPinterface.hh
+index 6522dbe..c376887 100644
+--- a/lib-src-reg/LPinterface.hh
++++ b/lib-src-reg/LPinterface.hh
+@@ -21,8 +21,8 @@
+ #include "LabelSet.hh"
+ #include "Rational.h"
+
+-#include "setoper.h"
+-#include "cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+
+ namespace topcom {
+
+diff --git a/lib-src-reg/Makefile.am b/lib-src-reg/Makefile.am
+index fa8de11..13a0c87 100644
+--- a/lib-src-reg/Makefile.am
++++ b/lib-src-reg/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libCHECKREG.a
++lib_LTLIBRARIES = libCHECKREG.la
+
+-libCHECKREG_a_SOURCES = \
++libCHECKREG_la_SOURCES = \
+ QSOinterface.cc \
+ SPXinterface.cc \
+ LPinterface.cc \
+@@ -12,9 +12,10 @@ SPXinterface.hh \
+ RegularityCheck.hh \
+ LPinterface.hh
+
++libCHECKREG_la_LIBADD = ../lib-src/libTOPCOM.la
++
+ AM_CPPFLAGS += -I../lib-src
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -ftemplate-depth=100
+diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
+index c048061..dbaa888 100644
+--- a/lib-src/Makefile.am
++++ b/lib-src/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libTOPCOM.a
++lib_LTLIBRARIES = libTOPCOM.la
+
+-libTOPCOM_a_SOURCES = \
++libTOPCOM_la_SOURCES = \
+ Admissibles.cc \
+ CheckTriang.cc \
+ Circuits.cc \
+@@ -134,7 +134,6 @@ Volumes.hh
+
+ AM_CPPFLAGS += -I../lib-src-reg
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -ftemplate-depth=100
+diff --git a/src-reg/Makefile.am b/src-reg/Makefile.am
+index ed4a016..78e9c44 100644
+--- a/src-reg/Makefile.am
++++ b/src-reg/Makefile.am
+@@ -2,27 +2,12 @@ bin_PROGRAMS = checkregularity
+
+ checkregularity_SOURCES = checkregularity.cc
+
+-LDADD = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a \
+- ../external/lib/libcddgmp.a
+-if USE_QSOPTEX
+-LDADD += ../external/lib/libqsopt_ex.a
+-endif
+-
+-if USE_SOPLEX
+-LDADD += ../external/lib/libsoplex.a
+-endif
+-if USE_LOCAL_GMP
+-LDADD += ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
+-else
+-LIBS += -lgmpxx -lgmp
+-endif
++checkregularity_LDADD = ../lib-src/libTOPCOM.la \
++ ../lib-src-reg/libCHECKREG.la
+
+ AM_CPPFLAGS += -I../lib-src
+ AM_CPPFLAGS += -I../lib-src-reg
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -ftemplate-depth=100
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c97ecc5..ce723fb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -121,27 +121,12 @@ santos_triang_SOURCES = santos_triang.cc
+ santos_dim4_triang_SOURCES = santos_dim4_triang.cc
+ santos_22_triang_SOURCES = santos_22_triang.cc
+
+-LDADD = ../lib-src/libTOPCOM.a \
+- ../lib-src-reg/libCHECKREG.a \
+- ../external/lib/libcddgmp.a
+-if USE_QSOPTEX
+-LDADD += ../external/lib/libqsopt_ex.a
+-endif
+-if USE_SOPLEX
+-LDADD += ../external/lib/libsoplex.a
+-endif
+-if USE_LOCAL_GMP
+-LDADD += ../external/lib/libgmpxx.a \
+- ../external/lib/libgmp.a
+-else
+-LIBS += -lgmpxx -lgmp
+-endif
+-
++LDADD = ../lib-src/libTOPCOM.la \
++ ../lib-src-reg/libCHECKREG.la
+
+ AM_CPPFLAGS += -I../lib-src
+ AM_CPPFLAGS += -I../lib-src-reg
+ AM_CPPFLAGS += -I../wrap-gmp-gmpxx
+-AM_CPPFLAGS += -I../external/include
+ AM_CPPFLAGS += -I$(includedir)
+
+ AM_CPPFLAGS += -ftemplate-depth=100
+diff --git a/wrap-gmp-gmpxx/Makefile.am b/wrap-gmp-gmpxx/Makefile.am
+index f85cfc5..41ad248 100644
+--- a/wrap-gmp-gmpxx/Makefile.am
++++ b/wrap-gmp-gmpxx/Makefile.am
+@@ -2,5 +2,4 @@ include_HEADERS = \
+ Integer.h \
+ Rational.h
+
+-AM_CPPFLAGS += -I../external/include
+ AM_CPPFLAGS += -I$(includedir)
+--
+2.43.2
+
diff --git a/sci-mathematics/topcom/topcom-1.1.2.ebuild b/sci-mathematics/topcom/topcom-1.1.2.ebuild
new file mode 100644
index 000000000000..2093e331468c
--- /dev/null
+++ b/sci-mathematics/topcom/topcom-1.1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PV=$(ver_rs 0-2 _)
+MY_P="${PN^^}-${MY_PV}"
+
+DESCRIPTION="Computing Triangulations Of Point Configurations and Oriented Matroids"
+HOMEPAGE="https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM/index.html"
+SRC_URI="
+ https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Downloads/${MY_P}.tgz
+ doc? ( https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Manual/TOPCOM-manual.pdf )
+"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc examples"
+
+DEPEND="
+ dev-libs/gmp:0[cxx]
+ sci-libs/cddlib
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
+src_prepare () {
+ default
+ eautoreconf
+ find external -delete || die
+}
+
+src_install () {
+ default
+
+ use doc && dodoc "${DISTDIR}/TOPCOM-manual.pdf"
+
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
+ fi
+
+ mv "${ED}/usr/bin/cube" "${ED}/usr/bin/topcom_cube" || die
+
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ elog "Due to a file collision with media-libs/lib3ds the helper"
+ elog "'cube' has been installed as topcom_cube (see bug #547030)."
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-15 22:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-25 18:27 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/topcom/files/, sci-mathematics/topcom/ Thomas Kahle
-- strict thread matches above, loose matches on Subject: below --
2016-09-25 18:36 Thomas Kahle
2021-03-07 22:18 Michael Orlitzky
2022-05-07 22:31 Michael Orlitzky
2022-05-07 22:31 Michael Orlitzky
2024-05-15 22:51 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox