[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-12-18 Thread Antonio Rojas via arch-commits
Date: Friday, December 18, 2020 @ 10:59:05
  Author: arojas
Revision: 778474

flint 2.7 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-18 10:56:47 UTC (rev 778473)
+++ PKGBUILD2020-12-18 10:59:05 UTC (rev 778474)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-12-15 Thread Antonio Rojas via arch-commits
Date: Wednesday, December 16, 2020 @ 06:56:51
  Author: arojas
Revision: 776343

polymake 4.3 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-15 23:27:28 UTC (rev 776342)
+++ PKGBUILD2020-12-16 06:56:51 UTC (rev 776343)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-12-07 Thread Antonio Rojas via arch-commits
Date: Monday, December 7, 2020 @ 10:08:21
  Author: arojas
Revision: 771461

Remove more leftover crap (FS#68877)

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-07 10:04:43 UTC (rev 771460)
+++ PKGBUILD2020-12-07 10:08:21 UTC (rev 771461)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -151,5 +151,8 @@
 # remove leftover binaries and source files
   find "$pkgdir"/usr/lib/gap/pkg -name .libs -o -name '*.o' | xargs rm -fr
   find "$pkgdir"/usr/lib/gap/pkg -type d -name src | xargs rm -fr
-  rm -fr "$pkgdir"/usr/lib/gap/pkg/log
+  rm -r "$pkgdir"/usr/lib/gap/pkg/digraphs*/extern
+  rm -r "$pkgdir"/usr/lib/gap/pkg/semigroups*/libsemigroups
+  rm -r 
"$pkgdir"/usr/lib/gap/pkg/NormalizInterface/{.git*,.release,.c*,.t*,autom4te.cache}
+  rm -r "$pkgdir"/usr/lib/gap/pkg/log
 }


[arch-commits] Commit in gap/trunk (PKGBUILD gap-libsemigroups-1.3.4.patch)

2020-12-05 Thread Antonio Rojas via arch-commits
Date: Saturday, December 5, 2020 @ 11:34:18
  Author: arojas
Revision: 770495

fplll 5.4 rebuild, fix build of semigroups package with libsemigroups 1.3.4

Added:
  gap/trunk/gap-libsemigroups-1.3.4.patch
Modified:
  gap/trunk/PKGBUILD

---+
 PKGBUILD  |9 +-
 gap-libsemigroups-1.3.4.patch |  141 
 2 files changed, 147 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-05 10:51:15 UTC (rev 770494)
+++ PKGBUILD2020-12-05 11:34:18 UTC (rev 770495)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -15,7 +15,8 @@
  gap-polymake-4.0.patch
  gap-cddlib-0.94k.patch
  gap-normaliz-3.8.8.patch
- gap-libsemigroups-1.3.patch)
+ gap-libsemigroups-1.3.patch
+ gap-libsemigroups-1.3.4.patch)
 sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
 'SKIP'
@@ -22,7 +23,8 @@
 'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685'
 '151ddbd7cf234158c8bd79153ac0ded3076f103859a65b238dd5c86084be3d98'
 '4023aaf1617d653f84d711d5642485984395a01464d64ded0a7e884c48b2a332'
-'c69c35293c194528a0ba533d3bae93208cc6a6bed9ffab2c2ebdb1c6d444')
+'c69c35293c194528a0ba533d3bae93208cc6a6bed9ffab2c2ebdb1c6d444'
+'e4024342332fd583967b2797627dfae61eb6ebcb5b73baced1e2a464be4d679b')
 makedepends=(libxaw givaro mpfi normaliz polymake boost libsemigroups c-xsc 
zeromq fplll wget chrpath fmt git)
 
 prepare() {
@@ -42,6 +44,7 @@
 
   cd pkg/semigroups-* 
   patch -p1 -i "$srcdir"/gap-libsemigroups-1.3.patch # Fix build with 
libsemigroups 1.3
+  patch -p1 -i "$srcdir"/gap-libsemigroups-1.3.4.patch # Fix build with 
libsemigroups 1.3.4
 
   cd ../PolymakeInterface-*
   patch -p2 -i "$srcdir"/gap-polymake-4.0.patch # Fix build with polymake 4.0

Added: gap-libsemigroups-1.3.4.patch
===
--- gap-libsemigroups-1.3.4.patch   (rev 0)
+++ gap-libsemigroups-1.3.4.patch   2020-12-05 11:34:18 UTC (rev 770495)
@@ -0,0 +1,141 @@
+diff --git a/src/pkg.cc b/src/pkg.cc
+index 31987a1c..cd94e0d9 100644
+--- a/src/pkg.cc
 b/src/pkg.cc
+@@ -35,10 +35,10 @@
+ #include "libsemigroups/blocks.hpp"
+ #include "libsemigroups/cong.hpp"
+ #include "libsemigroups/froidure-pin.hpp"
+-#include "libsemigroups/uf.hpp"
++#include "libsemigroups/uf-old.hpp"
+ 
+ using libsemigroups::Congruence;
+-using libsemigroups::detail::UF;
++using libsemigroups::detail::UFOld;
+ 
+ #if !defined(SIZEOF_VOID_P)
+ #error Something is wrong with this GAP installation: SIZEOF_VOID_P not 
defined
+@@ -102,7 +102,7 @@ void TSemiObjFreeFunc(Obj o) {
+   SEMIGROUPS_ASSERT(TNUM_OBJ(o) == T_SEMI);
+   switch (SUBTYPE_OF_T_SEMI(o)) {
+ case T_SEMI_SUBTYPE_UF: {
+-  delete CLASS_OBJ(o);
++  delete CLASS_OBJ(o);
+   break;
+ }
+ case T_SEMI_SUBTYPE_CONG: {
+@@ -157,7 +157,7 @@ void TSemiObjSaveFunc(Obj o) {
+ 
+   switch (SUBTYPE_OF_T_SEMI(o)) {
+ case T_SEMI_SUBTYPE_UF: {
+-  UF* uf = CLASS_OBJ(o);
++  UFOld* uf = CLASS_OBJ(o);
+   SaveUInt(uf->get_size());
+   for (size_t i = 0; i < uf->get_size(); i++) {
+ SaveUInt(uf->find(i));
+@@ -196,7 +196,7 @@ void TSemiObjLoadFunc(Obj o) {
+   for (size_t i = 0; i < size; i++) {
+ table->push_back(LoadUInt());
+   }
+-  ADDR_OBJ(o)[1] = reinterpret_cast(new UF(*table));
++  ADDR_OBJ(o)[1] = reinterpret_cast(new UFOld(*table));
+   break;
+ }
+ case T_SEMI_SUBTYPE_CONG: {
+diff --git a/src/uf.cc b/src/uf.cc
+index b7fd7c96..7fa34162 100644
+--- a/src/uf.cc
 b/src/uf.cc
+@@ -26,28 +26,28 @@
+ #include "semigroups-debug.h"
+ #include "src/compiled.h"
+ 
+-#include "libsemigroups/uf.hpp"
++#include "libsemigroups/uf-old.hpp"
+ 
+-using libsemigroups::detail::UF;
++using libsemigroups::detail::UFOld;
+ 
+ // GAP level functions
+ 
+ Obj UF_NEW(Obj self, Obj size) {
+   SEMIGROUPS_ASSERT(IS_INTOBJ(size) && INT_INTOBJ(size) > 0);
+-  return OBJ_CLASS(new UF(INT_INTOBJ(size)), T_SEMI_SUBTYPE_UF);
++  return OBJ_CLASS(new UFOld(INT_INTOBJ(size)), T_SEMI_SUBTYPE_UF);
+ }
+ 
+ Obj UF_COPY(Obj self, Obj uf) {
+-  return OBJ_CLASS(new UF(*CLASS_OBJ(uf)), T_SEMI_SUBTYPE_UF);
++  return OBJ_CLASS(new UFOld(*CLASS_OBJ(uf)), T_SEMI_SUBTYPE_UF);
+ }
+ 
+ Obj UF_SIZE(Obj self, Obj uf) {
+-  return INTOBJ_INT(CLASS_OBJ(uf)->get_size());
++  return INTOBJ_INT(CLASS_OBJ(uf)->get_size());
+ }
+ 
+ Obj UF_FIND(Obj self, Obj uf, Obj i) {
+   SEMIGROUPS_ASSERT(IS_INTOBJ(i) && I

[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-10-14 Thread Eli Schwartz via arch-commits
Date: Thursday, October 15, 2020 @ 03:52:55
  Author: eschwartz
Revision: 724047

fix checksums to go with previous commit

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-15 03:52:11 UTC (rev 724046)
+++ PKGBUILD2020-10-15 03:52:55 UTC (rev 724047)
@@ -19,7 +19,6 @@
 sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
 'SKIP'
-'SKIP'
 'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685'
 '151ddbd7cf234158c8bd79153ac0ded3076f103859a65b238dd5c86084be3d98'
 '4023aaf1617d653f84d711d5642485984395a01464d64ded0a7e884c48b2a332'


[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-09-19 Thread Antonio Rojas via arch-commits
Date: Saturday, September 19, 2020 @ 13:20:35
  Author: arojas
Revision: 710874

Remove unused source

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-19 13:18:48 UTC (rev 710873)
+++ PKGBUILD2020-09-19 13:20:35 UTC (rev 710874)
@@ -12,7 +12,6 @@
 license=(GPL)
 
source=("https://files.gap-system.org/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
  git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
- git+https://github.com/gap-packages/Semigroups#commit=ff2fb291
  gap-polymake-4.0.patch
  gap-cddlib-0.94k.patch
  gap-normaliz-3.8.8.patch


[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-06-15 Thread Antonio Rojas via arch-commits
Date: Monday, June 15, 2020 @ 16:32:31
  Author: arojas
Revision: 645319

polymake 4.1 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-15 16:32:31 UTC (rev 645318)
+++ PKGBUILD2020-06-15 16:32:31 UTC (rev 645319)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-06-05 Thread Antonio Rojas via arch-commits
Date: Friday, June 5, 2020 @ 19:26:29
  Author: arojas
Revision: 639188

flint 2.6 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-05 18:55:06 UTC (rev 639187)
+++ PKGBUILD2020-06-05 19:26:29 UTC (rev 639188)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -53,6 +53,7 @@
   libtool --mode=install install libgap.la "$srcdir"/gap-$pkgver/tmp-install
 
   cd pkg
+  export CFLAGS+=" -fcommon" # Fix anupq and cohomolo build with GCC 10
   export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
   export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install -lgap" # See 
https://trac.sagemath.org/ticket/27372
   export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install


[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-04-19 Thread Antonio Rojas via arch-commits
Date: Sunday, April 19, 2020 @ 09:11:39
  Author: arojas
Revision: 616452

Update source URL, compile anupq package, fix xgap launcher script

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-19 08:56:54 UTC (rev 616451)
+++ PKGBUILD2020-04-19 09:11:39 UTC (rev 616452)
@@ -5,12 +5,12 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
+source=("https://files.gap-system.org/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
  git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
  gap-polymake-4.0.patch)
 sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
@@ -26,8 +26,6 @@
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
 # Use system libsemigroups
   sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i 
pkg/semigroups-*/configure
-# Disable anupq package, it's i686 only
-  rm -r pkg/anupq-*
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata-*/PackageInfo.g
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
@@ -115,7 +113,7 @@
   cp -r pkg "$pkgdir"/usr/lib/gap
 
 # fix xgap launch script
-  sed -e 's|/build/gap/src/gap-4.10.2|/usr/lib/gap|g' -e 
's|^GAP=.*|GAP=/usr/lib/gap/gap|g' \
+  sed -e "s|/build/gap/src/gap-$pkgver|/usr/lib/gap|g" -e 
's|^GAP=.*|GAP=/usr/lib/gap/gap|g' \
 "$pkgdir"/usr/lib/gap/pkg/xgap-*/xgap.sh > "$pkgdir"/usr/bin/xgap
   chmod 755 "$pkgdir"/usr/bin/xgap
   rm "$pkgdir"/usr/lib/gap/pkg/xgap-*/xgap.sh*


[arch-commits] Commit in gap/trunk (PKGBUILD normalizinterface-missing-include.patch)

2020-03-26 Thread Antonio Rojas via arch-commits
Date: Thursday, March 26, 2020 @ 18:18:19
  Author: arojas
Revision: 604487

Drop no longer needed patch

Modified:
  gap/trunk/PKGBUILD
Deleted:
  gap/trunk/normalizinterface-missing-include.patch

-+
 PKGBUILD|6 +-
 normalizinterface-missing-include.patch |   12 
 2 files changed, 1 insertion(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-26 16:44:33 UTC (rev 604486)
+++ PKGBUILD2020-03-26 18:18:19 UTC (rev 604487)
@@ -12,12 +12,10 @@
 license=(GPL)
 
source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
  git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
- normalizinterface-missing-include.patch
  gap-polymake-4.0.patch)
 sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
 'SKIP'
-'2410dfc69f1f4d2f320e91590d55e59c7b557637f9f60b9e609b318cfc21c181'
 'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685')
 makedepends=(libxaw givaro mpfi normaliz polymake boost libsemigroups c-xsc 
zeromq fplll wget chrpath fmt git)
 
@@ -37,10 +35,8 @@
 # Update NormalizInterface to support recent normaliz
   rm -r pkg/NormalizInterface-1.1.0
   cp -r ../NormalizInterface pkg
-  cd pkg/NormalizInterface
-  patch -p1 -i "$srcdir"/normalizinterface-missing-include.patch
 
-  cd ../PolymakeInterface-*
+  cd pkg/PolymakeInterface-*
   patch -p2 -i "$srcdir"/gap-polymake-4.0.patch # Fix build with polymake 4.0
 }
 

Deleted: normalizinterface-missing-include.patch
===
--- normalizinterface-missing-include.patch 2020-03-26 16:44:33 UTC (rev 
604486)
+++ normalizinterface-missing-include.patch 2020-03-26 18:18:19 UTC (rev 
604487)
@@ -1,12 +0,0 @@
-diff --git a/src/normaliz.cc b/src/normaliz.cc
-index a2ef45d..9768988 100644
 a/src/normaliz.cc
-+++ b/src/normaliz.cc
-@@ -27,6 +27,7 @@
- 
- #include "libnormaliz/cone.h"
- #include "libnormaliz/map_operations.h"
-+#include "libnormaliz/dynamic_bitset.h"
- 
- #include 
- 


[arch-commits] Commit in gap/trunk (PKGBUILD libsemigroups-1.0.patch)

2020-03-06 Thread Antonio Rojas via arch-commits
Date: Friday, March 6, 2020 @ 14:36:34
  Author: arojas
Revision: 590993

Update to 4.11.0

Modified:
  gap/trunk/PKGBUILD
Deleted:
  gap/trunk/libsemigroups-1.0.patch

-+
 PKGBUILD|   12 
 libsemigroups-1.0.patch | 2244 --
 2 files changed, 4 insertions(+), 2252 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-06 14:09:18 UTC (rev 590992)
+++ PKGBUILD2020-03-06 14:36:34 UTC (rev 590993)
@@ -4,20 +4,18 @@
 
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
-pkgver=4.10.2
-pkgrel=11
+pkgver=4.11.0
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
 
source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
- libsemigroups-1.0.patch
  git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
  normalizinterface-missing-include.patch
  gap-polymake-4.0.patch)
-sha256sums=('11175bed0234101643d510d4ab94c44db30bd303bfe63d86b9b86ae67cff9e49'
+sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
-'ccd95de4f48d26b73d6df7c1847855f68ee70644d130d32f14213988c3e286e3'
 'SKIP'
 '2410dfc69f1f4d2f320e91590d55e59c7b557637f9f60b9e609b318cfc21c181'
 'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685')
@@ -37,13 +35,11 @@
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
 
 # Update NormalizInterface to support recent normaliz
-  rm -r pkg/NormalizInterface-1.0.2
+  rm -r pkg/NormalizInterface-1.1.0
   cp -r ../NormalizInterface pkg
   cd pkg/NormalizInterface
   patch -p1 -i "$srcdir"/normalizinterface-missing-include.patch
 
-  cd ../semigroups-*
-  patch -p1 -i "$srcdir"/libsemigroups-1.0.patch # Fix build with 
libsemigroups 1.0
   cd ../PolymakeInterface-*
   patch -p2 -i "$srcdir"/gap-polymake-4.0.patch # Fix build with polymake 4.0
 }

Deleted: libsemigroups-1.0.patch
===
--- libsemigroups-1.0.patch 2020-03-06 14:09:18 UTC (rev 590992)
+++ libsemigroups-1.0.patch 2020-03-06 14:36:34 UTC (rev 590993)
@@ -1,2244 +0,0 @@
-From ff6e172a492af2465fd7465da64298353cc15cc5 Mon Sep 17 00:00:00 2001
-From: James Mitchell 
-Date: Wed, 2 May 2018 10:45:40 +0200
-Subject: [PATCH] Update for libsemigroups v1.0.0
-

- .LIBSEMIGROUPS_VERSION  |   2 +-
- Makefile.am |  16 +-
- gap/main/fropin.gi  |  19 ++-
- m4/ax_check_libsemigroup.m4 |   4 +-
- scripts/travis-test.sh  |  10 +-
- src/.clang-format   |  10 +-
- src/bipart.cc   | 133 
- src/bipart.h|   9 +-
- src/congpairs.cc| 235 ++--
- src/converter.cc|  21 ++-
- src/converter.h |  50 +++---
- src/fropin.cc   |  29 ++--
- src/pkg.cc  |  22 +--
- src/pkg.h   |   5 +-
- src/semigrp.cc  | 294 +++-
- src/semigrp.h   |  63 
- src/uf.cc   |   8 +-
- tst/standard/congfpmon.tst  |  17 +--
- 18 files changed, 484 insertions(+), 463 deletions(-)
-
-diff --git a/.LIBSEMIGROUPS_VERSION b/.LIBSEMIGROUPS_VERSION
-index 2228cad41..3eefcb9dd 100644
 a/.LIBSEMIGROUPS_VERSION
-+++ b/.LIBSEMIGROUPS_VERSION
-@@ -1 +1 @@
--0.6.7
-+1.0.0
-diff --git a/Makefile.am b/Makefile.am
-index b5ee5ea8b..6998d563e 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,7 @@ if WITH_INCLUDED_LIBSEMIGROUPS
-   # the following triggers "make install" on libsemigroups
-   # note that making it a concrete file prevents this target
-   # to be needlessly re-run if libsemigroups/ is not changed.
--  BUILT_SOURCES = bin/include/libsemigroups/blocks.h
-+  BUILT_SOURCES = bin/include/libsemigroups/libsemigroups.hpp
- endif
- 
- AM_CPPFLAGS = @LIBSEMIGROUPS_CFLAGS@
-@@ -28,6 +28,18 @@ semigroups_la_SOURCES += src/semigrp.cc
- semigroups_la_CXXFLAGS = $(GAP_CFLAGS) @LIBSEMIGROUPS_CFLAGS@ -std=gnu++11 
-O3 -g -march=native
- semigroups_la_CPPFLAGS = $(GAP_CPPFLAGS)  @LIBSEMIGROUPS_CFLAGS@
- semigroups_la_CFLAGS = $(GAP_CFLAGS)
-+
-+semigroups_la_CPPFLAGS += -I$(top_srcdir)/libsemigroups/extern/HPCombi/include
-+semigroups_la_CPPFLAGS += 
-I$(top_srcdir)/libsemigroups/extern/HPCombi/include/fallback
-+semigroups_la_CPPFLAGS += 
-I$(top_srcdir)/libsemigroups/extern/fmt-5.3.0/include
-+semigroups_la_CPPFLAGS += -DFMT_HEADER_ONLY
-+
-+if KERNEL_DEBUG
-+semigroups_la_CPPFLAGS += -DDEBUG
-+else
-+semigroups_la_CPPFLAGS += -DNDEBUG
-+endif
-+
- semigroups_la_LDFLAGS = $(GAP_LDFLAGS) -module -avoid-version
- 
- semigroups_la_LIBADD = @LIBSEMIGROUPS_LIBS@
-@@ -37,7 +49,7 @@ se

[arch-commits] Commit in gap/trunk (PKGBUILD gap-polymake-4.0.patch)

2020-01-29 Thread Antonio Rojas via arch-commits
Date: Wednesday, January 29, 2020 @ 22:35:33
  Author: arojas
Revision: 559222

polymake 4.0 rebuild

Added:
  gap/trunk/gap-polymake-4.0.patch
Modified:
  gap/trunk/PKGBUILD

+
 PKGBUILD   |   14 -
 gap-polymake-4.0.patch |  450 +++
 2 files changed, 459 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-29 22:31:00 UTC (rev 559221)
+++ PKGBUILD2020-01-29 22:35:33 UTC (rev 559222)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=10
+pkgrel=11
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -13,13 +13,15 @@
 
source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
  libsemigroups-1.0.patch
  git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
- normalizinterface-missing-include.patch)
+ normalizinterface-missing-include.patch
+ gap-polymake-4.0.patch)
 sha256sums=('11175bed0234101643d510d4ab94c44db30bd303bfe63d86b9b86ae67cff9e49'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
 'ccd95de4f48d26b73d6df7c1847855f68ee70644d130d32f14213988c3e286e3'
 'SKIP'
-'2410dfc69f1f4d2f320e91590d55e59c7b557637f9f60b9e609b318cfc21c181')
-makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq 
fplll polymake wget chrpath fmt git)
+'2410dfc69f1f4d2f320e91590d55e59c7b557637f9f60b9e609b318cfc21c181'
+'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685')
+makedepends=(libxaw givaro mpfi normaliz polymake boost libsemigroups c-xsc 
zeromq fplll wget chrpath fmt git)
 
 prepare() {
   cd gap-$pkgver
@@ -42,6 +44,8 @@
 
   cd ../semigroups-*
   patch -p1 -i "$srcdir"/libsemigroups-1.0.patch # Fix build with 
libsemigroups 1.0
+  cd ../PolymakeInterface-*
+  patch -p2 -i "$srcdir"/gap-polymake-4.0.patch # Fix build with polymake 4.0
 }
 
 build() {
@@ -111,7 +115,7 @@
   replaces=(gap-4.8-packages)
   optdepends=('normaliz: Normaliz interface package' 'libxaw: xgap package' 
'c-xsc: float package' 'mpfi: float package'
   'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package' 'planarity: digraph package'
-  'polymake: Polymake interface package' 'curl: curl interface 
package' 'libsemigroups: semigroups package')
+  'curl: curl interface package' 'libsemigroups: semigroups 
package' 'polymake: Polymake interface package')
   pkgdesc="Extra packages for GAP"
   cd gap-$pkgver
 

Added: gap-polymake-4.0.patch
===
--- gap-polymake-4.0.patch  (rev 0)
+++ gap-polymake-4.0.patch  2020-01-29 22:35:33 UTC (rev 559222)
@@ -0,0 +1,450 @@
+diff --git a/PolymakeInterface/src/polymake_cone.cpp 
b/PolymakeInterface/src/polymake_cone.cpp
+index 6c17f49d..637266a0 100644
+--- a/PolymakeInterface/src/polymake_cone.cpp
 b/PolymakeInterface/src/polymake_cone.cpp
+@@ -110,16 +110,16 @@ Obj REAL_GENERATING_RAYS_OF_CONE( Polymake_Data* data, 
Obj cone){
+   matr2 = -matr2;
+   Obj RETLI3 = GAP_MATRIX_POLYMAKE_INTEGER_MATRIX( &matr2 );
+   
+-  int len1 = LEN_PLIST( RETLI1 );
+-  int len2 = LEN_PLIST( RETLI2 );
++  Int len1 = LEN_PLIST( RETLI1 );
++  Int len2 = LEN_PLIST( RETLI2 );
+   
+   Obj RETLI = NEW_PLIST( T_PLIST, len1 + 2*len2 );
+   SET_LEN_PLIST( RETLI, len1 + 2*len2 );
+   
+-  for( int i = 1; i <= len1; i++ )
++  for( Int i = 1; i <= len1; i++ )
+ SET_ELM_PLIST( RETLI, i, ELM_PLIST( RETLI1, i ) );
+   
+-  for( int i = 1; i <= len2; i++ ){
++  for( Int i = 1; i <= len2; i++ ){
+ SET_ELM_PLIST( RETLI, len1 + i, ELM_PLIST( RETLI2, i ) );
+ SET_ELM_PLIST( RETLI,  len1 + len2 + i, ELM_PLIST( RETLI3, i ) );
+   }
+@@ -168,7 +168,7 @@ Obj REAL_HILBERT_BASIS_OF_CONE( Polymake_Data* data, Obj 
cone){
+   polymake::Array> arr;
+   try
+   {
+- arr = coneobj->give("HILBERT_BASIS_GENERATORS");
++ coneobj->give("HILBERT_BASIS_GENERATORS") >> arr;
+   }
+ 
+   POLYMAKE_GAP_CATCH
+@@ -232,16 +232,16 @@ Obj REAL_DEFINING_INEQUALITIES_OF_CONE( Polymake_Data* 
data, Obj cone){
+   matr2 = -matr2;
+   Obj RETLI3 = GAP_MATRIX_POLYMAKE_INTEGER_MATRIX( &matr2 );
+   
+-  int len1 = LEN_PLIST( RETLI1 );
+-  int len2 = LEN_PLIST( RETLI2 );
++  Int len1 = LEN_PLIST( RETLI1 );
++  Int len2 = LEN_PLIST( RETLI2 );
+   
+   Obj RETLI = NEW_PLIST( T_PLIST, len1 + 2*len2 );
+   SET_LEN_PLIST( RETLI, len1 + 2*len2 );
+   
+-  for( int i = 1; i <= len1; i++ )
++  for( Int i = 1; i <= len1; i++ )
+ SET_ELM_PLIST( RETLI, i, ELM_PLIST( RETLI1, i ) );
+   
+-  for( int i = 1; i <= len2; i++ ){
++  for( Int i = 1; i <= len2; i++ ){
+ SET_ELM_PLIST( RETLI, len1 + i,

[arch-commits] Commit in gap/trunk (PKGBUILD)

2020-01-13 Thread Antonio Rojas via arch-commits
Date: Monday, January 13, 2020 @ 15:19:40
  Author: arojas
Revision: 552378

libsemigrupos 1.0.5 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-13 15:12:14 UTC (rev 552377)
+++ PKGBUILD2020-01-13 15:19:40 UTC (rev 552378)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=9
+pkgrel=10
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD normalizinterface-missing-include.patch)

2020-01-11 Thread Antonio Rojas via arch-commits
Date: Sunday, January 12, 2020 @ 00:45:11
  Author: arojas
Revision: 552116

libsemigroups 1.0.4 rebuild, fix NormalizInterface build

Added:
  gap/trunk/normalizinterface-missing-include.patch
Modified:
  gap/trunk/PKGBUILD

-+
 PKGBUILD|   21 -
 normalizinterface-missing-include.patch |   12 
 2 files changed, 28 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-11 23:21:32 UTC (rev 552115)
+++ PKGBUILD2020-01-12 00:45:11 UTC (rev 552116)
@@ -5,17 +5,21 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
 
source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
- libsemigroups-1.0.patch)
+ libsemigroups-1.0.patch
+ git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
+ normalizinterface-missing-include.patch)
 sha256sums=('11175bed0234101643d510d4ab94c44db30bd303bfe63d86b9b86ae67cff9e49'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
-'ccd95de4f48d26b73d6df7c1847855f68ee70644d130d32f14213988c3e286e3')
-makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq 
fplll polymake wget chrpath fmt)
+'ccd95de4f48d26b73d6df7c1847855f68ee70644d130d32f14213988c3e286e3'
+'SKIP'
+'2410dfc69f1f4d2f320e91590d55e59c7b557637f9f60b9e609b318cfc21c181')
+makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq 
fplll polymake wget chrpath fmt git)
 
 prepare() {
   cd gap-$pkgver
@@ -30,7 +34,13 @@
   sed -e '/xgap/d' -i pkg/sonata-*/PackageInfo.g
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
 
-  cd pkg/semigroups-*
+# Update NormalizInterface to support recent normaliz
+  rm -r pkg/NormalizInterface-1.0.2
+  cp -r ../NormalizInterface pkg
+  cd pkg/NormalizInterface
+  patch -p1 -i "$srcdir"/normalizinterface-missing-include.patch
+
+  cd ../semigroups-*
   patch -p1 -i "$srcdir"/libsemigroups-1.0.patch # Fix build with 
libsemigroups 1.0
 }
 
@@ -52,6 +62,7 @@
   export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
   export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install -lgap" # See 
https://trac.sagemath.org/ticket/27372
   export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install
+  export MAKEFLAGS="-j1"
   ../bin/BuildPackages.sh
 }
 

Added: normalizinterface-missing-include.patch
===
--- normalizinterface-missing-include.patch (rev 0)
+++ normalizinterface-missing-include.patch 2020-01-12 00:45:11 UTC (rev 
552116)
@@ -0,0 +1,12 @@
+diff --git a/src/normaliz.cc b/src/normaliz.cc
+index a2ef45d..9768988 100644
+--- a/src/normaliz.cc
 b/src/normaliz.cc
+@@ -27,6 +27,7 @@
+ 
+ #include "libnormaliz/cone.h"
+ #include "libnormaliz/map_operations.h"
++#include "libnormaliz/dynamic_bitset.h"
+ 
+ #include 
+ 


[arch-commits] Commit in gap/trunk (PKGBUILD libsemigroups-1.0.patch)

2019-11-27 Thread Antonio Rojas via arch-commits
Date: Thursday, November 28, 2019 @ 07:13:29
  Author: arojas
Revision: 534254

libsemigroups 1.0.0 rebuild

Added:
  gap/trunk/libsemigroups-1.0.patch
Modified:
  gap/trunk/PKGBUILD

-+
 PKGBUILD|   13 
 libsemigroups-1.0.patch | 2244 ++
 2 files changed, 2253 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-28 06:43:57 UTC (rev 534253)
+++ PKGBUILD2019-11-28 07:13:29 UTC (rev 534254)
@@ -5,15 +5,17 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=7
+pkgrel=8
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh)
+source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
+ libsemigroups-1.0.patch)
 sha256sums=('11175bed0234101643d510d4ab94c44db30bd303bfe63d86b9b86ae67cff9e49'
-'143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46')
-makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq 
fplll polymake wget chrpath)
+'143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
+'ccd95de4f48d26b73d6df7c1847855f68ee70644d130d32f14213988c3e286e3')
+makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq 
fplll polymake wget chrpath fmt)
 
 prepare() {
   cd gap-$pkgver
@@ -27,6 +29,9 @@
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata-*/PackageInfo.g
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
+
+  cd pkg/semigroups-*
+  patch -p1 -i "$srcdir"/libsemigroups-1.0.patch # Fix build with 
libsemigroups 1.0
 }
 
 build() {

Added: libsemigroups-1.0.patch
===
--- libsemigroups-1.0.patch (rev 0)
+++ libsemigroups-1.0.patch 2019-11-28 07:13:29 UTC (rev 534254)
@@ -0,0 +1,2244 @@
+From ff6e172a492af2465fd7465da64298353cc15cc5 Mon Sep 17 00:00:00 2001
+From: James Mitchell 
+Date: Wed, 2 May 2018 10:45:40 +0200
+Subject: [PATCH] Update for libsemigroups v1.0.0
+
+---
+ .LIBSEMIGROUPS_VERSION  |   2 +-
+ Makefile.am |  16 +-
+ gap/main/fropin.gi  |  19 ++-
+ m4/ax_check_libsemigroup.m4 |   4 +-
+ scripts/travis-test.sh  |  10 +-
+ src/.clang-format   |  10 +-
+ src/bipart.cc   | 133 
+ src/bipart.h|   9 +-
+ src/congpairs.cc| 235 ++--
+ src/converter.cc|  21 ++-
+ src/converter.h |  50 +++---
+ src/fropin.cc   |  29 ++--
+ src/pkg.cc  |  22 +--
+ src/pkg.h   |   5 +-
+ src/semigrp.cc  | 294 +++-
+ src/semigrp.h   |  63 
+ src/uf.cc   |   8 +-
+ tst/standard/congfpmon.tst  |  17 +--
+ 18 files changed, 484 insertions(+), 463 deletions(-)
+
+diff --git a/.LIBSEMIGROUPS_VERSION b/.LIBSEMIGROUPS_VERSION
+index 2228cad41..3eefcb9dd 100644
+--- a/.LIBSEMIGROUPS_VERSION
 b/.LIBSEMIGROUPS_VERSION
+@@ -1 +1 @@
+-0.6.7
++1.0.0
+diff --git a/Makefile.am b/Makefile.am
+index b5ee5ea8b..6998d563e 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -11,7 +11,7 @@ if WITH_INCLUDED_LIBSEMIGROUPS
+   # the following triggers "make install" on libsemigroups
+   # note that making it a concrete file prevents this target
+   # to be needlessly re-run if libsemigroups/ is not changed.
+-  BUILT_SOURCES = bin/include/libsemigroups/blocks.h
++  BUILT_SOURCES = bin/include/libsemigroups/libsemigroups.hpp
+ endif
+ 
+ AM_CPPFLAGS = @LIBSEMIGROUPS_CFLAGS@
+@@ -28,6 +28,18 @@ semigroups_la_SOURCES += src/semigrp.cc
+ semigroups_la_CXXFLAGS = $(GAP_CFLAGS) @LIBSEMIGROUPS_CFLAGS@ -std=gnu++11 
-O3 -g -march=native
+ semigroups_la_CPPFLAGS = $(GAP_CPPFLAGS)  @LIBSEMIGROUPS_CFLAGS@
+ semigroups_la_CFLAGS = $(GAP_CFLAGS)
++
++semigroups_la_CPPFLAGS += -I$(top_srcdir)/libsemigroups/extern/HPCombi/include
++semigroups_la_CPPFLAGS += 
-I$(top_srcdir)/libsemigroups/extern/HPCombi/include/fallback
++semigroups_la_CPPFLAGS += 
-I$(top_srcdir)/libsemigroups/extern/fmt-5.3.0/include
++semigroups_la_CPPFLAGS += -DFMT_HEADER_ONLY
++
++if KERNEL_DEBUG
++semigroups_la_CPPFLAGS += -DDEBUG
++else
++semigroups_la_CPPFLAGS += -DNDEBUG
++endif
++
+ semigroups_la_LDFLAGS = $(GAP_LDFLAGS) -module -avoid-version
+ 
+ semigroups_la_LIBADD = @LIBSEMIGROUPS_LIBS@
+@@ -37,7 +49,7 @@ semigroups_la_LDFLAGS += -no-undefined -version-info 0:0:0 
-Wl,$(GAPROOT)/bin/$(
+ endif
+ 
+ # the following is only run if BUILT_SOURCES is wound up
+-bin/include/libsemigroups/blocks.h:
++bin/include/libsemigroups/libsemigroups.hpp:
+   $(MAKE) -C libsemigroup

[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-11-23 Thread Antonio Rojas via arch-commits
Date: Saturday, November 23, 2019 @ 21:51:42
  Author: arojas
Revision: 532386

fplll 5.3.0 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-23 21:42:57 UTC (rev 532385)
+++ PKGBUILD2019-11-23 21:51:42 UTC (rev 532386)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-11-19 Thread Antonio Rojas via arch-commits
Date: Tuesday, November 19, 2019 @ 20:47:19
  Author: arojas
Revision: 530547

polymake 3.6 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-19 20:29:32 UTC (rev 530546)
+++ PKGBUILD2019-11-19 20:47:19 UTC (rev 530547)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-11-11 Thread Felix Yan via arch-commits
Date: Tuesday, November 12, 2019 @ 02:21:51
  Author: felixonmars
Revision: 526927

icu 65.1 / poppler 0.82.0 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-12 02:21:30 UTC (rev 526926)
+++ PKGBUILD2019-11-12 02:21:51 UTC (rev 526927)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-10-14 Thread Antonio Rojas via arch-commits
Date: Monday, October 14, 2019 @ 20:25:40
  Author: arojas
Revision: 515922

Fix xgap launcher

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-14 20:20:23 UTC (rev 515921)
+++ PKGBUILD2019-10-14 20:25:40 UTC (rev 515922)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -99,9 +99,15 @@
   pkgdesc="Extra packages for GAP"
   cd gap-$pkgver
 
-  mkdir -p "$pkgdir"/usr/lib/gap
+  mkdir -p "$pkgdir"/usr/{bin,lib/gap}
   cp -r pkg "$pkgdir"/usr/lib/gap
 
+# fix xgap launch script
+  sed -e 's|/build/gap/src/gap-4.10.2|/usr/lib/gap|g' -e 
's|^GAP=.*|GAP=/usr/lib/gap/gap|g' \
+"$pkgdir"/usr/lib/gap/pkg/xgap-*/xgap.sh > "$pkgdir"/usr/bin/xgap
+  chmod 755 "$pkgdir"/usr/bin/xgap
+  rm "$pkgdir"/usr/lib/gap/pkg/xgap-*/xgap.sh*
+
 # provided by main gap package
   for _pkg in ${_standardpkgs[@]}; do
 rm -r "$pkgdir"/usr/lib/gap/pkg/$_pkg


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-09-05 Thread Antonio Rojas via arch-commits
Date: Thursday, September 5, 2019 @ 18:50:47
  Author: arojas
Revision: 508214

Add /usr/share/gap symlink, needed by python3 sage

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-05 18:11:03 UTC (rev 508213)
+++ PKGBUILD2019-09-05 18:50:47 UTC (rev 508214)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -75,6 +75,9 @@
   install -Dm755 gap -t "$pkgdir"/usr/lib/gap
 # Install launcher script
   install -Dm755 "$srcdir"/gap.sh "$pkgdir"/usr/bin/gap
+
+  mkdir -p "$pkgdir"/usr/share
+  ln -s /usr/lib/gap -t "$pkgdir"/usr/share # expected by sagemath
 }
 
 package_gap-doc() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-08-24 Thread Antonio Rojas via arch-commits
Date: Saturday, August 24, 2019 @ 20:23:07
  Author: arojas
Revision: 501558

polymake 3.5 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-24 20:22:06 UTC (rev 501557)
+++ PKGBUILD2019-08-24 20:23:07 UTC (rev 501558)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-06-22 Thread Antonio Rojas via arch-commits
Date: Saturday, June 22, 2019 @ 14:08:51
  Author: arojas
Revision: 482770

Update to 4.10.2

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-22 13:25:03 UTC (rev 482769)
+++ PKGBUILD2019-06-22 14:08:51 UTC (rev 482770)
@@ -4,18 +4,16 @@
 
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
-pkgver=4.10.1
-pkgrel=4
+pkgver=4.10.2
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
-gap-polymake-3.3.patch)
-sha256sums=('b2d8800e338a6a9afdf92b06368c2e1a16b8adebffcd4c10319c1b3a4e827e45'
-'143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
-'c92849b2643e0e21ffdcfa230fb23fe4a276ec15402f178d5d69ddb0e537fbbe')
-makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake 
wget chrpath)
+source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh)
+sha256sums=('11175bed0234101643d510d4ab94c44db30bd303bfe63d86b9b86ae67cff9e49'
+'143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46')
+makedepends=(libxaw givaro mpfi normaliz boost libsemigroups c-xsc zeromq 
fplll polymake wget chrpath)
 
 prepare() {
   cd gap-$pkgver
@@ -22,14 +20,13 @@
 
 # Use system normaliz
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
+# Use system libsemigroups
+  sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i 
pkg/semigroups-*/configure
 # Disable anupq package, it's i686 only
   rm -r pkg/anupq-*
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata-*/PackageInfo.g
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
-
-  cd pkg/PolymakeInterface*
-  patch -p2 -i "$srcdir"/gap-polymake-3.3.patch # Fix build of 
PolymakeInterface with polymake 3.3
 }
 
 build() {
@@ -47,7 +44,6 @@
   libtool --mode=install install libgap.la "$srcdir"/gap-$pkgver/tmp-install
 
   cd pkg
-  export MAKEFLAGS='-j1' # Fix build of carat package
   export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
   export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install -lgap" # See 
https://trac.sagemath.org/ticket/27372
   export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install
@@ -95,8 +91,8 @@
   depends=(gap)
   replaces=(gap-4.8-packages)
   optdepends=('normaliz: Normaliz interface package' 'libxaw: xgap package' 
'c-xsc: float package' 'mpfi: float package'
-  'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package'
-  'polymake: Polymake interface package' 'curl: curl interface 
package')
+  'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package' 'planarity: digraph package'
+  'polymake: Polymake interface package' 'curl: curl interface 
package' 'libsemigroups: semigroups package')
   pkgdesc="Extra packages for GAP"
   cd gap-$pkgver
 
@@ -109,10 +105,13 @@
   done
 
 # fix RPATH
-  chrpath -r \$ORIGIN/../lib/ 
"$pkgdir"/usr/lib/gap/pkg/semigroups-*/bin/x86_64-*/semigroups.so
-  chrpath -d 
"$pkgdir"/usr/lib/gap/pkg/NormalizInterface-*/bin/x86_64-*/NormalizInterface.so
+  find "$pkgdir"/usr/lib/gap/pkg/ -name '*.so' | xargs chrpath -d
 
+# remove bundled planarity
+  rm -r "$pkgdir"/usr/lib/gap/pkg/digraphs-*/bin/lib/
+
 # remove leftover binaries and source files
   find "$pkgdir"/usr/lib/gap/pkg -name .libs -o -name '*.o' | xargs rm -fr
   find "$pkgdir"/usr/lib/gap/pkg -type d -name src | xargs rm -fr
+  rm -fr "$pkgdir"/usr/lib/gap/pkg/log
 }


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-04-20 Thread Antonio Rojas via arch-commits
Date: Saturday, April 20, 2019 @ 21:54:17
  Author: arojas
Revision: 452455

polymake 3.4 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-20 21:53:43 UTC (rev 452454)
+++ PKGBUILD2019-04-20 21:54:17 UTC (rev 452455)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-04-05 Thread Felix Yan via arch-commits
Date: Friday, April 5, 2019 @ 16:14:57
  Author: felixonmars
Revision: 449881

icu 64.1 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 15:40:22 UTC (rev 449880)
+++ PKGBUILD2019-04-05 16:14:57 UTC (rev 449881)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-03-17 Thread Antonio Rojas via arch-commits
Date: Sunday, March 17, 2019 @ 20:36:55
  Author: arojas
Revision: 442401

Fix c-xsc support in float package

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-17 19:46:35 UTC (rev 442400)
+++ PKGBUILD2019-03-17 20:36:55 UTC (rev 442401)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -48,6 +48,7 @@
 
   cd pkg
   export MAKEFLAGS='-j1' # Fix build of carat package
+  export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
   export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install -lgap" # See 
https://trac.sagemath.org/ticket/27372
   export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install
   ../bin/BuildPackages.sh


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-03-02 Thread Antonio Rojas via arch-commits
Date: Saturday, March 2, 2019 @ 16:11:04
  Author: arojas
Revision: 437391

Fix issues in sagemath when gap-packages is installed

Link all binary packages to libgap explicitely, and remove xgap from suggested 
packages so sagemath won't try to load it

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-02 16:09:49 UTC (rev 437390)
+++ PKGBUILD2019-03-02 16:11:04 UTC (rev 437391)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -28,6 +28,9 @@
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
 # Disable anupq package, it's i686 only
   rm -r pkg/anupq-*
+# Fix https://bugs.archlinux.org/task/55174
+  sed -e '/xgap/d' -i pkg/sonata-*/PackageInfo.g
+  sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
 
 # Patches to make sagemath work with GAP's libgap
   patch -p1 -i ../gap-sagemath-1.patch
@@ -41,10 +44,20 @@
 build() {
   cd gap-$pkgver
   ./configure --prefix=/usr --with-gmp=system
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 
+  # Install libgap so we can link packages against it
+  mkdir -p tmp-install
+  make DESTDIR="$srcdir"/gap-$pkgver/tmp-install install-libgap
+
   cd pkg
   export MAKEFLAGS='-j1' # Fix build of carat package
+  export LDFLAGS+=" -L$srcdir/gap-$pkgver/tmp-install/usr/lib -lgap" # See 
https://trac.sagemath.org/ticket/27372
+  export LD_LIBRARY_PATH="$srcdir"/gap-$pkgver/tmp-install/usr/lib
   ../bin/BuildPackages.sh
 }
 
@@ -103,6 +116,7 @@
   chrpath -r \$ORIGIN/../lib/ 
"$pkgdir"/usr/lib/gap/pkg/semigroups-*/bin/x86_64-pc-linux-gnu-default64/semigroups.so
   chrpath -d 
"$pkgdir"/usr/lib/gap/pkg/NormalizInterface-*/bin/x86_64-pc-linux-gnu-default64/NormalizInterface.so
 
-# remove leftover binaries
-  find "$pkgdir"/usr/lib/gap/pkg -name .libs | xargs rm -r
+# remove leftover binaries and source files
+  find "$pkgdir"/usr/lib/gap/pkg -name .libs -o -name '*.o' | xargs rm -fr
+  find "$pkgdir"/usr/lib/gap/pkg -type d -name src | xargs rm -fr
 }


[arch-commits] Commit in gap/trunk (PKGBUILD gap-polymake-3.3.patch)

2019-02-13 Thread Antonio Rojas via arch-commits
Date: Wednesday, February 13, 2019 @ 18:21:39
  Author: arojas
Revision: 432089

polymake 3.3 rebuild

Added:
  gap/trunk/gap-polymake-3.3.patch
Modified:
  gap/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 gap-polymake-3.3.patch |   26 ++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-13 17:55:06 UTC (rev 432088)
+++ PKGBUILD2019-02-13 18:21:39 UTC (rev 432089)
@@ -5,18 +5,20 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
 
source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap.sh
-gap-sagemath-1.patch gap-sagemath-2.patch gap-sagemath-3.patch)
+gap-sagemath-1.patch gap-sagemath-2.patch gap-sagemath-3.patch
+gap-polymake-3.3.patch)
 sha256sums=('314b8d949c0bb01ef8bee199b29571d42714df660aba0d76ded254f58295904f'
 '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
 'e5f0a71ae5cdcc6596330834ef9fb0a0183890a9cf874a7eb88b819b0030a33b'
 '3b66e6b320f56119b1d8eb804a94ee3a7ea71af10bd4f99a61bae32840e62c87'
-'511414a8d085a9ef9de5f921fdd45e4bbb3f33c2d88b821da06dfc267c182ddc')
+'511414a8d085a9ef9de5f921fdd45e4bbb3f33c2d88b821da06dfc267c182ddc'
+'c92849b2643e0e21ffdcfa230fb23fe4a276ec15402f178d5d69ddb0e537fbbe')
 makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake 
wget chrpath)
 
 prepare() {
@@ -31,6 +33,9 @@
   patch -p1 -i ../gap-sagemath-1.patch
   patch -p1 -i ../gap-sagemath-2.patch
   patch -p1 -i ../gap-sagemath-3.patch
+
+  cd pkg/PolymakeInterface*
+  patch -p2 -i "$srcdir"/gap-polymake-3.3.patch # Fix build of 
PolymakeInterface with polymake 3.3
 }
 
 build() {

Added: gap-polymake-3.3.patch
===
--- gap-polymake-3.3.patch  (rev 0)
+++ gap-polymake-3.3.patch  2019-02-13 18:21:39 UTC (rev 432089)
@@ -0,0 +1,26 @@
+diff --git a/PolymakeInterface/src/polymake_fan.cpp 
b/PolymakeInterface/src/polymake_fan.cpp
+index e3914d7b..9e1b164b 100644
+--- a/PolymakeInterface/src/polymake_fan.cpp
 b/PolymakeInterface/src/polymake_fan.cpp
+@@ -93,7 +93,7 @@ Obj REAL_FAN_BY_RAYS_AND_CONES( Polymake_Data* data, Obj 
rays, Obj cones ){
+   return NULL;
+ }
+ #endif
+-incMatr[i] += INT_INTOBJ( numb ) - 1;
++incMatr[i] += (pm::Set)pm::scalar2set(INT_INTOBJ( numb ) - 1);
+   }
+   }
+ 
+diff --git a/PolymakeInterface/src/polymake_matroid.cpp 
b/PolymakeInterface/src/polymake_matroid.cpp
+index 4f33795b..5ea2e8d2 100644
+--- a/PolymakeInterface/src/polymake_matroid.cpp
 b/PolymakeInterface/src/polymake_matroid.cpp
+@@ -52,7 +52,7 @@ Obj REAL_CREATE_MATROID_ABSTRACT( Polymake_Data* data, Obj 
size, Obj elements ){
+   int current_length = LEN_PLIST( current_basis_list );
+   
+   for( int i=1;i<=current_length;i++){
+-  incMatr[current_basis] += INT_INTOBJ( ELM_PLIST( 
current_basis_list, i ) ) - 1;
++  incMatr[current_basis] += (pm::Set)pm::scalar2set(INT_INTOBJ( 
ELM_PLIST( current_basis_list, i ) ) - 1);
+   }
+   
+   }


[arch-commits] Commit in gap/trunk (PKGBUILD)

2019-01-10 Thread Felix Yan via arch-commits
Date: Friday, January 11, 2019 @ 06:52:46
  Author: felixonmars
Revision: 422209

Readline 8.0 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-11 06:17:41 UTC (rev 422208)
+++ PKGBUILD2019-01-11 06:52:46 UTC (rev 422209)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-11-07 Thread Antonio Rojas via arch-commits
Date: Thursday, November 8, 2018 @ 07:30:30
  Author: arojas
Revision: 403212

Don't install libgap for now, allows coinstallability with sagemath

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-07 23:35:33 UTC (rev 403211)
+++ PKGBUILD2018-11-08 07:30:30 UTC (rev 403212)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -39,13 +39,13 @@
 package_gap() {
   depends=(gmp)
   optdepends=('gap-packages: extra packages' 'gap-doc: documentation')
-  conflicts=(libgap)
+# conflicts=(libgap)
   replaces=(gap-data)
   cd gap-$pkgver
 
-  make DESTDIR="$pkgdir" install
+# make DESTDIR="$pkgdir" install
 
-  mkdir -p "$pkgdir"/usr/lib/gap/pkg
+  mkdir -p "$pkgdir"/usr/{bin,lib/gap/pkg}
   cp -r grp lib "$pkgdir"/usr/lib/gap
   cp -r pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp} "$pkgdir"/usr/lib/gap/pkg
   install -m755 gap -t "$pkgdir"/usr/lib/gap
@@ -53,7 +53,7 @@
   chmod 755 "$pkgdir"/usr/bin/gap
 
 # install missing header
-  cp gen/config.h "$pkgdir"/usr/include/gap
+# cp gen/config.h "$pkgdir"/usr/include/gap
 }
 
 package_gap-doc() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-11-07 Thread Antonio Rojas via arch-commits
Date: Wednesday, November 7, 2018 @ 19:07:36
  Author: arojas
Revision: 403116

Add conflicts with libgap, install missing header

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-07 19:07:03 UTC (rev 403115)
+++ PKGBUILD2018-11-07 19:07:36 UTC (rev 403116)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -39,6 +39,7 @@
 package_gap() {
   depends=(gmp)
   optdepends=('gap-packages: extra packages' 'gap-doc: documentation')
+  conflicts=(libgap)
   replaces=(gap-data)
   cd gap-$pkgver
 
@@ -50,6 +51,9 @@
   install -m755 gap -t "$pkgdir"/usr/lib/gap
   sed -e "s|/build/gap/src/gap-$pkgver|/usr/lib/gap|g" bin/gap.sh > 
"$pkgdir"/usr/bin/gap
   chmod 755 "$pkgdir"/usr/bin/gap
+
+# install missing header
+  cp gen/config.h "$pkgdir"/usr/include/gap
 }
 
 package_gap-doc() {


[arch-commits] Commit in gap/trunk (PKGBUILD gap-polymake-3.1.patch)

2018-11-07 Thread Antonio Rojas via arch-commits
Date: Wednesday, November 7, 2018 @ 17:46:30
  Author: arojas
Revision: 403012

Update to 4.10.0

Modified:
  gap/trunk/PKGBUILD
Deleted:
  gap/trunk/gap-polymake-3.1.patch

+
 PKGBUILD   |   38 +++
 gap-polymake-3.1.patch |  247 ---
 2 files changed, 18 insertions(+), 267 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-07 17:46:05 UTC (rev 403011)
+++ PKGBUILD2018-11-07 17:46:30 UTC (rev 403012)
@@ -4,18 +4,16 @@
 
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
-pkgver=4.9.3
+pkgver=4.10.0
 pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap-no-packages-by-default.patch
-gap-polymake-3.1.patch)
-sha256sums=('e502941e52352285e87faaf11e7f0e810eab8e38849d869fc6b9714d6cf7fe7c'
-'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
-'6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
-makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake 
wget)
+source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap-no-packages-by-default.patch)
+sha256sums=('314b8d949c0bb01ef8bee199b29571d42714df660aba0d76ded254f58295904f'
+'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2')
+makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake 
wget chrpath)
 
 prepare() {
   cd gap-$pkgver
@@ -22,15 +20,8 @@
 
 # Use system normaliz
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
-# Fix build of guava package
-  sed -e '/cd leon make/d' -i pkg/guava-*/src/Makefile
-  sed -e '/AM_INIT_AUTOMAKE/d' -i pkg/guava-*/src/leon/configure.ac
 # Don't load any packages by default
   patch -p1 -i ../gap-no-packages-by-default.patch
-# Fix build of PolymakeInterface with polymake 3.1
-  patch -p1 -i ../gap-polymake-3.1.patch
-# Fix https://bugs.archlinux.org/task/55174
-  sed -e '/xgap/d' -i pkg/sonata/PackageInfo.g
 # Disable anupq package, it's i686 only
   rm -r pkg/anupq-*
 }
@@ -41,11 +32,8 @@
   make
 
   cd pkg
-  export MAKEFLAGS='-j1' # Fix build of guava package
+  export MAKEFLAGS='-j1' # Fix build of carat package
   ../bin/BuildPackages.sh
-# These packages fail to build:
-# linboxing (doesn't support givaro 4)
-# PolymakeInterface (T_POLYMAKE removed from GAP)
 }
 
 package_gap() {
@@ -54,7 +42,9 @@
   replaces=(gap-data)
   cd gap-$pkgver
 
-  mkdir -p "$pkgdir"/usr/{bin,lib/gap/pkg}
+  make DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir"/usr/lib/gap/pkg
   cp -r grp lib "$pkgdir"/usr/lib/gap
   cp -r pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp} "$pkgdir"/usr/lib/gap/pkg
   install -m755 gap -t "$pkgdir"/usr/lib/gap
@@ -74,7 +64,8 @@
 package_gap-packages() {
   depends=(gap)
   optdepends=('normaliz: Normaliz interface package' 'libxaw: xgap package' 
'c-xsc: float package' 'mpfi: float package'
-  'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package') # 'polymake: Polymake interface package'
+  'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package'
+  'polymake: Polymake interface package' 'curl: curl interface 
package')
   pkgdesc="Extra packages for GAP"
   cd gap-$pkgver
 
@@ -83,4 +74,11 @@
 
 # provided by main gap package
   rm -r "$pkgdir"/usr/lib/gap/pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp}
+
+# fix RPATH
+  chrpath -r \$ORIGIN/../lib/ 
"$pkgdir"/usr/lib/gap/pkg/semigroups-*/bin/x86_64-pc-linux-gnu-default64/semigroups.so
+  chrpath -d 
"$pkgdir"/usr/lib/gap/pkg/NormalizInterface-*/bin/x86_64-pc-linux-gnu-default64/NormalizInterface.so
+
+# remove leftover binaries
+  find "$pkgdir"/usr/lib/gap/pkg -name .libs | xargs rm -r
 }

Deleted: gap-polymake-3.1.patch
===
--- gap-polymake-3.1.patch  2018-11-07 17:46:05 UTC (rev 403011)
+++ gap-polymake-3.1.patch  2018-11-07 17:46:30 UTC (rev 403012)
@@ -1,247 +0,0 @@
-diff -ru gap4r8.old/pkg/PolymakeInterface/src/polymake_cone.cpp 
gap4r8/pkg/PolymakeInterface/src/polymake_cone.cpp
 gap4r8.old/pkg/PolymakeInterface/src/polymake_cone.cpp 2016-11-12 
15:25:17.0 +0100
-+++ gap4r8/pkg/PolymakeInterface/src/polymake_cone.cpp 2017-03-29 
13:37:29.0 +0200
-@@ -321,7 +321,7 @@
- LIZeil = NEW_PLIST( T_PLIST, matr.cols());
- SET_LEN_PLIST( LIZeil , matr_cols );
- for(int j = 0;j

[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-09-09 Thread Antonio Rojas via arch-commits
Date: Monday, September 10, 2018 @ 06:39:14
  Author: arojas
Revision: 378983

Update to 4.9.3

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-10 06:13:34 UTC (rev 378982)
+++ PKGBUILD2018-09-10 06:39:14 UTC (rev 378983)
@@ -5,8 +5,8 @@
 
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -13,7 +13,7 @@
 license=(GPL)
 
source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap-no-packages-by-default.patch
 gap-polymake-3.1.patch)
-sha256sums=('a5bd705506547310e6e8bda879c6a2c1aab4b54ba41d47431329f94deb252878'
+sha256sums=('e502941e52352285e87faaf11e7f0e810eab8e38849d869fc6b9714d6cf7fe7c'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
 '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
 makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake 
wget)


[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-07-07 Thread Antonio Rojas via arch-commits
Date: Saturday, July 7, 2018 @ 15:50:14
  Author: arojas
Revision: 354021

make install is broken

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-07 15:49:21 UTC (rev 354020)
+++ PKGBUILD2018-07-07 15:50:14 UTC (rev 354021)
@@ -6,7 +6,7 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -55,14 +55,12 @@
   replaces=(gap-data)
   cd gap-$pkgver
 
-  make DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir"/usr/lib/gap/pkg
+  mkdir -p "$pkgdir"/usr/{bin,lib/gap/pkg}
   cp -r grp lib "$pkgdir"/usr/lib/gap
   cp -r pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp} "$pkgdir"/usr/lib/gap/pkg
-
-# Fix conflicts with libgap
-  rm -r "$pkgdir"/usr/{include,lib/libgap*}
+  install -m755 gap -t "$pkgdir"/usr/lib/gap
+  sed -e "s|/build/gap/src/gap-$pkgver|/usr/lib/gap|g" bin/gap.sh > 
"$pkgdir"/usr/bin/gap
+  chmod 755 "$pkgdir"/usr/bin/gap
 }
 
 package_gap-doc() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-07-07 Thread Antonio Rojas via arch-commits
Date: Saturday, July 7, 2018 @ 11:30:01
  Author: arojas
Revision: 353960

Update to 4.9.2

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   85 -
 1 file changed, 28 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-07 11:07:14 UTC (rev 353959)
+++ PKGBUILD2018-07-07 11:30:01 UTC (rev 353960)
@@ -4,28 +4,26 @@
 # Contributor: Rémy Oudompheng 
 
 pkgbase=gap
-pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.10
-_gapver=4r8p10_2018_01_15-13_02
-pkgrel=3
+pkgname=(gap gap-doc gap-packages)
+pkgver=4.9.2
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
 license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch
+source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz";
 gap-no-packages-by-default.patch
 gap-polymake-3.1.patch)
-sha256sums=('fc0dac32d196a825be5b4cab6a970aad58f1d16ca2870bd0381c94c85e7a9e5b'
+sha256sums=('a5bd705506547310e6e8bda879c6a2c1aab4b54ba41d47431329f94deb252878'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
 '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
-makedepends=(libxaw openmpi givaro mpfi normaliz polymake boost c-xsc) # fplll
+makedepends=(libxaw givaro mpfi normaliz boost c-xsc zeromq fplll polymake 
wget)
 
 prepare() {
-  cd gap4r8
+  cd gap-$pkgver
 
 # Use system normaliz
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
 # Fix build of guava package
-  sed -e "s|MAKE=make|MAKE='make -j1'|" -i bin/BuildPackages.sh
   sed -e '/cd leon make/d' -i pkg/guava-*/src/Makefile
   sed -e '/AM_INIT_AUTOMAKE/d' -i pkg/guava-*/src/leon/configure.ac
 # Don't load any packages by default
@@ -34,70 +32,43 @@
   patch -p1 -i ../gap-polymake-3.1.patch
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata/PackageInfo.g
-# Disable fplll in float package, doesn't support 5.2
-  pushd pkg/float-*
-sed -e '/FPLLL/d' -i configure.ac
-sed -e '39,44d' -i src/Makefile.am
-./autogen.sh
-  popd
 # Disable anupq package, it's i686 only
   rm -r pkg/anupq-*
 }
 
 build() {
-  cd gap4r8
-  CC=mpicc ./configure --prefix=/usr --with-gmp=system
+  cd gap-$pkgver
+  ./configure --prefix=/usr --with-gmp=system
   make
 
   cd pkg
-  export CXXFLAGS+=' -I/usr/include/cxsc' # Fix build of float package
-  sh ../bin/BuildPackages.sh
+  export MAKEFLAGS='-j1' # Fix build of guava package
+  ../bin/BuildPackages.sh
 # These packages fail to build:
 # linboxing (doesn't support givaro 4)
-
-  cd ../etc
-  sh install-tools.sh
+# PolymakeInterface (T_POLYMAKE removed from GAP)
 }
 
 package_gap() {
-  depends=(gmp openmpi)
-  optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 
'gap-doc: documentation')
-  replaces=(gap-math)
-  conflicts=(gap-math)
-  cd gap4r8
-  
-  mkdir -p "$pkgdir"/usr/lib/gap
-  cp -r bin etc grp lib CITATION "$pkgdir"/usr/lib/gap
-  
-  mkdir -p "$pkgdir"/usr/lib/gap/pkg
-  cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
+  depends=(gmp)
+  optdepends=('gap-packages: extra packages' 'gap-doc: documentation')
+  replaces=(gap-data)
+  cd gap-$pkgver
 
-  mkdir -p "$pkgdir"/usr/bin
-  install -m755 "$pkgdir"/usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
+  make DESTDIR="$pkgdir" install
 
-# fix location
-  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/gap -i 
"$pkgdir"/usr/lib/gap/bin/*/sysinfo.gap  
+  mkdir -p "$pkgdir"/usr/lib/gap/pkg
+  cp -r grp lib "$pkgdir"/usr/lib/gap
+  cp -r pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp} "$pkgdir"/usr/lib/gap/pkg
 
-# remove unneeded stuff
-  rm "$pkgdir"/usr/lib/gap/bin/*/*.o
-  rm "$pkgdir"/usr/lib/gap/bin/gap.sh
-  find "$pkgdir"/usr/lib/gap/bin/ -maxdepth 1 -type f -exec rm {} \;
-  rm -r "$pkgdir"/usr/lib/gap/bin/*/{config*,extern,gac,Makefile}
+# Fix conflicts with libgap
+  rm -r "$pkgdir"/usr/{include,lib/libgap*}
 }
 
-package_gap-data() {
-  depends=(gap)
-  pkgdesc="Additional databases for GAP"
-  cd gap4r8
-
-  mkdir -p "$pkgdir"/usr/lib/gap
-  cp -r prim small trans "$pkgdir"/usr/lib/gap
-}
-
 package_gap-doc() {
   depends=(gap)
   pkgdesc="Documentation for GAP"
-  cd gap4r8
+  cd gap-$pkgver
 
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r doc "$pkgdir"/usr/lib/gap
@@ -105,14 +76,14 @@
 
 package_gap-packages() {
   depends=(gap)
-  optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake 
interface package' 'libxaw: xgap package'
-  'c-xsc: float package' 'mpfi: float package' 'libmpc: float 
package') # 'fplll: float package'
+  optdepends=('normaliz: Normaliz interface package' 'libxaw: xgap package' 
'c-xsc: float package' 'mpfi: float package'
+  'libmpc: float package' 'f

[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-03-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, March 27, 2018 @ 21:53:45
  Author: foutrelis
Revision: 312956

icu 61.1 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 21:53:33 UTC (rev 312955)
+++ PKGBUILD2018-03-27 21:53:45 UTC (rev 312956)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.10
 _gapver=4r8p10_2018_01_15-13_02
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-01-19 Thread Bartłomiej Piotrowski via arch-commits
Date: Friday, January 19, 2018 @ 09:39:59
  Author: bpiotrowski
Revision: 284142

4.8.10-2: rebuild against mpfr 4.0.0

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-19 08:41:59 UTC (rev 284141)
+++ PKGBUILD2018-01-19 09:39:59 UTC (rev 284142)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.10
 _gapver=4r8p10_2018_01_15-13_02
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2018-01-18 Thread Antonio Rojas via arch-commits
Date: Thursday, January 18, 2018 @ 17:10:28
  Author: arojas
Revision: 283904

Update to 4.8.10

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-18 14:58:00 UTC (rev 283903)
+++ PKGBUILD2018-01-18 17:10:28 UTC (rev 283904)
@@ -5,9 +5,9 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.9
-_gapver=4r8p9_2017_12_18-23_44
-pkgrel=2
+pkgver=4.8.10
+_gapver=4r8p10_2018_01_15-13_02
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -14,7 +14,7 @@
 license=(GPL)
 source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch
 gap-polymake-3.1.patch)
-sha256sums=('944230a7c0c04c981ed67768854ab293e1536fe7b76c979f24cf00526bedaba2'
+sha256sums=('fc0dac32d196a825be5b4cab6a970aad58f1d16ca2870bd0381c94c85e7a9e5b'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
 '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
 makedepends=(libxaw openmpi givaro mpfi normaliz polymake boost c-xsc) # fplll
@@ -54,7 +54,6 @@
   sh ../bin/BuildPackages.sh
 # These packages fail to build:
 # linboxing (doesn't support givaro 4)
-# semigroups
 
   cd ../etc
   sh install-tools.sh


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-12-20 Thread Antonio Rojas via arch-commits
Date: Wednesday, December 20, 2017 @ 20:03:50
  Author: arojas
Revision: 275070

openmpi 3.0 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-20 19:55:28 UTC (rev 275069)
+++ PKGBUILD2017-12-20 20:03:50 UTC (rev 275070)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.9
 _gapver=4r8p9_2017_12_18-23_44
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-12-20 Thread Antonio Rojas via arch-commits
Date: Wednesday, December 20, 2017 @ 19:00:00
  Author: arojas
Revision: 275055

Update to 4.8.9

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-20 18:58:37 UTC (rev 275054)
+++ PKGBUILD2017-12-20 19:00:00 UTC (rev 275055)
@@ -5,9 +5,9 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.8
-_gapver=4r8p8_2017_08_20-15_12
-pkgrel=3
+pkgver=4.8.9
+_gapver=4r8p9_2017_12_18-23_44
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/";
@@ -14,7 +14,7 @@
 license=(GPL)
 source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch
 gap-polymake-3.1.patch)
-sha256sums=('5437b8127464065b9b5dc178ff22a716e92422bc7527d30ad462260df5011a7b'
+sha256sums=('944230a7c0c04c981ed67768854ab293e1536fe7b76c979f24cf00526bedaba2'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
 '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
 makedepends=(libxaw openmpi givaro mpfi normaliz polymake boost c-xsc) # fplll
@@ -40,6 +40,8 @@
 sed -e '39,44d' -i src/Makefile.am
 ./autogen.sh
   popd
+# Disable anupq package, it's i686 only
+  rm -r pkg/anupq-*
 }
 
 build() {
@@ -52,6 +54,7 @@
   sh ../bin/BuildPackages.sh
 # These packages fail to build:
 # linboxing (doesn't support givaro 4)
+# semigroups
 
   cd ../etc
   sh install-tools.sh


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-11-12 Thread Evangelos Foutras
Date: Sunday, November 12, 2017 @ 13:27:55
  Author: foutrelis
Revision: 266342

icu 60.1 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 13:22:36 UTC (rev 266341)
+++ PKGBUILD2017-11-12 13:27:55 UTC (rev 266342)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.8
 _gapver=4r8p8_2017_08_20-15_12
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="https://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-09-11 Thread Antonio Rojas
Date: Monday, September 11, 2017 @ 18:23:43
  Author: arojas
Revision: 256963

Disable fplll in float package, 5.2 is not supported

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-11 18:23:38 UTC (rev 256962)
+++ PKGBUILD2017-09-11 18:23:43 UTC (rev 256963)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.8
 _gapver=4r8p8_2017_08_20-15_12
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="https://www.gap-system.org/";
@@ -17,7 +17,7 @@
 sha256sums=('5437b8127464065b9b5dc178ff22a716e92422bc7527d30ad462260df5011a7b'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
 '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
-makedepends=(libxaw openmpi givaro mpfi fplll normaliz polymake boost c-xsc)
+makedepends=(libxaw openmpi givaro mpfi normaliz polymake boost c-xsc) # fplll
 
 prepare() {
   cd gap4r8
@@ -34,6 +34,12 @@
   patch -p1 -i ../gap-polymake-3.1.patch
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata/PackageInfo.g
+# Disable fplll in float package, doesn't support 5.2
+  pushd pkg/float-*
+sed -e '/FPLLL/d' -i configure.ac
+sed -e '39,44d' -i src/Makefile.am
+./autogen.sh
+  popd
 }
 
 build() {
@@ -98,7 +104,7 @@
 package_gap-packages() {
   depends=(gap)
   optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake 
interface package' 'libxaw: xgap package'
-  'c-xsc: float package' 'mpfi: float package' 'fplll: float 
package' 'libmpc: float package')
+  'c-xsc: float package' 'mpfi: float package' 'libmpc: float 
package') # 'fplll: float package'
   pkgdesc="Extra packages for GAP"
   cd gap4r8
 


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-08-30 Thread Antonio Rojas
Date: Wednesday, August 30, 2017 @ 14:28:27
  Author: arojas
Revision: 254782

Update to 4.8.8

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-30 13:51:51 UTC (rev 254781)
+++ PKGBUILD2017-08-30 14:28:27 UTC (rev 254782)
@@ -5,9 +5,9 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.7
-_gapver=4r8p7_2017_03_24-21_21
-pkgrel=4
+pkgver=4.8.8
+_gapver=4r8p8_2017_08_20-15_12
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="https://www.gap-system.org/";
@@ -14,10 +14,10 @@
 license=(GPL)
 source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch
 gap-polymake-3.1.patch)
-sha256sums=('e23d963da3546b9b7c09f9e453f73cc9d25988fe5faae898f691d7e0230c899e'
+sha256sums=('5437b8127464065b9b5dc178ff22a716e92422bc7527d30ad462260df5011a7b'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'
 '6d8d57a9947575a3f95e682172040618be3d6a144424496229ae4ec50c0ab4e9')
-makedepends=(libxaw openmpi givaro mpfi fplll normaliz polymake git)
+makedepends=(libxaw openmpi givaro mpfi fplll normaliz polymake boost c-xsc)
 
 prepare() {
   cd gap4r8
@@ -42,9 +42,9 @@
   make
 
   cd pkg
+  export CXXFLAGS+=' -I/usr/include/cxsc' # Fix build of float package
   sh ../bin/BuildPackages.sh
 # These packages fail to build:
-# float (doesn't support fplll 5)
 # linboxing (doesn't support givaro 4)
 
   cd ../etc
@@ -97,7 +97,8 @@
 
 package_gap-packages() {
   depends=(gap)
-  optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake 
interface package' 'libxaw: xgap package')
+  optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake 
interface package' 'libxaw: xgap package'
+  'c-xsc: float package' 'mpfi: float package' 'fplll: float 
package' 'libmpc: float package')
   pkgdesc="Extra packages for GAP"
   cd gap4r8
 


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-08-22 Thread Antonio Rojas
Date: Tuesday, August 22, 2017 @ 17:02:44
  Author: arojas
Revision: 252969

https

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-22 16:57:23 UTC (rev 252968)
+++ PKGBUILD2017-08-22 17:02:44 UTC (rev 252969)
@@ -10,9 +10,9 @@
 pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
-url="http://www.gap-system.org/";
+url="https://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch
+source=("https://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch
 gap-polymake-3.1.patch)
 sha256sums=('e23d963da3546b9b7c09f9e453f73cc9d25988fe5faae898f691d7e0230c899e'
 'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2'


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-08-20 Thread Antonio Rojas
Date: Sunday, August 20, 2017 @ 08:34:55
  Author: arojas
Revision: 252644

Don't load xgap in sonata package, it breaks Sagemath (FS#55174)

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-20 07:00:04 UTC (rev 252643)
+++ PKGBUILD2017-08-20 08:34:55 UTC (rev 252644)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.7
 _gapver=4r8p7_2017_03_24-21_21
-pkgrel=3
+pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
@@ -32,6 +32,8 @@
   patch -p1 -i ../gap-no-packages-by-default.patch
 # Fix build of PolymakeInterface with polymake 3.1
   patch -p1 -i ../gap-polymake-3.1.patch
+# Fix https://bugs.archlinux.org/task/55174
+  sed -e '/xgap/d' -i pkg/sonata/PackageInfo.g
 }
 
 build() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-07-10 Thread Antonio Rojas
Date: Monday, July 10, 2017 @ 21:02:00
  Author: arojas
Revision: 243790

PIE rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-10 20:31:36 UTC (rev 243789)
+++ PKGBUILD2017-07-10 21:02:00 UTC (rev 243790)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.7
 _gapver=4r8p7_2017_03_24-21_21
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2017-06-09 Thread Antonio Rojas
Date: Friday, June 9, 2017 @ 19:02:19
  Author: arojas
Revision: 235685

openmpi 2 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-09 18:59:30 UTC (rev 235684)
+++ PKGBUILD2017-06-09 19:02:19 UTC (rev 235685)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.7
 _gapver=4r8p7_2017_03_24-21_21
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD gap-fr-build.patch)

2017-03-31 Thread Antonio Rojas
Date: Friday, March 31, 2017 @ 07:23:25
  Author: arojas
Revision: 220154

Update to 4.8.7

Modified:
  gap/trunk/PKGBUILD
Deleted:
  gap/trunk/gap-fr-build.patch

+
 PKGBUILD   |   17 
 gap-fr-build.patch | 9072 ---
 2 files changed, 6 insertions(+), 9083 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 220153:220154 to see the changes.


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-11-26 Thread Antonio Rojas
Date: Saturday, November 26, 2016 @ 19:41:11
  Author: arojas
Revision: 196945

Fix build of guava package

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-26 19:34:39 UTC (rev 196944)
+++ PKGBUILD2016-11-26 19:41:11 UTC (rev 196945)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.6
 _gapver=4r8p6_2016_11_12-14_25
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
@@ -22,6 +22,10 @@
 
 # Use system normaliz
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
+# Fix build if guava package
+  sed -e "s|MAKE=make|MAKE='make -j1'|" -i bin/BuildPackages.sh
+  sed -e '/cd leon make/d' -i pkg/guava-*/src/Makefile
+  sed -e '/AM_INIT_AUTOMAKE/d' -i pkg/guava-*/src/leon/configure.ac
 # Don't load any packages by default
   patch -p1 -i ../gap-no-packages-by-default.patch
 }
@@ -34,12 +38,9 @@
   cd pkg
   sh ../bin/BuildPackages.sh
 # These packages fail to build:
-# carat
 # float (doesn't support fplll 5)
 # fr https://github.com/gap-packages/fr/issues/16
-# guava
 # linboxing (doesn't support givaro 4)
-# qaos 
 
   cd ../etc
   sh install-tools.sh
@@ -62,11 +63,13 @@
   install -m755 "$pkgdir"/usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
 
 # fix location
-  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/gap  
+  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/gap -i 
"$pkgdir"/usr/lib/gap/bin/*/sysinfo.gap  
+
 # remove unneeded stuff
   rm "$pkgdir"/usr/lib/gap/bin/*/*.o
   rm "$pkgdir"/usr/lib/gap/bin/gap.sh
   find "$pkgdir"/usr/lib/gap/bin/ -maxdepth 1 -type f -exec rm {} \;
+  rm -r "$pkgdir"/usr/lib/gap/bin/*/{config*,extern,gac,Makefile}
 }
 
 package_gap-data() {


[arch-commits] Commit in gap/trunk (PKGBUILD gap-no-packages-by-default.patch)

2016-11-25 Thread Antonio Rojas
Date: Friday, November 25, 2016 @ 19:47:23
  Author: arojas
Revision: 196871

Update to 4.8.6, disable package auto-loading

Added:
  gap/trunk/gap-no-packages-by-default.patch
Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 gap-no-packages-by-default.patch |   13 +
 2 files changed, 25 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-25 19:11:54 UTC (rev 196870)
+++ PKGBUILD2016-11-25 19:47:23 UTC (rev 196871)
@@ -5,21 +5,25 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.3
-_gapver=4r8p3_2016_03_19-22_17
-pkgrel=4
+pkgver=4.8.6
+_gapver=4r8p6_2016_11_12-14_25
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz";)
-sha256sums=('667fbbe4b6f2626b799b977a4ca12e9373e0878a6771a94d217bab412405abe6')
-makedepends=(libxaw libxt openmpi givaro mpfi fplll normaliz polymake)
+source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz"; 
gap-no-packages-by-default.patch)
+sha256sums=('a9df4c49b2feb5dd7b8c4f093f6558bdd7a6c1b3f5f64971c4d9e74828eb0cd4'
+'e8f19968d998172b7c289d0499b8b8a05bc31119a1ce073181d3842ece6fe3a2')
+makedepends=(libxaw openmpi givaro mpfi fplll normaliz polymake git)
 
 prepare() {
   cd gap4r8
-# Fix build of cohomolo package
-  sed -e 's|cd cohomolo|cd cohomolo*|' -i bin/BuildPackages.sh
+
+# Use system normaliz
+  sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
+# Don't load any packages by default
+  patch -p1 -i ../gap-no-packages-by-default.patch
 }
 
 build() {

Added: gap-no-packages-by-default.patch
===
--- gap-no-packages-by-default.patch(rev 0)
+++ gap-no-packages-by-default.patch2016-11-25 19:47:23 UTC (rev 196871)
@@ -0,0 +1,13 @@
+--- gap4r8/lib/package.gi.orig 2016-11-25 18:59:02.234113245 +
 gap4r8/lib/package.gi  2016-11-25 18:59:53.093996139 +
+@@ -1743,9 +1743,7 @@
+ For backwards compatibility, the default lists most of packages \
+ that were autoloaded in GAP 4.4 (add or remove packages as you like)."
+ ],
+-  default:= [ "autpgrp", "alnuth", "crisp", "ctbllib", "factint", "fga", 
+-  "irredsol", "laguna", "polenta", "polycyclic", "resclasses", 
+-  "sophus", "tomlib" ],
++  default:= [ ],
+   values:= function() return RecNames( GAPInfo.PackagesInfo ); end,
+   multi:= true,
+   ) );


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-11-24 Thread Antonio Rojas
Date: Thursday, November 24, 2016 @ 22:05:46
  Author: arojas
Revision: 196757

Fix build of some packages

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   43 +--
 1 file changed, 33 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-24 21:53:36 UTC (rev 196756)
+++ PKGBUILD2016-11-24 22:05:46 UTC (rev 196757)
@@ -5,26 +5,44 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.6
-pkgrel=1
+pkgver=4.8.3
+_gapver=4r8p3_2016_03_19-22_17
+pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap4r8p6_2016_11_12-14_25.tar.gz";)
-sha256sums=('a9df4c49b2feb5dd7b8c4f093f6558bdd7a6c1b3f5f64971c4d9e74828eb0cd4')
+source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz";)
+sha256sums=('667fbbe4b6f2626b799b977a4ca12e9373e0878a6771a94d217bab412405abe6')
+makedepends=(libxaw libxt openmpi givaro mpfi fplll normaliz polymake)
 
+prepare() {
+  cd gap4r8
+# Fix build of cohomolo package
+  sed -e 's|cd cohomolo|cd cohomolo*|' -i bin/BuildPackages.sh
+}
+
 build() {
   cd gap4r8
-  ./configure --prefix=/usr --with-gmp=system
+  CC=mpicc ./configure --prefix=/usr --with-gmp=system
   make
 
   cd pkg
-  ../bin/BuildPackages.sh
+  sh ../bin/BuildPackages.sh
+# These packages fail to build:
+# carat
+# float (doesn't support fplll 5)
+# fr https://github.com/gap-packages/fr/issues/16
+# guava
+# linboxing (doesn't support givaro 4)
+# qaos 
+
+  cd ../etc
+  sh install-tools.sh
 }
 
 package_gap() {
-  depends=(gmp)
+  depends=(gmp openmpi)
   optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 
'gap-doc: documentation')
   replaces=(gap-math)
   conflicts=(gap-math)
@@ -31,16 +49,20 @@
   cd gap4r8
   
   mkdir -p "$pkgdir"/usr/lib/gap
-  cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
+  cp -r bin etc grp lib CITATION "$pkgdir"/usr/lib/gap
   
   mkdir -p "$pkgdir"/usr/lib/gap/pkg
   cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
 
   mkdir -p "$pkgdir"/usr/bin
-  ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
+  install -m755 "$pkgdir"/usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
 
 # fix location
-  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i 
"$pkgdir"/usr/lib/gap/bin/gap.sh  
+  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/gap  
+# remove unneeded stuff
+  rm "$pkgdir"/usr/lib/gap/bin/*/*.o
+  rm "$pkgdir"/usr/lib/gap/bin/gap.sh
+  find "$pkgdir"/usr/lib/gap/bin/ -maxdepth 1 -type f -exec rm {} \;
 }
 
 package_gap-data() {
@@ -63,6 +85,7 @@
 
 package_gap-packages() {
   depends=(gap)
+  optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake 
interface package' 'libxaw: xgap package')
   pkgdesc="Extra packages for GAP"
   cd gap4r8
 


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-11-24 Thread Lukas Fleischer
Date: Thursday, November 24, 2016 @ 10:35:31
  Author: lfleischer
Revision: 196663

Prepare GAP 4.8.6, build packages

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-24 10:35:18 UTC (rev 196662)
+++ PKGBUILD2016-11-24 10:35:31 UTC (rev 196663)
@@ -5,19 +5,22 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.5
+pkgver=4.8.6
 pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap48/tar.bz2/gap4r8p5_2016_09_25-11_49.tar.bz2";)
-sha256sums=('08153c57e103a3899fb9603b976e3c3b581dd3f51f973db97ba73501b76967ab')
+source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap4r8p6_2016_11_12-14_25.tar.gz";)
+sha256sums=('a9df4c49b2feb5dd7b8c4f093f6558bdd7a6c1b3f5f64971c4d9e74828eb0cd4')
 
 build() {
   cd gap4r8
   ./configure --prefix=/usr --with-gmp=system
   make
+
+  cd pkg
+  ../bin/BuildPackages.sh
 }
 
 package_gap() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-11-13 Thread Antonio Rojas
Date: Sunday, November 13, 2016 @ 23:19:17
  Author: arojas
Revision: 195545

Update to 4.8.5

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-13 23:11:32 UTC (rev 195544)
+++ PKGBUILD2016-11-13 23:19:17 UTC (rev 195545)
@@ -5,14 +5,14 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.3
-pkgrel=3
+pkgver=4.8.5
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap48/tar.bz2/gap4r8p3_2016_03_19-22_17.tar.bz2";)
-sha256sums=('81d358109d87014eb10d1325c38ee94aa968b2a6365afd1a7411bfdd44f7a454')
+source=("http://www.gap-system.org/pub/gap/gap48/tar.bz2/gap4r8p5_2016_09_25-11_49.tar.bz2";)
+sha256sums=('08153c57e103a3899fb9603b976e3c3b581dd3f51f973db97ba73501b76967ab')
 
 build() {
   cd gap4r8


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-11-06 Thread Evangelos Foutras
Date: Sunday, November 6, 2016 @ 21:15:28
  Author: foutrelis
Revision: 194817

readline 7.0 rebuild

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-06 20:56:10 UTC (rev 194816)
+++ PKGBUILD2016-11-06 21:15:28 UTC (rev 194817)
@@ -6,7 +6,7 @@
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-04-04 Thread Antonio Rojas
Date: Monday, April 4, 2016 @ 22:06:47
  Author: arojas
Revision: 169499

Fix launcher script

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-04 19:57:04 UTC (rev 169498)
+++ PKGBUILD2016-04-04 20:06:47 UTC (rev 169499)
@@ -6,7 +6,7 @@
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
@@ -37,7 +37,7 @@
   ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
 
 # fix location
-  sed -e 's|/build/gap/src/gap4r7|/usr/lib/gap|' -i 
"$pkgdir"/usr/lib/gap/bin/gap.sh  
+  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i 
"$pkgdir"/usr/lib/gap/bin/gap.sh  
 }
 
 package_gap-data() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-03-29 Thread Antonio Rojas
Date: Tuesday, March 29, 2016 @ 09:28:53
  Author: arojas
Revision: 168760

Update to 4.8.3

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-29 07:19:48 UTC (rev 168759)
+++ PKGBUILD2016-03-29 07:28:53 UTC (rev 168760)
@@ -5,17 +5,17 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.7.9
+pkgver=4.8.3
 pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p9_2015_11_29-20_35.tar.bz2";)
-sha256sums=('0673b98f2f9246e9e10ef63ea8b3b359026a9219a5912dccde8d24bf6bec373c')
+source=("http://www.gap-system.org/pub/gap/gap48/tar.bz2/gap4r8p3_2016_03_19-22_17.tar.bz2";)
+sha256sums=('81d358109d87014eb10d1325c38ee94aa968b2a6365afd1a7411bfdd44f7a454')
 
 build() {
-  cd gap4r7
+  cd gap4r8
   ./configure --prefix=/usr --with-gmp=system
   make
 }
@@ -25,7 +25,7 @@
   optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 
'gap-doc: documentation')
   replaces=(gap-math)
   conflicts=(gap-math)
-  cd gap4r7
+  cd gap4r8
   
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
@@ -43,7 +43,7 @@
 package_gap-data() {
   depends=(gap)
   pkgdesc="Additional databases for GAP"
-  cd gap4r7
+  cd gap4r8
 
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r prim small trans "$pkgdir"/usr/lib/gap
@@ -52,7 +52,7 @@
 package_gap-doc() {
   depends=(gap)
   pkgdesc="Documentation for GAP"
-  cd gap4r7
+  cd gap4r8
 
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r doc "$pkgdir"/usr/lib/gap
@@ -61,7 +61,7 @@
 package_gap-packages() {
   depends=(gap)
   pkgdesc="Extra packages for GAP"
-  cd gap4r7
+  cd gap4r8
 
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r pkg "$pkgdir"/usr/lib/gap


[arch-commits] Commit in gap/trunk (PKGBUILD)

2016-01-01 Thread Antonio Rojas
Date: Friday, January 1, 2016 @ 22:35:16
  Author: arojas
Revision: 155150

Update to 4.7.9

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-01 20:56:53 UTC (rev 155149)
+++ PKGBUILD2016-01-01 21:35:16 UTC (rev 155150)
@@ -5,14 +5,14 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.7.8
+pkgver=4.7.9
 pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/";
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p8_2015_06_09-20_27.tar.bz2";)
-sha256sums=('d1643d0258a0cb037acbe132aacf888bc2b832afb9c4a284d27310c5ad07233e')
+source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p9_2015_11_29-20_35.tar.bz2";)
+sha256sums=('0673b98f2f9246e9e10ef63ea8b3b359026a9219a5912dccde8d24bf6bec373c')
 
 build() {
   cd gap4r7


[arch-commits] Commit in gap/trunk (PKGBUILD)

2015-06-19 Thread Antonio Rojas
Date: Friday, June 19, 2015 @ 20:57:20
  Author: arojas
Revision: 135587

Update to 4.7.8

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-19 17:17:28 UTC (rev 135586)
+++ PKGBUILD2015-06-19 18:57:20 UTC (rev 135587)
@@ -4,15 +4,15 @@
 # Contributor: Rémy Oudompheng 
 
 pkgbase=gap
-pkgname=('gap' 'gap-data' 'gap-doc' 'gap-packages')
-pkgver=4.7.7
+pkgname=(gap gap-data gap-doc gap-packages)
+pkgver=4.7.8
 pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.gap-system.org/";
-license=('GPL')
-source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p7_2015_02_13-15_29.tar.bz2";)
-sha256sums=('3a80bd46def5ea5387b283dc51fedcfcd6b3e4ec766f199df36d6ee30161c7c0')
+license=(GPL)
+source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p8_2015_06_09-20_27.tar.bz2";)
+sha256sums=('d1643d0258a0cb037acbe132aacf888bc2b832afb9c4a284d27310c5ad07233e')
 
 build() {
   cd gap4r7
@@ -21,10 +21,10 @@
 }
 
 package_gap() {
-  depends=('gmp')
+  depends=(gmp)
   optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 
'gap-doc: documentation')
-  replaces=('gap-math')
-  conflicts=('gap-math')
+  replaces=(gap-math)
+  conflicts=(gap-math)
   cd gap4r7
   
   mkdir -p "$pkgdir"/usr/lib/gap
@@ -41,7 +41,7 @@
 }
 
 package_gap-data() {
-  depends=('gap')
+  depends=(gap)
   pkgdesc="Additional databases for GAP"
   cd gap4r7
 
@@ -50,7 +50,7 @@
 }
 
 package_gap-doc() {
-  depends=('gap')
+  depends=(gap)
   pkgdesc="Documentation for GAP"
   cd gap4r7
 
@@ -59,7 +59,7 @@
 }
 
 package_gap-packages() {
-  depends=('gap')
+  depends=(gap)
   pkgdesc="Extra packages for GAP"
   cd gap4r7
 


[arch-commits] Commit in gap/trunk (PKGBUILD)

2015-02-17 Thread Antonio Rojas
Date: Tuesday, February 17, 2015 @ 09:17:26
  Author: arojas
Revision: 127830

Update to 4.7.7

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-17 07:45:02 UTC (rev 127829)
+++ PKGBUILD2015-02-17 08:17:26 UTC (rev 127830)
@@ -5,14 +5,14 @@
 
 pkgbase=gap
 pkgname=('gap' 'gap-data' 'gap-doc' 'gap-packages')
-pkgver=4.7.6
-pkgrel=4
+pkgver=4.7.7
+pkgrel=1
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=('i686' 'x86_64')
 url="http://www.gap-system.org/";
 license=('GPL')
-source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p6_2014_11_15-20_02.tar.bz2";)
-sha256sums=('cfcc6efb6ea79a38efad6031eb8bedbc6474f47dc32c53bd7bada2febdb32b4a')
+source=("http://www.gap-system.org/pub/gap/gap47/tar.bz2/gap4r7p7_2015_02_13-15_29.tar.bz2";)
+sha256sums=('3a80bd46def5ea5387b283dc51fedcfcd6b3e4ec766f199df36d6ee30161c7c0')
 
 build() {
   cd gap4r7


[arch-commits] Commit in gap/trunk (PKGBUILD)

2015-01-20 Thread Antonio Rojas
Date: Tuesday, January 20, 2015 @ 23:33:19
  Author: arojas
Revision: 126328

Cleanup package, split off large databases and docs

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   40 ++--
 1 file changed, 26 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 21:05:44 UTC (rev 126327)
+++ PKGBUILD2015-01-20 22:33:19 UTC (rev 126328)
@@ -3,10 +3,10 @@
 # Contributor: Rémy Oudompheng 
 
 pkgbase=gap
-pkgname=('gap' 'gap-packages')
+pkgname=('gap' 'gap-data' 'gap-doc' 'gap-packages')
 pkgver=4.7.6
-pkgrel=3
-pkgdesc="GAP: a system for computational discrete algebra"
+pkgrel=4
+pkgdesc="Groups, Algorithms, Programming: a system for computational discrete 
algebra"
 arch=('i686' 'x86_64')
 url="http://www.gap-system.org/";
 license=('GPL')
@@ -21,23 +21,17 @@
 
 package_gap() {
   depends=('gmp')
-  optdepends=('gap-packages: extra packages')
+  optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 
'gap-doc: documentation')
   replaces=('gap-math')
   conflicts=('gap-math')
   cd gap4r7
   
   mkdir -p "$pkgdir"/usr/lib/gap
-  cp -r * "$pkgdir"/usr/lib/gap
+  cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
+  
+  mkdir -p "$pkgdir"/usr/lib/gap/pkg
+  cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
 
-# move pkg to gap-packages, except for GAPDoc
-  mv "$pkgdir"/usr/lib/gap/pkg{,0}
-  mkdir "$pkgdir"/usr/lib/gap/pkg
-  mv "$pkgdir"/usr/lib/gap/pkg0/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
-  rm -r "$pkgdir"/usr/lib/gap/pkg0
-
-# remove leftover source files
-  rm -r "$pkgdir"/usr/lib/gap/extern
-
   mkdir -p "$pkgdir"/usr/bin
   ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
 
@@ -45,6 +39,24 @@
   sed -e 's|/build/gap/src/gap4r7|/usr/lib/gap|' -i 
"$pkgdir"/usr/lib/gap/bin/gap.sh  
 }
 
+package_gap-data() {
+  depends=('gap')
+  pkgdesc="Additional databases for GAP"
+  cd gap4r7
+
+  mkdir -p "$pkgdir"/usr/lib/gap
+  cp -r prim small trans "$pkgdir"/usr/lib/gap
+}
+
+package_gap-doc() {
+  depends=('gap')
+  pkgdesc="Documentation for GAP"
+  cd gap4r7
+
+  mkdir -p "$pkgdir"/usr/lib/gap
+  cp -r doc "$pkgdir"/usr/lib/gap
+}
+
 package_gap-packages() {
   depends=('gap')
   pkgdesc="Extra packages for GAP"


[arch-commits] Commit in gap/trunk (PKGBUILD)

2014-12-22 Thread Antonio Rojas
Date: Monday, December 22, 2014 @ 23:31:55
  Author: arojas
Revision: 124372

Keep GAPDoc pkg in main package, otherwise Sage interface breaks

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-22 22:13:47 UTC (rev 124371)
+++ PKGBUILD2014-12-22 22:31:55 UTC (rev 124372)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=('gap' 'gap-packages')
 pkgver=4.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc="GAP: a system for computational discrete algebra"
 arch=('i686' 'x86_64')
 url="http://www.gap-system.org/";
@@ -29,8 +29,11 @@
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r * "$pkgdir"/usr/lib/gap
 
-# move to gap-packages
-  rm -r "$pkgdir"/usr/lib/gap/pkg
+# move pkg to gap-packages, except for GAPDoc
+  mv "$pkgdir"/usr/lib/gap/pkg{,0}
+  mkdir "$pkgdir"/usr/lib/gap/pkg
+  mv "$pkgdir"/usr/lib/gap/pkg0/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
+  rm -r "$pkgdir"/usr/lib/gap/pkg0
 
 # remove leftover source files
   rm -r "$pkgdir"/usr/lib/gap/extern
@@ -49,4 +52,7 @@
 
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r pkg "$pkgdir"/usr/lib/gap
+
+# GAPDoc is in main package
+  rm -r "$pkgdir"/usr/lib/gap/pkg/GAPDoc-*
 }


[arch-commits] Commit in gap/trunk (PKGBUILD)

2014-12-22 Thread Antonio Rojas
Date: Monday, December 22, 2014 @ 11:16:44
  Author: arojas
Revision: 124354

Fix binaries path

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-22 09:58:30 UTC (rev 124353)
+++ PKGBUILD2014-12-22 10:16:44 UTC (rev 124354)
@@ -5,7 +5,7 @@
 pkgbase=gap
 pkgname=('gap' 'gap-packages')
 pkgver=4.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="GAP: a system for computational discrete algebra"
 arch=('i686' 'x86_64')
 url="http://www.gap-system.org/";
@@ -37,6 +37,9 @@
 
   mkdir -p "$pkgdir"/usr/bin
   ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
+
+# fix location
+  sed -e 's|/build/gap/src/gap4r7|/usr/lib/gap|' -i 
"$pkgdir"/usr/lib/gap/bin/gap.sh  
 }
 
 package_gap-packages() {


[arch-commits] Commit in gap/trunk (PKGBUILD)

2014-12-21 Thread Antonio Rojas
Date: Sunday, December 21, 2014 @ 09:22:12
  Author: arojas
Revision: 124252

Remove some useless stuff

Modified:
  gap/trunk/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 5 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-21 02:22:38 UTC (rev 124251)
+++ PKGBUILD2014-12-21 08:22:12 UTC (rev 124252)
@@ -28,8 +28,13 @@
   
   mkdir -p "$pkgdir"/usr/lib/gap
   cp -r * "$pkgdir"/usr/lib/gap
+
+# move to gap-packages
   rm -r "$pkgdir"/usr/lib/gap/pkg
 
+# remove leftover source files
+  rm -r "$pkgdir"/usr/lib/gap/extern
+
   mkdir -p "$pkgdir"/usr/bin
   ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
 }