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

[Michael Orlitzky]

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@××××××××.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@××××××××.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@××××××××.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" )