diff options
Diffstat (limited to 'sci-mathematics/singular')
12 files changed, 228 insertions, 634 deletions
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index b232d12bdf2d..731216862618 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -1,17 +1,11 @@ AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431 -AUX singular-4.0.0-fix-omalloc-ar-detection.patch 484 BLAKE2B 801f773c434ad35a18f80be4453a70540438054fca6fe7e8ba58520d8e17c47da51669d951989c161049d451d111a57d2e6f365ef4ee523829e056fdc2c4c72f SHA512 4f74b1d436c17efa3872a6b24e56c691220813a3cc2debeb19caa5dd6bf0e3c39af32e43e3d7afb5af40f985ec56377128185b9138dfcf77a04618ba444ea619 -AUX singular-4.0.2-ntl8-compat.patch 1149 BLAKE2B ed7ca37745eb37dd6493dfc4b531c3b9dc7390bc246a5ac08480ab188746883f3320031b14f9fe542c5889a56fa6c5c93a4b3f23e581cfb11cc308caa4dfa868 SHA512 178f0130cd6a606d6c93f5cc42dfe92782a16cc6b3d0e2695ce16d2115f70e502f702e8e72fd5d3b61b1bb5b3f4038a4fbf6277418b3f0bf89cae7939d5ed606 -AUX singular-4.0.3-fix-destdir.patch 992 BLAKE2B ffde08cf18fe22214acee27877090d7a7e3f458fac2f6f928cc822995c77579e705acb87b3bac4a9f84806bb3ce84eacfe7b51db3b51c94121c92b5335e207bb SHA512 6b0496d1901c51da66d75fde1b980333df8b1e03572f49ecd56f3f3c67d3af1b08527c7b764aa3b62b0296b97aaaa861d257a97a4370b3600b2cd7ffb9580936 -AUX singular-4.0.3-fix-resources-name.patch 10175 BLAKE2B 54b576ab1d5db6a1d2aca507472e3eba0a4c02507c82de7dfd1d6ad069c5225c8c2957c9258f57f686b5fa845427d95cbb350bf4bb151ee13e5b4eaa8e900c17 SHA512 29c43d97598c647ac2754ed897411638f0141b60de590a53fc3f476cd1d627b270ecab29e16923b00757d8218d680c6b837070fa6899e4c770243bf71e86a09f AUX singular-4.0.3-gfan_linking.patch 705 BLAKE2B 9ec4dafad75885132d4f6bea65f945a5f6f383e39f3d375a70e12a86db983cc3d64e14b148db07c9577a46d2a8f534f43988d264fdb43dc61b247843af5f438d SHA512 4c2ab45f449f9c3d79165e1c9a0634fb08a9cd34dbc898e0e172409f6914ccd6e1c4e1719ccf0b36e591b4840e8cba08576ac1b57fadd08f8344b45e1af40d89 AUX singular-4.1.3-doc_install.patch 2834 BLAKE2B d8e35169534ed9087fc1faf6029a111819d2198d5fa61134ba083920604f93a346e6f274da02361b0c03ba05fea2c4f1b23fe2af8a46d8e6705cf4ccd025751a SHA512 36d3b6f2d90479ae508c7771d4fd7724ada5f5102ece78c4d5bc113c23848973706f19a9e1467de322ecee29712dc1d915f41b491bef23529a43380ff69d84ef +AUX singular-4.2.0-doc_install.patch 3390 BLAKE2B 753101890dadfdbd5c0e53a7e2c94572a02d43f0370f861ea164b4db38daf010ec30c8b939f030998f3b18e49f397b4a379991ad91f9edc83c26bc06354fe53f SHA512 8a6e95ca94faada5b9d4c568e1e2f2fa67ff34b514eba7c9d9f8b0701a1e1eb56d26d7740818149f534b28e6c98c08205d429297efaa905549def320573c7a26 +AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5 -DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25 -DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d -DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025 SHA512 5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a -DIST singular-4.0.3.tar.gz 12615042 BLAKE2B b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d SHA512 781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8 -EBUILD singular-4.0.2.ebuild 3564 BLAKE2B b24e5fe11a2b8d3b400663c5950f9a7d9342db159c53c0ff9a703f1c9ee929d15d7ebde73a4ee303dba99f4d181b118b37c1a3529e8dcd410e98a3296ab2ae4f SHA512 ef838c4b4ed39e442ec90eafa0783a9b2d8526d2da37eeae89050a0c6507f7d813dfbe07a2ebd092fd097573c6607415d8a21dfa044573f3bad79919c15b425b -EBUILD singular-4.0.3.ebuild 2499 BLAKE2B 5d17c7d35ec1ba6073e7d4703134fe96b4f8d59ae34922947dbc0f8f2aa6ddf52535e766aa62b1f66be5ef92c9dab5b458f02266239f8ba1013920e59c73ae8b SHA512 bfb148756c9f381ccdd6e2374971c0e1e589e7739b473a86826a35d6e15e0d724fcb76cf672896dbf9f562f033d2752bdbe1bc8521cd276b1fc6358e0014ce90 -EBUILD singular-4.2.0_p1.ebuild 2261 BLAKE2B 5c3e9208ffc6bbe2e0e1be3ef26a2ac30c2b859630d9354a219575517293ca74608cdadeee539544c308ff4e495d778eb4b985449e04167df8d833ba9e1da4a8 SHA512 f77fbffe6507710d11ad0081127c2a52918d4762d52aa7741e899106b54e233cd064c28d47b0b2865f4e162cdd31f65e712fa577a2cb35d270d23ce834b52a89 -MISC metadata.xml 389 BLAKE2B dcba16dd34ab572d58d76ea55f528ee1a4bb4c0c37ca272c9a11afdb8117f6982e5109a4a4783d1efc6cb31fe273f07bf79f720f178fea635af29574007c93f9 SHA512 3c5aea925276639c81a03a2a8d05ecaa48edac510f144d92e173402721dbc253638341ac8afdfbc17098ac35d2f4f47b41e5d56427c8ecaa788dc28fbb0977ae +DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f +EBUILD singular-4.2.0_p1.ebuild 2258 BLAKE2B d74e8ad0c98142364ff097e5e2d8585d01ba863021178d9c5206507c2318e71c0484bf620d77bae4927722395ef9b785d6e00be0d7d7bbd91086d71a2f54e143 SHA512 a9339d04e4beb91f440caede447bd565bf1576cab72b93e44ae39ce9be6ef26e294713b39526baa8c5ff68c867cbcddb9e87c42f19c27ca6e82786e4a5b2bf12 +EBUILD singular-4.2.0_p3.ebuild 2261 BLAKE2B 2e68d795ff1ce9984b01dd470b7715e561ba5dd32f5aefe812c4626aced0f2ac540615bfe20d7c5e2d933e91b02c3b764fdfd79e703e511a07dae4b283a480fa SHA512 19bc85354919eaafd0e244d423f44b6b4026e49a286df4613fcb2e55cade16568c5a9c4cad9890825de9bc7f0b8feac4bdaf280ac234ef767bd8c33ed07dab77 +MISC metadata.xml 275 BLAKE2B aaeef273b6352edaadf69ef76545573fbe0d22a6062f9567bcb34b1fdea4e2fb140b9aa0b4d8f44a3c3e31108f34eb555dded6f5808fac84fd29a83ef184da88 SHA512 e7e449f8bf039a1fc4707c0b12706d27b237fb3e7bee5e457bc79e032a04d7b9eb2901059b007350cc3617689638b76f97fbbd672e2d0101e2071448642415a7 diff --git a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch deleted file mode 100644 index 87b44234af5f..000000000000 --- a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac ---- singular-4.0.0.orig/omalloc/configure.ac 2014-03-06 18:07:49.000000000 +0100 -+++ singular-4.0.0/omalloc/configure.ac 2014-05-09 15:41:19.755097185 +0200 -@@ -117,7 +117,7 @@ - dnl check for programs - dnl - AC_CHECK_PROG(AR, ar, ar, :) --if test "$ac_cv_prog_AR" != ar; then -+if test "$ac_cv_prog_AR" = no; then - AC_MSG_ERROR(*** ar program not found) - fi - AC_CHECK_PROGS(PERL, perl, "no") diff --git a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch deleted file mode 100644 index d3e6b77a28e9..000000000000 --- a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc -index 41ce9b2..e32093d 100644 ---- a/factory/NTLconvert.cc -+++ b/factory/NTLconvert.cc -@@ -30,6 +30,7 @@ - #include <NTL/GF2EXFactoring.h> - #include <NTL/tools.h> - #include <NTL/mat_ZZ.h> -+#include <NTL/version.h> - #include "int_int.h" - #include <limits.h> - #include "NTLconvert.h" -@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a) - return CanonicalForm(coeff_long); - } - else -- { -- long sizeofrep= ((long *) a.rep) [1]; -+ { -+ const long * rep = -+#if NTL_MAJOR_VERSION <= 6 -+ static_cast<long *>( a.rep ); -+#else -+ static_cast<long *>( a.rep.rep ); // what about NTL7? -+#endif -+ long sizeofrep= rep[1]; - bool lessZero= false; - if (sizeofrep < 0) - { -@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a) - cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2; - cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l); - } -- int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep); -+ int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) ((rep) + 2), sizeofrep); - - char* cf_stringtemp2; - if (lessZero) diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch deleted file mode 100644 index caeed33f1fc3..000000000000 --- a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7eac42b467723a83a951218be53785411be3dbc4 Mon Sep 17 00:00:00 2001 -From: jgmbenoit <quatermaster@rezozer.net> -Date: Thu, 28 Apr 2016 05:47:53 +0000 -Subject: [PATCH] automake: install-data-local: missing DESTDIR prefix - ---- - Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 32778f7..24dd251 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -17,9 +17,9 @@ dist-hook: - $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version - - install-data-local: -- -cat ${top_srcdir}/doc/doc.tbz2| (cd $(datadir)/singular;tar jxf -) -- -mkdir $(datadir)/info -- -mv $(datadir)/singular/singular.hlp $(datadir)/info/. -+ -cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -) -+ -mkdir $(DESTDIR)$(datadir)/info -+ -mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/. - - configheaderdir = ${includedir}/singular - nodist_configheader_HEADERS = singularconfig.h diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch deleted file mode 100644 index bcda4ced6472..000000000000 --- a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch +++ /dev/null @@ -1,307 +0,0 @@ -From a3a6a07858b7e91c4c8a3c8d07e53957a8547af2 Mon Sep 17 00:00:00 2001 -From: Hans Schoenemann <hannes@mathematik.uni-kl.de> -Date: Thu, 1 Sep 2016 10:48:08 +0200 -Subject: [PATCH] change library name: libresources -> libsingular_resources - ---- - Singular/Makefile.am | 4 ++-- - autogen.sh | 1 + - factory/configure.ac | 8 ++++---- - gfanlib/configure.ac | 2 +- - libpolys/configure.ac | 8 ++++---- - m4/options.m4 | 10 +++++----- - resources/Makefile.am | 18 +++++++++--------- - resources/configure.ac | 6 +++--- - resources/feFopen.cc | 2 +- - resources/feResource.cc | 2 +- - resources/omFindExec.c | 2 +- - resources/resources.pc.in | 17 ----------------- - resources/singular_resources.pc.in | 17 +++++++++++++++++ - 13 files changed, 49 insertions(+), 48 deletions(-) - delete mode 100644 resources/resources.pc.in - create mode 100644 resources/singular_resources.pc.in - -diff --git a/Singular/Makefile.am b/Singular/Makefile.am -index e2bcc23..be84a08 100644 ---- a/Singular/Makefile.am -+++ b/Singular/Makefile.am -@@ -176,7 +176,7 @@ ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO - # ESingular_LDFLAGS = -static ${AM_LDFLAGS} - ESingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \ - ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \ --${top_builddir}/resources/libresources.la -+${top_builddir}/resources/libsingular_resources.la - - - ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc -@@ -186,7 +186,7 @@ TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO - # TSingular_LDFLAGS = -static ${AM_LDFLAGS} - TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \ - ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \ --${top_builddir}/resources/libresources.la -+${top_builddir}/resources/libsingular_resources.la - - TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc - # utils.cc utils.h -diff --git a/autogen.sh b/autogen.sh -index d027997..0d09c08 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -4,6 +4,7 @@ cd `dirname "$0"` - - # -d --warnings=all - autoreconf -v -f -i -+find . -name configure -exec sed -i "s/-g -O2/-g/g" {} \; -print - - cd - - -diff --git a/factory/configure.ac b/factory/configure.ac -index 7ea255b..a9caf73 100644 ---- a/factory/configure.ac -+++ b/factory/configure.ac -@@ -120,10 +120,10 @@ AM_CONDITIONAL( - [WITH_PARSER_FOR_CANONICAL_FORM], - [test "x$enable_streamio" = xyes]) - --AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] ) --AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] ) -+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] ) -+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] ) - --AC_MSG_CHECKING(whether libresources should be used) -+AC_MSG_CHECKING(whether libsingular_resources should be used) - if test "x$with_Singular" = xyes; - then - AC_MSG_RESULT(yes) -@@ -134,7 +134,7 @@ then - AC_MSG_CHECKING([ RESOURCES_LIBS?..]) - AC_MSG_RESULT(${RESOURCES_LIBS:-unset}) - -- PKG_REQUIRE="$PKG_REQUIRE resources" -+ PKG_REQUIRE="$PKG_REQUIRE singular_resources" - AC_SUBST(PKG_REQUIRE) - else - AC_MSG_RESULT(no) -diff --git a/gfanlib/configure.ac b/gfanlib/configure.ac -index 015134c..d3d2cd7 100644 ---- a/gfanlib/configure.ac -+++ b/gfanlib/configure.ac -@@ -2,7 +2,7 @@ - # Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.63]) --AC_INIT([libgfan], [0.1], [ren@mathematik.uni-kl.de]) -+AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.de]) - AC_CONFIG_MACRO_DIR([../m4]) - AC_CONFIG_AUX_DIR([../build-aux]) - AC_CONFIG_SRCDIR([gfanlib.h]) -diff --git a/libpolys/configure.ac b/libpolys/configure.ac -index 049e44d..4b2f1ae 100644 ---- a/libpolys/configure.ac -+++ b/libpolys/configure.ac -@@ -90,10 +90,10 @@ SING_CHECK_OMALLOC() - - ENABLE_RESOURCES="yes" - --AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] ) --AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] ) -+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] ) -+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] ) - --AC_MSG_CHECKING(whether libresources should be used) -+AC_MSG_CHECKING(whether libsingular_resources should be used) - - if test "x$ENABLE_RESOURCES" = xyes; - then -@@ -105,7 +105,7 @@ then - AC_MSG_CHECKING([ RESOURCES_LIBS?..]) - AC_MSG_RESULT(${RESOURCES_LIBS:-unset}) - -- PKG_REQUIRE="$PKG_REQUIRE resources" -+ PKG_REQUIRE="$PKG_REQUIRE singular_resources" - AC_SUBST(PKG_REQUIRE) - else - AC_MSG_RESULT(no) -diff --git a/m4/options.m4 b/m4/options.m4 -index 31b86e4..066dc4d 100644 ---- a/m4/options.m4 -+++ b/m4/options.m4 -@@ -150,19 +150,19 @@ AC_DEFUN([SING_USE_OMALLOC], - - AC_DEFUN([SING_USE_RESOURCES], - [ -- AC_ARG_ENABLE(resources, -- [AS_HELP_STRING([--disable-resources], [do NOT use libresources within the factory])], -+ AC_ARG_ENABLE(singular_resources, -+ [AS_HELP_STRING([--disable-singular_resources], [do NOT use libsingular_resources within the factory])], - [if test "x$enableval" = "xyes"; then - ENABLE_RESOURCES=yes - fi], - ENABLE_RESOURCES=yes) - -- AC_MSG_CHECKING(whether to use libresources in factory and co.) -+ AC_MSG_CHECKING(whether to use libsingular_resources in factory and co.) - if test "x$ENABLE_RESOURCES" = xyes; then - AC_MSG_RESULT(yes) - RESOURCES_INCLUDES="-I$ac_abs_top_srcdir " - -- RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la" -+ RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la" - - AC_SUBST(RESOURCES_INCLUDES) - AC_SUBST(RESOURCES_LIBS) -@@ -171,7 +171,7 @@ AC_DEFUN([SING_USE_RESOURCES], - - ac_configure_args="$ac_configure_args $ENABLE_ARG" - -- PKG_REQUIRE="$PKG_REQUIRE resources" -+ PKG_REQUIRE="$PKG_REQUIRE singular_resources" - AC_SUBST(PKG_REQUIRE) - else - AC_MSG_RESULT(no) -diff --git a/resources/Makefile.am b/resources/Makefile.am -index fa69ccc..934175b 100644 ---- a/resources/Makefile.am -+++ b/resources/Makefile.am -@@ -1,24 +1,24 @@ - ACLOCAL_AMFLAGS = -I ../m4 - --libresources_LTLIBRARIES = libresources.la -+libsingular_resources_LTLIBRARIES = libsingular_resources.la - --libresourcesdir = $(libdir) -+libsingular_resourcesdir = $(libdir) - - - AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} - - - SOURCES = omFindExec.c feResource.cc feFopen.cc --libresources_la_SOURCES = $(SOURCES) -+libsingular_resources_la_SOURCES = $(SOURCES) - --libresources_la_LDFLAGS = -release ${PACKAGE_VERSION} -+libsingular_resources_la_LDFLAGS = -release ${PACKAGE_VERSION} - --libresources_includedir =$(includedir)/resources -+libsingular_resources_includedir =$(includedir)/resources - --libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h -+libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h - --nodist_libresources_include_HEADERS = resourcesconfig.h --DISTCLEANFILES = $(nodist_libresources_include_HEADERS) -+nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h -+DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS) - - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = resources.pc -+pkgconfig_DATA = singular_resources.pc -diff --git a/resources/configure.ac b/resources/configure.ac -index bc5f294..212a1d5 100644 ---- a/resources/configure.ac -+++ b/resources/configure.ac -@@ -1,4 +1,4 @@ --AC_INIT([resources], [4.0.3]) -+AC_INIT([singular_resources], [4.0.3]) - - AC_CONFIG_MACRO_DIR([../m4]) - AC_CONFIG_AUX_DIR([../build-aux]) -@@ -14,7 +14,7 @@ dnl Check if build env is sane - AM_SANITY_CHECK - - # Add pre'prefixed config --AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h]) -+AX_PREFIX_CONFIG_H([singular_resourcesconfig.h],[],[_config.h]) - - SING_RESET_FLAGS() - SING_CHECK_SET_ARGS() -@@ -70,5 +70,5 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir]) - AX_NORMALIZE_PATH([config_datadir],['/']) - AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir]) - --AC_CONFIG_FILES([resources.pc Makefile]) -+AC_CONFIG_FILES([singular_resources.pc Makefile]) - AC_OUTPUT -diff --git a/resources/feFopen.cc b/resources/feFopen.cc -index 98cfd44..10800a0 100644 ---- a/resources/feFopen.cc -+++ b/resources/feFopen.cc -@@ -1,4 +1,4 @@ --#include "resourcesconfig.h" -+#include "singular_resourcesconfig.h" - #include "feResource.h" - #include "feFopen.h" - -diff --git a/resources/feResource.cc b/resources/feResource.cc -index 49a6855..a3accf9 100644 ---- a/resources/feResource.cc -+++ b/resources/feResource.cc -@@ -5,7 +5,7 @@ - * ABSTRACT: management of resources - */ - --#include "resourcesconfig.h" -+#include "singular_resourcesconfig.h" - #include "feResource.h" - #include "omFindExec.h" - -diff --git a/resources/omFindExec.c b/resources/omFindExec.c -index e79f2c8..1d5852a 100644 ---- a/resources/omFindExec.c -+++ b/resources/omFindExec.c -@@ -6,7 +6,7 @@ - *******************************************************************/ - - --#include "resourcesconfig.h" -+#include "singular_resourcesconfig.h" - - - #if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS) -diff --git a/resources/resources.pc.in b/resources/resources.pc.in -deleted file mode 100644 -index d040056..0000000 ---- a/resources/resources.pc.in -+++ /dev/null -@@ -1,17 +0,0 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -- --Name: @PACKAGE@ --Description: The Singular resources manager --Version: @PACKAGE_VERSION@ --URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@ -- --# Requires: --# Conflicts: -- --Cflags: -I${includedir} @SINGULAR_CFLAGS@ --Libs: -L${libdir} -l@PACKAGE@ --# Libs.private: -- -diff --git a/resources/singular_resources.pc.in b/resources/singular_resources.pc.in -new file mode 100644 -index 0000000..d040056 ---- /dev/null -+++ b/resources/singular_resources.pc.in -@@ -0,0 +1,17 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE@ -+Description: The Singular resources manager -+Version: @PACKAGE_VERSION@ -+URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@ -+ -+# Requires: -+# Conflicts: -+ -+Cflags: -I${includedir} @SINGULAR_CFLAGS@ -+Libs: -L${libdir} -l@PACKAGE@ -+# Libs.private: -+ diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch new file mode 100644 index 000000000000..b0656d9fb676 --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch @@ -0,0 +1,79 @@ +From 74ec250d3d89d0125c409b3340aca50a00b067ad Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sun, 30 May 2021 08:28:41 -0400 +Subject: [PATCH 3/3] autotools: support docdir and htmldir. + +Instead of hard-coding the "doc" and "html" subdirectories, +allow them to be ./configured. +--- + Makefile.am | 8 ++++---- + configure.ac | 5 +++++ + resources/configure.ac | 4 ++++ + resources/feResource.cc | 2 +- + 4 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fbea51d..c5d78a7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,10 +16,10 @@ bin_SCRIPTS = libsingular-config + + install-data-local: + if test -e $(srcdir)/doc/doc.tbz2; then\ +- (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\ +- mkdir $(DESTDIR)$(datadir)/info;\ +- mkdir $(DESTDIR)$(datadir)/doc;\ +- mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.;\ ++ mkdir -p $(DESTDIR)$(docdir);\ ++ (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx --no-same-owner -f -));\ ++ mv $(DESTDIR)$(docdir)/singular.hlp $(DESTDIR)$(datadir)/info/.;\ ++ @INSTALL_DATA@ doc/singular.idx $(DESTDIR)$(datadir)/singular/.;\ + fi + + uninstall-local: +diff --git a/configure.ac b/configure.ac +index 490a45f..997db6c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/']) + AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir]) + AC_SUBST(DATA_DIR, "$config_datadir") + ++AX_RECURSIVE_EVAL([[$]docdir], [config_docdir]) ++AX_NORMALIZE_PATH([config_docdir],['/']) ++AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir]) ++AC_SUBST(DOC_DIR, "$config_docdir") ++ + SING_SHOW_FLAGS([Compiler/linker flags: ]) + + +diff --git a/resources/configure.ac b/resources/configure.ac +index 0dc468f..da68144 100644 +--- a/resources/configure.ac ++++ b/resources/configure.ac +@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir]) + AX_NORMALIZE_PATH([config_datadir],['/']) + AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir]) + ++AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir]) ++AX_NORMALIZE_PATH([config_htmldir],['/']) ++AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir]) ++ + AC_CONFIG_FILES([singular_resources.pc Makefile]) + AC_OUTPUT +diff --git a/resources/feResource.cc b/resources/feResource.cc +index 3d75bc9..7e4fc8c 100644 +--- a/resources/feResource.cc ++++ b/resources/feResource.cc +@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] = + {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""}, + {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%D/info/singular.hlp", (char *)""}, + {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%D/singular/singular.idx", (char *)""}, +- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%D/singular/html", (char *)""}, ++ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", HTML_DIR, (char *)""}, + {"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "https://www.singular.uni-kl.de/Manual/", (char *)""}, + {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", (char *)""}, + {"Path", 'p', feResPath, NULL, "%b;%P;$PATH", (char *)""}, +-- +2.31.1 + diff --git a/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch new file mode 100644 index 000000000000..267bf19361ad --- /dev/null +++ b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch @@ -0,0 +1,38 @@ +From 705149b86a80dd8b53fa8c1717872e9b2e9dbbcb Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sun, 30 May 2021 08:10:10 -0400 +Subject: [PATCH 1/3] gfanlib/Makefile.am: use LIBADD for additional libraries. + +The $GMP_LIBS and $CDDGMPLDFLAGS variables were being added to +libgfan_la_LDFLAGS, which isn't quite correct. Since both contain +library (-l) flags, they belong in _LIBADD rather than _LDFLAGS: + + https://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html + +This commit moves them to a new libgfan_la_LIBADD variable. +--- + gfanlib/Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am +index cec8d8f..96e1893 100644 +--- a/gfanlib/Makefile.am ++++ b/gfanlib/Makefile.am +@@ -18,9 +18,13 @@ AM_CXXFLAGS = @CXX11_FLAG@ + + SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp + libgfan_la_SOURCES = $(SOURCES) +-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS) ++libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) + libgfan_la_CPPFLAGS= $(GMP_CPPFLAGS) $(CDDGMPCPPFLAGS) + ++# Despite the naming convention, $CDDGMPLDFLAGS contains "-lcddgmp" ++# and the rest of the $GMP_LIBS flags. ++libgfan_la_LIBADD = $(CDDGMPLDFLAGS) $(GMP_LIBS) ++ + noinst_HEADERS = config.h gfanlib_mixedvolume.h gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h _config.h gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h gfanlib_zfan.h + + DISTCLEANFILES = config.h +-- +2.31.1 + diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml index faab92efd936..d17eda6d58f4 100644 --- a/sci-mathematics/singular/metadata.xml +++ b/sci-mathematics/singular/metadata.xml @@ -5,7 +5,4 @@ <email>sci-mathematics@gentoo.org</email> <name>Gentoo Mathematics Project</name> </maintainer> - <use> - <flag name="boost">Compile against external boost headers (<pkg>dev-libs/boost</pkg>)</flag> - </use> </pkgmetadata> diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild deleted file mode 100644 index c66500337100..000000000000 --- a/sci-mathematics/singular/singular-4.0.2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools epatch elisp-common flag-o-matic toolchain-funcs versionator - -MY_PN=Singular -MY_PV=$(replace_all_version_separators '.') -# Consistency is different... -MY_DIR2=$(get_version_component_range 1-3 ${PV}) -MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2}) -# This is where the share tarball unpacks to -MY_SHARE_DIR="${WORKDIR}"/share/ - -DESCRIPTION="Computer algebra system for polynomial computations" -HOMEPAGE="https://www.singular.uni-kl.de/" -SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz - https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-linux" -IUSE="boost doc emacs examples python +readline" - -RDEPEND="dev-libs/gmp:0 - >=dev-libs/ntl-5.5.1 - emacs? ( >=app-editors/emacs-23.1:* ) - sci-mathematics/flint - sci-mathematics/4ti2 - sci-libs/cddlib" - -DEPEND="${RDEPEND} - dev-lang/perl - boost? ( dev-libs/boost ) - readline? ( sys-libs/readline )" - -SITEFILE=60${PN}-gentoo.el - -S="${WORKDIR}/${PN}-${MY_DIR2}" - -pkg_setup() { - append-flags "-fPIC" - append-ldflags "-fPIC" - tc-export AR CC CPP CXX -} - -src_prepare() { - # Need to do something about resources later... - # epatch "${FILESDIR}"/${PN}-4.0.0-gentoo.patch - - # omalloc's old configure will fail if ar is not exactly 'ar'. - epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch - - epatch "${FILESDIR}"/${PN}-4.0.2-ntl8-compat.patch - - # autoreconf everything since otherwise it assumes autmake-1.13 is installed - eautoreconf -} - -src_configure() { - econf --with-gmp \ - --with-ntl \ - --with-flint \ - --enable-gfanlib \ - --disable-debug \ - --disable-doc \ - --enable-factory \ - --enable-libfac \ - --enable-IntegerProgramming \ - $(use_with python python embed) \ - $(use_with boost Boost) \ - $(use_enable emacs) \ - $(use_with readline) || die "configure failed" -} - -src_compile() { - emake - - if use emacs; then - cd "${MY_SHARE_DIR}"singular/emacs/ - elisp-compile *.el || die "elisp-compile failed" - fi -} - -# src_install() { -# dodoc README -# # execs and libraries -# cd "${S}"/build/bin -# dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL -# insinto /usr/$(get_libdir)/${PN} -# doins *.so -# -# dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} -# -# # stuff from the share tar ball -# cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR} -# insinto /usr/share/${PN} -# doins -r LIB -# if use examples; then -# insinto /usr/share/doc/${PF} -# doins -r examples -# fi -# if use doc; then -# dohtml -r html/* -# insinto /usr/share/${PN} -# doins doc/singular.idx -# cp info/${PN}.hlp info/${PN}.info && -# doinfo info/${PN}.info \ -# || die "failed to install info files" -# fi -# if use emacs; then -# elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \ -# || die "elisp-install failed" -# elisp-site-file-install "${FILESDIR}/${SITEFILE}" -# fi -# } - -pkg_postinst() { - einfo "The authors ask you to register as a SINGULAR user." - einfo "Please check the license file for details." - - if use emacs; then - echo - ewarn "Please note that the ESingular emacs wrapper has been" - ewarn "removed in favor of full fledged singular support within" - ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs" - ewarn "and you should be good to go! See bug #193411 for more info." - echo - fi - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild deleted file mode 100644 index 3a0712e9be7f..000000000000 --- a/sci-mathematics/singular/singular-4.0.3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common flag-o-matic multilib prefix toolchain-funcs versionator - -MY_PN=Singular -MY_PV=$(replace_all_version_separators '.') -# Consistency is different... -MY_DIR2=$(get_version_component_range 1-3 ${PV}) -MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2}) -# This is where the share tarball unpacks to - -DESCRIPTION="Computer algebra system for polynomial computations" -HOMEPAGE="https://www.singular.uni-kl.de/" -SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz - https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux" -IUSE="boost doc emacs examples python +readline" - -RDEPEND="dev-libs/gmp:0 - >=dev-libs/ntl-5.5.1 - emacs? ( >=app-editors/emacs-23.1:* ) - sci-mathematics/flint - sci-mathematics/4ti2 - sci-libs/cddlib" - -DEPEND="${RDEPEND} - dev-lang/perl - boost? ( dev-libs/boost ) - readline? ( sys-libs/readline )" - -SITEFILE=60${PN}-gentoo.el - -S="${WORKDIR}/${PN}-${MY_DIR2}" - -pkg_setup() { - append-flags "-fPIC" - append-ldflags "-fPIC" - tc-export AR CC CPP CXX -} - -src_prepare() { - eapply "${FILESDIR}"/"${P}"-fix-resources-name.patch - eapply "${FILESDIR}"/"${P}"-fix-destdir.patch - eapply_user - # autoreconf everything since otherwise it assumes autmake-1.13 is installed - eautoreconf -} - -src_configure() { - econf --with-gmp \ - --with-ntl \ - --with-flint \ - --enable-gfanlib \ - --disable-debug \ - --disable-doc \ - --enable-factory \ - --enable-libfac \ - --enable-IntegerProgramming \ - $(use_with python python embed) \ - $(use_with boost Boost) \ - $(use_enable emacs) \ - $(use_with readline) || die "configure failed" -} - -src_compile() { - emake - - if use emacs; then - cd "${S}"/emacs/ - elisp-compile *.el || die "elisp-compile failed" - fi -} - -pkg_postinst() { - einfo "The authors ask you to register as a SINGULAR user." - einfo "Please check the license file for details." - - if use emacs; then - echo - ewarn "Please note that the ESingular emacs wrapper has been" - ewarn "removed in favor of full fledged singular support within" - ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs" - ewarn "and you should be good to go! See bug #193411 for more info." - echo - fi - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/singular/singular-4.2.0_p1.ebuild b/sci-mathematics/singular/singular-4.2.0_p1.ebuild index b015ba5fee61..47a82d1c8fae 100644 --- a/sci-mathematics/singular/singular-4.2.0_p1.ebuild +++ b/sci-mathematics/singular/singular-4.2.0_p1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN LICENSE="BSD GPL-2 GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux" +KEYWORDS="amd64 ppc x86 ~x86-linux" IUSE="emacs examples +readline static-libs" RDEPEND="dev-libs/gmp:0 diff --git a/sci-mathematics/singular/singular-4.2.0_p3.ebuild b/sci-mathematics/singular/singular-4.2.0_p3.ebuild new file mode 100644 index 000000000000..df77bad38d57 --- /dev/null +++ b/sci-mathematics/singular/singular-4.2.0_p3.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools elisp-common + +MY_PN=Singular +MY_PV=$(ver_rs 3 '') +# Consistency is different... +MY_DIR2=$(ver_cut 1-3 ${PV}) +MY_DIR=$(ver_rs 1- '-' ${MY_DIR2}) + +DESCRIPTION="Computer algebra system for polynomial computations" +HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Sources" +SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz" + +LICENSE="BSD GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux" +IUSE="emacs examples +readline static-libs" + +RDEPEND="dev-libs/gmp:0 + dev-libs/ntl:= + emacs? ( >=app-editors/emacs-23.1:* ) + sci-mathematics/flint + sci-libs/cddlib + dev-lang/perl + readline? ( sys-libs/readline )" + +DEPEND="${RDEPEND}" + +SITEFILE=60${PN}-gentoo.el + +S="${WORKDIR}/${PN}-${MY_DIR2}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.0-gfan_linking.patch" + "${FILESDIR}/${PN}-4.2.0-doc_install.patch" + "${FILESDIR}/${PN}-4.2.0-no-static.patch" +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf --with-gmp \ + --with-ntl="${EPREFIX}"/usr \ + --with-flint \ + --enable-gfanlib \ + --disable-debug \ + --disable-doc \ + --enable-factory \ + --enable-libfac \ + --enable-IntegerProgramming \ + --disable-polymake \ + $(use_enable static-libs static) \ + $(use_enable emacs) \ + $(use_with readline) +} + +src_compile() { + default + + if use emacs; then + pushd "${S}"/emacs + elisp-compile *.el || die "elisp-compile failed" + popd + fi +} + +src_install() { + # Do not compress singular's info file (singular.hlp) + # some consumer of that file do not know how to deal with compression + docompress -x /usr/share/info + + default + + dosym Singular /usr/bin/"${PN}" + + # purge .la file + find "${ED}" -name '*.la' -delete || die +} + +src_test() { + # SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from + # an already installed version of singular may be used and cause segfault + # See https://github.com/Singular/Sources/issues/980 + SINGULAR_PROCS_DIR="" emake check +} + +pkg_postinst() { + einfo "Additional functionality can be enabled by installing" + einfo "sci-mathematics/4ti2" + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |