Date: Sunday, October 2, 2022 @ 21:56:42
  Author: arojas
Revision: 1320735

archrelease: copy trunk to community-x86_64

Added:
  gap/repos/community-x86_64/PKGBUILD
    (from rev 1320734, gap/trunk/PKGBUILD)
  gap/repos/community-x86_64/gap.sh
    (from rev 1320734, gap/trunk/gap.sh)
Deleted:
  gap/repos/community-x86_64/PKGBUILD
  gap/repos/community-x86_64/gap.sh

----------+
 PKGBUILD |  298 ++++++++++++++++++++++++++++++-------------------------------
 gap.sh   |   14 +-
 2 files changed, 158 insertions(+), 154 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-02 21:56:28 UTC (rev 1320734)
+++ PKGBUILD    2022-10-02 21:56:42 UTC (rev 1320735)
@@ -1,147 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Contributor:  TDY <[email protected]>
-# Contributor: Rémy Oudompheng <[email protected]>
-
-pkgbase=gap
-pkgname=(gap gap-doc gap-packages)
-pkgver=4.12.0
-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://github.com/gap-system/gap/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz
-        gap.sh)
-sha256sums=('6005d0c0316fe8803d84681f30be64eace83a9542f975f5cb3dedfadd4391849'
-            '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46')
-makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll 
wget chrpath fmt eigen normaliz)
-
-prepare() {
-  cd gap-$pkgver
-
-# Use system libsemigroups
-  sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i 
pkg/semigroups/configure
-# Use system normaliz
-  sed -e 's|.\/build-normaliz.sh|true|' -i bin/BuildPackages.sh
-# 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
-}
-
-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
-  make libgap.la
-
-  # Install libgap so we can link packages against it
-  mkdir -p tmp-install
-  libtool --mode=install install libgap.la "$srcdir"/gap-$pkgver/tmp-install
-  rm "$srcdir"/gap-$pkgver/tmp-install/libgap.la
-
-  cd pkg
-  export CFLAGS+=" -fcommon" # Fix anupq and cohomolo build with GCC 10
-  export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
-  export CXXFLAGS+=" -I/usr/include/eigen3" # Fix build of semigroups
-  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 --strict
-}
-
-_standardpkgs=(gapdoc primgrp smallgrp transgrp atlasrep autpgrp alnuth crisp 
ctbllib factint fga irredsol laguna
-               polenta polycyclic resclasses sophus tomlib)
-
-package_gap() {
-  depends=(gmp zlib)
-  optdepends=('gap-packages: extra packages' 'gap-doc: documentation')
-  cd gap-$pkgver
-
-  install -Dm644 src/*.h -t "$pkgdir"/usr/include/gap
-  install -Dm644 build/config.h -t "$pkgdir"/usr/include/gap
-  install -Dm644 src/hpc/*.h -t "$pkgdir"/usr/include/gap/hpc
-
-  install -d "$pkgdir"/usr/lib
-  libtool --mode=install install libgap.la "$pkgdir"/usr/lib
-
-  mkdir -p "$pkgdir"/usr/{bin,lib/gap/pkg}
-  cp -r grp lib "$pkgdir"/usr/lib/gap
-  for _pkg in ${_standardpkgs[@]}; do
-    cp -r pkg/$_pkg "$pkgdir"/usr/lib/gap/pkg
-  done
-  install -Dm755 gap -t "$pkgdir"/usr/lib/gap
-  sed -e "s|$PWD|/usr/lib/gap|g" -e "s|-I/usr/lib|-I/usr/include|g" -i 
sysinfo.gap
-  cp -ar sysinfo.gap* "$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
-
-# Add provides for bundled packages
-  for _f in "$pkgdir"/usr/lib/gap/pkg/*/PackageInfo.g; do
-    _pkg=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep PackageName | tr '\n' ' ' | 
cut -d '"' -f2 | tr '[:upper:]' '[:lower:]')
-    _ver=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep Version | tr '\n' ' ' | cut 
-d '"' -f2)
-    _prov="gap-$_pkg=${_ver/-/.}"
-    provides+=($_prov)
-  done
-}
-
-package_gap-doc() {
-  depends=(gap)
-  pkgdesc="Documentation for GAP"
-  cd gap-$pkgver
-
-  mkdir -p "$pkgdir"/usr/lib/gap
-  cp -r doc "$pkgdir"/usr/lib/gap
-}
-
-package_gap-packages() {
-  depends=(gap)
-  optdepends=('libxaw: xgap package' 'c-xsc: float package' 'mpfi: float 
package'
-              'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package' 'planarity: digraph package'
-              'curl: curl interface package' 'libsemigroups: semigroups 
package' 'cddlib: CddLib interface package'
-              'normaliz: NormalizInterface package')
-  pkgdesc="Extra packages for GAP"
-  cd gap-$pkgver
-
-  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-$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
-
-# provided by main gap package
-  for _pkg in ${_standardpkgs[@]}; do
-    rm -r "$pkgdir"/usr/lib/gap/pkg/$_pkg
-  done
-
-# fix RPATH
-  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 -r "$pkgdir"/usr/lib/gap/pkg/digraphs/extern
-  rm -r "$pkgdir"/usr/lib/gap/pkg/semigroups/libsemigroups
-  rm -r "$pkgdir"/usr/lib/gap/pkg/caratinterface/carat*
-  rm -r "$pkgdir"/usr/lib/gap/pkg/kbmag/standalone
-  rm -r "$pkgdir"/usr/lib/gap/pkg/log
-
-# Add provides for bundled packages
-  for _f in "$pkgdir"/usr/lib/gap/pkg/*/PackageInfo.g; do
-    _pkg=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep PackageName | tr '\n' ' ' | 
cut -d '"' -f2 | tr '[:upper:]' '[:lower:]')
-    _ver=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep Version | tr '\n' ' ' | cut 
-d '"' -f2)
-    _prov="gap-$_pkg=${_ver/-/.}"
-    provides+=($_prov)
-  done
-}

Copied: gap/repos/community-x86_64/PKGBUILD (from rev 1320734, 
gap/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2022-10-02 21:56:42 UTC (rev 1320735)
@@ -0,0 +1,151 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor:  TDY <[email protected]>
+# Contributor: Rémy Oudompheng <[email protected]>
+
+pkgbase=gap
+pkgname=(gap gap-doc gap-packages)
+pkgver=4.12.0
+pkgrel=3
+pkgdesc='Groups, Algorithms, Programming: a system for computational discrete 
algebra'
+arch=(x86_64)
+url='https://www.gap-system.org/'
+license=(GPL)
+source=(https://github.com/gap-system/gap/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz
+        https://github.com/gap-system/gap/commit/dce6fa96.patch
+        gap.sh)
+sha256sums=('6005d0c0316fe8803d84681f30be64eace83a9542f975f5cb3dedfadd4391849'
+            'd8a362a6c1d27f2925d8b3f8eddc9aaafac1699fb568a035768d039b34ba6eb3'
+            '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46')
+makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll 
wget chrpath fmt eigen normaliz)
+
+prepare() {
+  cd gap-$pkgver
+
+# Fix including headers when no garbage collector is specified
+  patch -p1 < ../dce6fa96.patch
+# Use system libsemigroups
+  sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i 
pkg/semigroups/configure
+# Use system normaliz
+  sed -e 's|.\/build-normaliz.sh|true|' -i bin/BuildPackages.sh
+# 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
+}
+
+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
+  make libgap.la
+
+  # Install libgap so we can link packages against it
+  mkdir -p tmp-install
+  libtool --mode=install install libgap.la "$srcdir"/gap-$pkgver/tmp-install
+  rm "$srcdir"/gap-$pkgver/tmp-install/libgap.la
+
+  cd pkg
+  export CFLAGS+=" -fcommon" # Fix anupq and cohomolo build with GCC 10
+  export CXXFLAGS+=" -I/usr/include/cxsc" # Find c-xsc headers
+  export CXXFLAGS+=" -I/usr/include/eigen3" # Fix build of semigroups
+  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 --strict
+}
+
+_standardpkgs=(gapdoc primgrp smallgrp transgrp atlasrep autpgrp alnuth crisp 
ctbllib factint fga irredsol laguna
+               polenta polycyclic resclasses sophus tomlib)
+
+package_gap() {
+  depends=(gmp zlib)
+  optdepends=('gap-packages: extra packages' 'gap-doc: documentation')
+  cd gap-$pkgver
+
+  install -Dm644 src/*.h -t "$pkgdir"/usr/include/gap
+  install -Dm644 build/config.h -t "$pkgdir"/usr/include/gap
+  install -Dm644 src/hpc/*.h -t "$pkgdir"/usr/include/gap/hpc
+
+  install -d "$pkgdir"/usr/lib
+  libtool --mode=install install libgap.la "$pkgdir"/usr/lib
+
+  mkdir -p "$pkgdir"/usr/{bin,lib/gap/pkg}
+  cp -r grp lib "$pkgdir"/usr/lib/gap
+  for _pkg in ${_standardpkgs[@]}; do
+    cp -r pkg/$_pkg "$pkgdir"/usr/lib/gap/pkg
+  done
+  install -Dm755 gap -t "$pkgdir"/usr/lib/gap
+  sed -e "s|$PWD|/usr/lib/gap|g" -e "s|-I/usr/lib|-I/usr/include|g" -i 
sysinfo.gap
+  cp -ar sysinfo.gap* "$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
+
+# Add provides for bundled packages
+  for _f in "$pkgdir"/usr/lib/gap/pkg/*/PackageInfo.g; do
+    _pkg=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep PackageName | tr '\n' ' ' | 
cut -d '"' -f2 | tr '[:upper:]' '[:lower:]')
+    _ver=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep Version | tr '\n' ' ' | cut 
-d '"' -f2)
+    _prov="gap-$_pkg=${_ver/-/.}"
+    provides+=($_prov)
+  done
+}
+
+package_gap-doc() {
+  depends=(gap)
+  pkgdesc="Documentation for GAP"
+  cd gap-$pkgver
+
+  mkdir -p "$pkgdir"/usr/lib/gap
+  cp -r doc "$pkgdir"/usr/lib/gap
+}
+
+package_gap-packages() {
+  depends=(gap)
+  optdepends=('libxaw: xgap package' 'c-xsc: float package' 'mpfi: float 
package'
+              'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ 
interface package' 'planarity: digraph package'
+              'curl: curl interface package' 'libsemigroups: semigroups 
package' 'cddlib: CddLib interface package'
+              'normaliz: NormalizInterface package')
+  pkgdesc="Extra packages for GAP"
+  cd gap-$pkgver
+
+  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-$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
+
+# provided by main gap package
+  for _pkg in ${_standardpkgs[@]}; do
+    rm -r "$pkgdir"/usr/lib/gap/pkg/$_pkg
+  done
+
+# fix RPATH
+  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 -r "$pkgdir"/usr/lib/gap/pkg/digraphs/extern
+  rm -r "$pkgdir"/usr/lib/gap/pkg/semigroups/libsemigroups
+  rm -r "$pkgdir"/usr/lib/gap/pkg/caratinterface/carat*
+  rm -r "$pkgdir"/usr/lib/gap/pkg/kbmag/standalone
+  rm -r "$pkgdir"/usr/lib/gap/pkg/log
+
+# Add provides for bundled packages
+  for _f in "$pkgdir"/usr/lib/gap/pkg/*/PackageInfo.g; do
+    _pkg=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep PackageName | tr '\n' ' ' | 
cut -d '"' -f2 | tr '[:upper:]' '[:lower:]')
+    _ver=$(cat $_f | sed -ze 's|:=\n|:=|g' | grep Version | tr '\n' ' ' | cut 
-d '"' -f2)
+    _prov="gap-$_pkg=${_ver/-/.}"
+    provides+=($_prov)
+  done
+}

Deleted: gap.sh
===================================================================
--- gap.sh      2022-10-02 21:56:28 UTC (rev 1320734)
+++ gap.sh      2022-10-02 21:56:42 UTC (rev 1320735)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-GAP_ROOT="/usr/lib/gap"
-GAP_DIR=$GAP_ROOT
-GAP_EXE=$GAP_ROOT
-
-exec "$GAP_EXE/gap" -l "$GAP_DIR" "$@"

Copied: gap/repos/community-x86_64/gap.sh (from rev 1320734, gap/trunk/gap.sh)
===================================================================
--- gap.sh                              (rev 0)
+++ gap.sh      2022-10-02 21:56:42 UTC (rev 1320735)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+GAP_ROOT="/usr/lib/gap"
+GAP_DIR=$GAP_ROOT
+GAP_EXE=$GAP_ROOT
+
+exec "$GAP_EXE/gap" -l "$GAP_DIR" "$@"

Reply via email to