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

[Antonio Rojas]

    Date: Sunday, May 2, 2021 @ 21:33:42
  Author: arojas
Revision: 926275

Unsplit package

The only user of libgiac is sagemath, which also depends on giac, so splitting it is pointless

Modified:
  giac/trunk/PKGBUILD

----------+
 PKGBUILD |   43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-02 21:28:44 UTC (rev 926274)
+++ PKGBUILD	2021-05-02 21:33:42 UTC (rev 926275)
@@ -1,16 +1,19 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
-pkgbase=giac
-pkgname=(xcas libgiac)
+pkgname=giac
 _pkgver=1.7.0-3
 pkgver=${_pkgver//-/.}
-pkgrel=2
-pkgdesc="A free computer algebra system"
+pkgrel=3
+pkgdesc='A free computer algebra system'
 arch=(x86_64)
-url="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+url='http://www-fourier.ujf-grenoble.fr/~parisse/giac.html'
 license=(GPL3)
-makedepends=(python mpfi gsl pari ntl lapack libpng libjpeg fltk texlive-core texlive-science hevea glpk libao gmp-ecm nauty libsamplerate)
-source=(http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${pkgbase}_${_pkgver}.tar.gz
+depends=(fltk mpfi gsl pari ntl lapack libpng curl glpk libao gmp-ecm libsamplerate)
+makedepends=(python libjpeg texlive-core texlive-science hevea nauty)
+optdepends=('perl: for pgiac')
+replaces=(libgiac xcas)
+provides=(libgiac xcas)
+source=(http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${pkgname}_$_pkgver.tar.gz
         giac-test-pari-2.11.patch
         giac-evalb.patch)
 sha256sums=('181fec9db622571bb568d5c254aeaab29fe5c6310a4f3af5a207e7392f9171f0'
@@ -18,13 +21,13 @@
             '1c20d955192183f2b248c327b2270369dea2961a80b5cdca09083228920c7a07')
 
 prepare() {
-  cd $pkgbase-${pkgver%.*}
+  cd $pkgname-${pkgver%.*}
   patch -p1 < ../giac-test-pari-2.11.patch # Fix tests with pari 2.11
   patch -p1 < ../giac-evalb.patch # Fix evalb
 }
 
 build() {
-  cd $pkgbase-${pkgver%.*}
+  cd $pkgname-${pkgver%.*}
 
   ./configure --prefix=/usr
   make
@@ -31,30 +34,12 @@
 }
 
 check() {
-  cd $pkgbase-${pkgver%.*}
+  cd $pkgname-${pkgver%.*}
 
   make check
 }
 
-package_xcas() {
-  depends=(libgiac fltk)
-  optdepends=('perl: for pgiac')
-  conflicts=(giac)
-  provides=(giac)
-  replaces=(giac)
-
+package() {
   cd $pkgbase-${pkgver%.*}
   make DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir"/usr/{lib,include}
 }
-
-package_libgiac() {
-  pkgdesc="Giac shared library"
-  depends=(mpfi gsl pari ntl lapack libpng curl glpk libao gmp-ecm libsamplerate)
-
-  cd $pkgbase-${pkgver%.*}
-  make DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir"/usr/{bin,share}
-}