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

[Antonio Rojas]

    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
===================================================================
--- PKGBUILD	2018-07-07 11:07:14 UTC (rev 353959)
+++ PKGBUILD	2018-07-07 11:30:01 UTC (rev 353960)
@@ -4,28 +4,26 @@
 # Contributor: Rémy Oudompheng <oudomphe at clipper.ens.fr>
 
 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' 'fplll: float package' 'zeromq: ZeroMQ interface package') # 'polymake: Polymake interface package'
   pkgdesc="Extra packages for GAP"
-  cd gap4r8
+  cd gap-$pkgver
 
   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-*
+# provided by main gap package
+  rm -r "$pkgdir"/usr/lib/gap/pkg/{GAPDoc-*,primgrp-*,SmallGrp-*,transgrp}
 }