Update to 4.0.1

2 files changed, 42 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00d90fe2a885..54507e108953 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr 29 22:06:13 UTC 2017
+# Sun Sep 17 16:30:26 UTC 2017
 pkgbase = scipoptsuite
 	pkgdesc = Toolbox for generating and solving optimization problems.
-	pkgver = 4.0.0
-	pkgrel = 3
+	pkgver = 4.0.1
+	pkgrel = 1
 	url = http://scip.zib.de
 	arch = i686
 	arch = x86_64
@@ -16,18 +16,18 @@ pkgbase = scipoptsuite
 	makedepends = gmp
 	makedepends = readline
 	replaces = ziboptsuite
-	source = http://scip.zib.de/download/release/scipoptsuite-4.0.0.tgz
-	sha256sums = 087535760eae3d633e2515d942a9b22e1f16332c022be8d093372bdc68e8a661
+	source = http://scip.zib.de/download/release/scipoptsuite-4.0.1.tgz
+	sha256sums = 72f2a0d79f3f8b615ad98fba6343d03ebbf644a6ba089ad6ad47577e189e2946
 
 pkgname = scipoptsuite
 	depends = zlib
 	depends = gmp
 	depends = readline
-	provides = scip=4.0.0
-	provides = soplex=3.0.0
+	provides = scip=4.0.1
+	provides = soplex=3.0.1
 	provides = zimpl=3.3.4
 	provides = gcg=2.1.2
-	provides = ug=0.8.3
+	provides = ug=0.8.4
 
 pkgname = scipoptsuite-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index e5fbd3f2a9cc..edd9a94fe6a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase='scipoptsuite'
 pkgname=("${pkgbase}" "${pkgbase}-docs")
-pkgver='4.0.0'
-pkgrel=3
+pkgver='4.0.1'
+pkgrel=1
 pkgdesc="Toolbox for generating and solving optimization problems."
 arch=('i686' 'x86_64')
 url='http://scip.zib.de'
@@ -14,31 +14,15 @@ license=('LGPL3' 'custom:ZIB Academic License')
 replaces=('ziboptsuite')
 _depends=('zlib' 'gmp' 'readline')
 makedepends=('chrpath' 'doxygen' 'graphviz' "${_depends[@]}")
-_provides=('scip=4.0.0' 'soplex=3.0.0' 'zimpl=3.3.4' 'gcg=2.1.2' 'ug=0.8.3')
+_provides=('scip=4.0.1' 'soplex=3.0.1' 'zimpl=3.3.4' 'gcg=2.1.2' 'ug=0.8.4')
 source=("http://scip.zib.de/download/release/${pkgbase}-${pkgver}.tgz")
-sha256sums=('087535760eae3d633e2515d942a9b22e1f16332c022be8d093372bdc68e8a661')
-
-# Extract directory names from the $provides array.
-_scip="${_provides[0]//=/-}"
-_soplex="${_provides[1]//=/-}"
-_zimpl="${_provides[2]//=/-}"
-_gcg="${_provides[3]//=/-}"
-_ug="${_provides[4]//=/-}"
+sha256sums=('72f2a0d79f3f8b615ad98fba6343d03ebbf644a6ba089ad6ad47577e189e2946')
 
 prepare() {
     cd "${srcdir}/${pkgbase}-${pkgver}"
 
-    # Unpack and remove archives, otherwise patching wouldn't be possible
-    for _pkg in "${_provides[@]}"; do
-        _archive="${_pkg//=/-}.tgz"
-
-        tar xzf "${_archive}"
-
-        rm "${_archive}"
-    done
-
     # Fix ZIMPL linking
-    sed -i 's/LDFLAGS		+=	-static//g' ${_zimpl}/make/make.linux.*
+    sed -i 's/LDFLAGS\s*+=\s*-static//g' zimpl/make/make.linux.*
 }
 
 build() {
@@ -49,14 +33,11 @@ build() {
     make BLISS=false gcg
     make ug
 
-    cd "${srcdir}/${pkgbase}-${pkgver}/${_scip}"
-    make doc -j
-
-    cd "${srcdir}/${pkgbase}-${pkgver}/${_soplex}"
-    make doc -j
+    for _pkg in scip soplex gcg; do
+        cd "${srcdir}/${pkgbase}-${pkgver}/${_pkg}"
 
-    cd "${srcdir}/${pkgbase}-${pkgver}/${_gcg}"
-    make doc -j
+        make doc -j
+    done
 
     # Some files have permission 640.
     # @FIXME: Future versions might not require this line.
@@ -77,39 +58,39 @@ _package() {
     cd "${srcdir}/${pkgbase}-${pkgver}"
 
     # A local RPATH is set, get rid of it.
-    chrpath --delete ${_scip}/bin/scip
-    chrpath --delete ${_soplex}/bin/soplex
-    chrpath --delete ${_gcg}/bin/gcg
-    chrpath --delete ${_ug}/bin/fscip
+    chrpath --delete scip/bin/scip
+    chrpath --delete soplex/bin/soplex
+    chrpath --delete gcg/bin/gcg
+    chrpath --delete ug/bin/fscip
 
     #
     # Binaries
     #
-    install -D -m755 ${_soplex}/bin/soplex "${pkgdir}/usr/bin/soplex"
-    install -D -m755 ${_scip}/bin/scip "${pkgdir}/usr/bin/scip"
-    install -D -m755 ${_zimpl}/bin/zimpl "${pkgdir}/usr/bin/zimpl"
-    install -D -m755 ${_gcg}/bin/gcg "${pkgdir}/usr/bin/gcg"
-    install -D -m755 ${_ug}/bin/fscip "${pkgdir}/usr/bin/fscip"
+    install -D -m755 soplex/bin/soplex "${pkgdir}/usr/bin/soplex"
+    install -D -m755 scip/bin/scip "${pkgdir}/usr/bin/scip"
+    install -D -m755 zimpl/bin/zimpl "${pkgdir}/usr/bin/zimpl"
+    install -D -m755 gcg/bin/gcg "${pkgdir}/usr/bin/gcg"
+    install -D -m755 ug/bin/fscip "${pkgdir}/usr/bin/fscip"
 
     #
     # Includes
     #
     mkdir -p "${pkgdir}/usr/include/"{blockmemshell,lpi,nlpi,objscip,scip,soplex,zimpl}
-    cp ${_scip}/src/blockmemshell/*.h "${pkgdir}/usr/include/blockmemshell"
-    cp ${_scip}/src/lpi/*.h "${pkgdir}/usr/include/lpi"
-    cp ${_scip}/src/nlpi/*.h "${pkgdir}/usr/include/nlpi"
-    cp ${_scip}/src/objscip/*.h "${pkgdir}/usr/include/objscip"
-    cp ${_scip}/src/scip/*.h "${pkgdir}/usr/include/scip"
-    cp ${_soplex}/src/*.h "${pkgdir}/usr/include/soplex"
-    cp ${_zimpl}/src/*.h "${pkgdir}/usr/include/zimpl"
+    cp scip/src/blockmemshell/*.h "${pkgdir}/usr/include/blockmemshell"
+    cp scip/src/lpi/*.h "${pkgdir}/usr/include/lpi"
+    cp scip/src/nlpi/*.h "${pkgdir}/usr/include/nlpi"
+    cp scip/src/objscip/*.h "${pkgdir}/usr/include/objscip"
+    cp scip/src/scip/*.h "${pkgdir}/usr/include/scip"
+    cp soplex/src/*.h "${pkgdir}/usr/include/soplex"
+    cp zimpl/src/zimpl/*.h "${pkgdir}/usr/include/zimpl"
 
     #
     # Libraries
     #
     mkdir -p "${pkgdir}/usr/lib/"
-    cp -d ${_scip}/lib/shared/libscip*.so "${pkgdir}/usr/lib/"
-    cp -d ${_soplex}/lib/libsoplex*.so "${pkgdir}/usr/lib/"
-    cp -d ${_zimpl}/lib/libzimpl*.a "${pkgdir}/usr/lib/"
+    cp -d scip/lib/shared/libscip*.so "${pkgdir}/usr/lib/"
+    cp -d soplex/lib/libsoplex*.so "${pkgdir}/usr/lib/"
+    cp -d zimpl/lib/libzimpl*.a "${pkgdir}/usr/lib/"
     cp -d lib/libscipopt*.so "${pkgdir}/usr/lib/"
 
     # Repair "missing links"
@@ -131,12 +112,12 @@ _package-docs() {
     # Documentation
     #
     mkdir -p "${pkgdir}/usr/share/doc/${pkgname}/"{scip,soplex,zimpl,gcg,ug}
-    cp -r ${_scip}/{CHANGELOG,release-notes,doc/html} "${pkgdir}/usr/share/doc/${pkgname}/scip/"
-    cp -r ${_soplex}/{CHANGELOG,doc/html} "${pkgdir}/usr/share/doc/${pkgname}/soplex/"
-    install -m644 ${_soplex}/src/example.cpp "${pkgdir}/usr/share/doc/${pkgname}/soplex/"
-    cp -r ${_zimpl}/{CHANGELOG,README,doc,example} "${pkgdir}/usr/share/doc/${pkgname}/zimpl/"
-    cp -r ${_gcg}/{CHANGELOG,doc/html} "${pkgdir}/usr/share/doc/${pkgname}/gcg/"
-    cp -r ${_ug}/README "${pkgdir}/usr/share/doc/${pkgname}/ug/"
+    cp -r scip/{CHANGELOG,release-notes,doc/html} "${pkgdir}/usr/share/doc/${pkgname}/scip/"
+    cp -r soplex/{CHANGELOG,doc/html} "${pkgdir}/usr/share/doc/${pkgname}/soplex/"
+    install -m644 soplex/src/example.cpp "${pkgdir}/usr/share/doc/${pkgname}/soplex/"
+    cp -r zimpl/{CHANGELOG,README,doc,example} "${pkgdir}/usr/share/doc/${pkgname}/zimpl/"
+    cp -r gcg/{CHANGELOG,doc/html} "${pkgdir}/usr/share/doc/${pkgname}/gcg/"
+    cp -r ug/README "${pkgdir}/usr/share/doc/${pkgname}/ug/"
 
     #
     # License