Update to v6.0.6 and new gitlab source

2 files changed, 15 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2f935f88f23..4882df1436f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scotch
 	pkgdesc = Software package and libraries for graph, mesh and hypergraph partitioning, static mapping, and sparse matrix block ordering. This is the all-inclusive version (MPI/serial/esmumps).
-	pkgver = 6.0.4
-	pkgrel = 3
+	pkgver = 6.0.6
+	pkgrel = 1
 	url = http://www.labri.fr/perso/pelegrin/scotch/
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,8 @@ pkgbase = scotch
 	conflicts = ptscotch-openmpi
 	conflicts = scotch_esmumps
 	conflicts = scotch_esmumps5
-	source = http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz
-	sha256sums = f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7
+	source = https://gitlab.inria.fr/scotch/scotch/-/archive/v6.0.6/scotch-v6.0.6.tar.gz
+	sha256sums = e932b4c04636fcf5d21b9a76376868de052c9b000bdaf96f8967dcec61bdaa10
 
 pkgname = scotch
 
diff --git a/PKGBUILD b/PKGBUILD
index becfddc466f8..fd4ca1e8ee54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Samuel Williams <ioquatix>
  
 pkgname=scotch
-pkgver=6.0.4
-_downloadnum=34618  # gforge is insane
-pkgrel=3
+pkgver=6.0.6
+pkgrel=1
 pkgdesc="Software package and libraries for graph, mesh and hypergraph partitioning, static mapping, and sparse matrix block ordering. This is the all-inclusive version (MPI/serial/esmumps)."
 url="http://www.labri.fr/perso/pelegrin/scotch/"
 license=("custom:CeCILL-C")
@@ -11,11 +10,11 @@ depends=('zlib' 'openmpi' 'bzip2')
 provides=('ptscotch' 'ptscotch-openmpi' 'scotch_esmumps' 'scotch_ptesmumps')
 conflicts=('ptscotch-openmpi' 'scotch_esmumps' 'scotch_esmumps5')
 arch=('i686' 'x86_64')
-source=("http://gforge.inria.fr/frs/download.php/file/${_downloadnum}/${pkgname}_${pkgver}.tar.gz")
-sha256sums=('f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7')
- 
+source=("https://gitlab.inria.fr/scotch/scotch/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz")
+sha256sums=('e932b4c04636fcf5d21b9a76376868de052c9b000bdaf96f8967dcec61bdaa10')
+
 prepare() {
-  cd "${srcdir}/${pkgname}_${pkgver}/src"
+  cd "${srcdir}/${pkgname}-v${pkgver}/src"
 
   # Apply patch to fix shared library ldflags
   sed -i 's/$(AR) $(ARFLAGS) $(@) $(?)/$(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS)/g' libscotch/Makefile
@@ -29,9 +28,6 @@ prepare() {
   # Fix C compiler
   sed -i "s/CCD\t.*=.*gcc/CCD = mpicc/" Makefile.inc
 
-  # Fix bison/flex
-  sed -i "s/define yywrap/define scotchyywrap/" libscotch/parser_ll.l
-
   # Also enable bzip2 compression
   sed -i "s/-DCOMMON_FILE_COMPRESS_GZ/-DCOMMON_FILE_COMPRESS_GZ -DCOMMON_FILE_COMPRESS_BZ2/" Makefile.inc
   sed -i "s/-lz/-lz -lbz2/" Makefile.inc
@@ -44,7 +40,7 @@ prepare() {
 }
  
 build() {
-  cd "${srcdir}/${pkgname}_${pkgver}/src"
+  cd "${srcdir}/${pkgname}-v${pkgver}/src"
  
   make scotch
   make -j1 esmumps
@@ -57,19 +53,20 @@ build() {
 }
  
 check() {
-  cd "${srcdir}/${pkgname}_${pkgver}/src"
+  cd "${srcdir}/${pkgname}-v${pkgver}/src"
  
   make check LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:../../lib"
   make ptcheck LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:../../lib"
 }
  
 package() {
-  cd "${srcdir}/${pkgname}_${pkgver}/src"
+  cd "${srcdir}/${pkgname}-v${pkgver}/src"
  
   make install prefix="${pkgdir}/usr" includedir="${pkgdir}/usr/include/scotch"
  
   # To avoid conflict with extra/gpart, maybe move the package to /opt/scotch ?
   mv "${pkgdir}/usr/bin/gpart" "${pkgdir}/usr/bin/gpart-scotch"
  
-  install -m 644 -D "${srcdir}/scotch_${pkgver}/doc/CeCILL-C_V1-en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -m 644 -D "../doc/CeCILL-C_V1-en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+