Use new CMake build system

While this solves many linking problems, this package no longer
provides gcg, ug and HTML documentation. The reason for that is
that the original build system interferes with the new one, which
makes the compilation slower and unreliable.

2 files changed, 24 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54507e108953..4435442e44e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,30 @@
 # Generated by mksrcinfo v8
-# Sun Sep 17 16:30:26 UTC 2017
+# Tue Dec 12 16:32:09 UTC 2017
 pkgbase = scipoptsuite
 	pkgdesc = Toolbox for generating and solving optimization problems.
 	pkgver = 4.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://scip.zib.de
-	arch = i686
 	arch = x86_64
 	license = LGPL3
 	license = custom:ZIB Academic License
-	makedepends = chrpath
-	makedepends = doxygen
-	makedepends = graphviz
-	makedepends = zlib
+	makedepends = bison
+	makedepends = cmake
+	makedepends = flex
 	makedepends = gmp
 	makedepends = readline
+	makedepends = zlib
 	replaces = ziboptsuite
 	source = http://scip.zib.de/download/release/scipoptsuite-4.0.1.tgz
 	sha256sums = 72f2a0d79f3f8b615ad98fba6343d03ebbf644a6ba089ad6ad47577e189e2946
 
 pkgname = scipoptsuite
-	depends = zlib
 	depends = gmp
 	depends = readline
+	depends = zlib
 	provides = scip=4.0.1
 	provides = soplex=3.0.1
 	provides = zimpl=3.3.4
-	provides = gcg=2.1.2
-	provides = ug=0.8.4
 
 pkgname = scipoptsuite-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index edd9a94fe6a0..bdd9c26fe70b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Ľubomir 'The_K' Kučera <lubomir-kucera-jr-at-gmail-dot-com>
+# Maintainer: Ľubomir 'The_K' Kučera <lubomir.kucera.jr at gmail.com>
 # Contributor: Robert Schwarz <mail@rschwarz.net>
 # Contributor: Johannes Schlatow <johannes.schlatow@googlemail.com>
 # Contributor: Stephan Friedrichs <deduktionstheorem@googlemail.com>
@@ -6,103 +6,42 @@
 pkgbase='scipoptsuite'
 pkgname=("${pkgbase}" "${pkgbase}-docs")
 pkgver='4.0.1'
-pkgrel=1
+pkgrel=2
 pkgdesc="Toolbox for generating and solving optimization problems."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://scip.zib.de'
 license=('LGPL3' 'custom:ZIB Academic License')
 replaces=('ziboptsuite')
-_depends=('zlib' 'gmp' 'readline')
-makedepends=('chrpath' 'doxygen' 'graphviz' "${_depends[@]}")
-_provides=('scip=4.0.1' 'soplex=3.0.1' 'zimpl=3.3.4' 'gcg=2.1.2' 'ug=0.8.4')
+_depends=('gmp' 'readline' 'zlib')
+makedepends=('bison' 'cmake' 'flex' "${_depends[@]}")
+_provides=('scip=4.0.1' 'soplex=3.0.1' 'zimpl=3.3.4')
 source=("http://scip.zib.de/download/release/${pkgbase}-${pkgver}.tgz")
 sha256sums=('72f2a0d79f3f8b615ad98fba6343d03ebbf644a6ba089ad6ad47577e189e2946')
 
-prepare() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-
-    # Fix ZIMPL linking
-    sed -i 's/LDFLAGS\s*+=\s*-static//g' zimpl/make/make.linux.*
-}
-
 build() {
     cd "${srcdir}/${pkgbase}-${pkgver}"
 
-    make SHARED=true scipoptlib
+    mkdir -p build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX=/usr ..
     make
-    make BLISS=false gcg
-    make ug
-
-    for _pkg in scip soplex gcg; do
-        cd "${srcdir}/${pkgbase}-${pkgver}/${_pkg}"
-
-        make doc -j
-    done
-
-    # Some files have permission 640.
-    # @FIXME: Future versions might not require this line.
-    chmod -R a+r "${srcdir}/${pkgbase}-${pkgver}"
 }
 
 check() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
+    cd "${srcdir}/${pkgbase}-${pkgver}/build"
 
-    make test
+    make check
 }
 
 _package() {
     depends=("${_depends[@]}")
     provides=("${_provides[@]}")
 
-    # install everything manually (the install targets are still broken)
-    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
-
-    #
-    # 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"
-
-    #
-    # 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/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 lib/libscipopt*.so "${pkgdir}/usr/lib/"
+    cd "${srcdir}/${pkgbase}-${pkgver}/build"
 
-    # Repair "missing links"
-    # @FIXME: I hope this is not necessary in future versions!
-    cd "${pkgdir}/usr/lib"
-    ln -s -T libzimpl-*.a libzimpl.a
-    cd "${srcdir}/${pkgbase}-${pkgver}"
+    make install DESTDIR="${pkgdir}"
 
-    #
-    # License
-    #
-    install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 _package-docs() {
@@ -112,11 +51,11 @@ _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/"
+    cp -r scip/{CHANGELOG,release-notes} "${pkgdir}/usr/share/doc/${pkgname}/scip/"
+    cp -r soplex/CHANGELOG "${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 gcg/{CHANGELOG,README.md} "${pkgdir}/usr/share/doc/${pkgname}/gcg/"
     cp -r ug/README "${pkgdir}/usr/share/doc/${pkgname}/ug/"
 
     #